Merge branch 'master' of github.com:NixOS/nixpkgs

2015-12-06 19:43:53 +01:00 · 2015-12-06 19:43:53 +01:00 · a72ff7f4e7
parent bf0ed5e93a 3441848ca6
commit a72ff7f4e7
233 changed files with 3473 additions and 828 deletions
--- a/.mention-bot
+++ b/.mention-bot
@ -0,0 +1,6 @@
+{
+  // users in this list will never be mentioned by mention-bot
+  "userBlacklist": [
+    "civodul"
+  ]
+}
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -92,7 +92,7 @@
  eikek = "Eike Kettner <eike.kettner@posteo.de>";
  elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>";
  ellis = "Ellis Whitehead <nixos@ellisw.net>";
-  emery = "Emery Hemingway <emery@vfemail.net>";
+  ehmry = "Emery Hemingway <emery@vfemail.net>";
  enolan = "Echo Nolan <echo@echonolan.net>";
  epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
  ericbmerritt = "Eric Merritt <eric@afiniate.com>";
@ -207,6 +207,7 @@
  muflax = "Stefan Dorn <mail@muflax.com>";
  nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
  nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
+  nequissimus = "Tim Steinbach <tim@nequissimus.com>";
  nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
  notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
  np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
@ -218,6 +219,7 @@
  olcai = "Erik Timan <dev@timan.info>";
  orbitz = "Malcolm Matalka <mmatalka@gmail.com>";
  osener = "Ozan Sener <ozan@ozansener.com>";
+  oxij = "Jan Malakhovski <oxij@oxij.org>";
  page = "Carles Pagès <page@cubata.homelinux.net>";
  paholg = "Paho Lurie-Gregg <paho@paholg.com>";
  pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";
@ -287,6 +289,7 @@
  tailhook = "Paul Colomiets <paul@colomiets.name>";
  taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
  telotortium = "Robert Irelan <rirelan@gmail.com>";
+  thall = "Niclas Thall <niclas.thall@gmail.com>";
  thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
  the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
  theuni = "Christian Theune <ct@flyingcircus.io>";
--- a/lib/platforms.nix
+++ b/lib/platforms.nix
@ -8,8 +8,9 @@ rec {
  openbsd = ["i686-openbsd" "x86_64-openbsd"];
  netbsd = ["i686-netbsd" "x86_64-netbsd"];
  cygwin = ["i686-cygwin" "x86_64-cygwin"];
-  unix = linux ++ darwin ++ freebsd ++ openbsd;
-  all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd;
+  illumos = ["x86_64-solaris"];
+  unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos;
+  all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos;
  none = [];
  allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
  mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux"];
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixos/modules/hardware/video/bumblebee.nix
@ -2,10 +2,20 @@

 with lib;
 let
+  cfg = config.hardware.bumblebee;
+
  kernel = config.boot.kernelPackages;
-  bumblebee = if config.hardware.bumblebee.connectDisplay
-              then pkgs.bumblebee_display
-              else pkgs.bumblebee;
+
+  useNvidia = cfg.driver == "nvidia";
+
+  bumblebee = pkgs.bumblebee.override {
+    inherit useNvidia;
+    useDisplayDevice = cfg.connectDisplay;
+  };
+
+  primus = pkgs.primus.override {
+    inherit useNvidia;
+  };

 in

@ -29,6 +39,7 @@ in
      type = types.str;
      description = ''Group for bumblebee socket'';
    };
+
    hardware.bumblebee.connectDisplay = mkOption {
      default = false;
      type = types.bool;
@ -40,26 +51,30 @@ in
        Only nvidia driver is supported so far.
      '';
    };
+
+    hardware.bumblebee.driver = mkOption {
+      default = "nvidia";
+      type = types.enum [ "nvidia" "nouveau" ];
+      description = ''
+        Set driver used by bumblebeed. Supported are nouveau and nvidia.
+      '';
+    };
  };

  config = mkIf config.hardware.bumblebee.enable {
    boot.blacklistedKernelModules = [ "nouveau" "nvidia" ];
    boot.kernelModules = [ "bbswitch" ];
-    boot.extraModulePackages = [ kernel.bbswitch kernel.nvidia_x11 ];
+    boot.extraModulePackages = [ kernel.bbswitch ] ++ optional useNvidia kernel.nvidia_x11;

-    environment.systemPackages = [ bumblebee pkgs.primus ];
+    environment.systemPackages = [ bumblebee primus ];

    systemd.services.bumblebeed = {
      description = "Bumblebee Hybrid Graphics Switcher";
      wantedBy = [ "display-manager.service" ];
      path = [ kernel.bbswitch bumblebee ];
      serviceConfig = {
-        ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${config.hardware.bumblebee.group}";
-        Restart = "always";
-        RestartSec = 60;
-        CPUSchedulingPolicy = "idle";
+        ExecStart = "${bumblebee}/bin/bumblebeed --use-syslog -g ${cfg.group} --driver ${cfg.driver}";
      };
-      environment.LD_LIBRARY_PATH="/run/opengl-driver/lib/";
      environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/";
    };
  };
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@ -10,7 +10,6 @@ enableRDW = config.networking.networkmanager.enable;

 tlp = pkgs.tlp.override {
  inherit enableRDW;
-  kmod = config.system.sbin.modprobe;
 };

 # XXX: We can't use writeTextFile + readFile here because it triggers
@ -69,6 +68,8 @@ in
          ExecStart = "${tlp}/bin/tlp init start";
          ExecStop = "${tlp}/bin/tlp init stop";
        };
+
+        environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/";
      };

      tlp-sleep = {
@ -87,6 +88,8 @@ in
          ExecStart = "${tlp}/bin/tlp suspend";
          ExecStop = "${tlp}/bin/tlp resume";
        };
+
+        environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/";
      };
    };

--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@ -117,7 +117,7 @@ in
    services.mingetty.helpLine = mkIf cfg.showManual
      "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";

-    services.nixosManual.browser = mkDefault "${pkgs.w3m}/bin/w3m";
+    services.nixosManual.browser = mkDefault "${pkgs.w3m-nox}/bin/w3m";

  };

--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@ -53,11 +53,13 @@ in
        default = false;
        description = ''
          Enable putting a wireless interface into infrastructure mode,
-          allowing other wireless devices to associate with the wireless interface and do
-          wireless networking. A simple access point will enable hostapd.wpa, and
-          hostapd.wpa_passphrase, hostapd.ssid, dhcpd on the wireless interface to
-          provide IP addresses to the associated stations, and nat (from the wireless
-          interface to an upstream interface). 
+          allowing other wireless devices to associate with the wireless
+          interface and do wireless networking. A simple access point will
+          <option>enable hostapd.wpa</option>,
+          <option>hostapd.wpaPassphrase</option>, and
+          <option>hostapd.ssid</option>, as well as DHCP on the wireless
+          interface to provide IP addresses to the associated stations, and
+          NAT (from the wireless interface to an upstream interface).
        '';
      };

@ -73,7 +75,10 @@ in
        default = "nl80211";
        example = "hostapd";
        type = types.string;
-        description = "Which driver hostapd will use. Most things will probably use the default.";
+        description = ''
+          Which driver <command>hostapd</command> will use.
+          Most applications will probably use the default.
+        '';
      };

      ssid = mkOption {
@ -87,7 +92,10 @@ in
        default = "b";
        example = "g";
        type = types.string;
-        description = "Operation mode (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g";
+        description = ''
+          Operation mode.
+          (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g).
+        '';
      };

      channel = mkOption { 
@ -97,8 +105,9 @@ in
        description = 
          ''
          Channel number (IEEE 802.11)
-          Please note that some drivers do not use this value from hostapd and the
-          channel will need to be configured separately with iwconfig.
+          Please note that some drivers do not use this value from
+          <command>hostapd</command> and the channel will need to be configured
+          separately with <command>iwconfig</command>.
          '';
      };

@ -106,12 +115,16 @@ in
        default = "wheel";
        example = "network";
        type = types.string;
-        description = "members of this group can control hostapd";
+        description = ''
+          Members of this group can control <command>hostapd</command>.
+        '';
      };

      wpa = mkOption {
        default = true;
-        description = "enable WPA (IEEE 802.11i/D3.0) to authenticate to the access point";
+        description = ''
+          Enable WPA (IEEE 802.11i/D3.0) to authenticate with the access point.
+        '';
      };

      wpaPassphrase = mkOption {
@ -121,8 +134,9 @@ in
        description = 
          ''
          WPA-PSK (pre-shared-key) passphrase. Clients will need this
-          passphrase to associate with this access point. Warning: This passphrase will
-          get put into a world-readable file in the nix store. 
+          passphrase to associate with this access point.
+          Warning: This passphrase will get put into a world-readable file in
+          the Nix store!
          '';
      };

@ -134,7 +148,7 @@ in
          ht_capab=[HT40-][SHORT-GI-40][DSSS_CCK-40]
          '';
        type = types.string;
-        description = "Extra configuration options to put in the hostapd.conf";
+        description = "Extra configuration options to put in hostapd.conf.";
      };
    };
  };
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@ -300,22 +300,8 @@ in
  options = {
    services.nsd = {

-      enable = mkOption {
-        type        = types.bool;
-        default     = false;
-        description = ''
-          Whether to enable the NSD authoritative domain name server.
-        '';
-      };
-
-      bind8Stats = mkOption {
-        type        = types.bool;
-        default     = false;
-        example     = true;
-        description = ''
-          Wheter to enable BIND8 like statisics.
-        '';
-      };
+      enable = mkEnableOption "NSD authoritative DNS server";
+      bind8Stats = mkEnableOption "BIND8 like statistics";

      rootServer = mkOption {
        type        = types.bool;
@ -483,13 +469,7 @@ in


      ratelimit = {
-        enable = mkOption {
-          type        = types.bool;
-          default     = false;
-          description = ''
-            Enable ratelimit capabilities.
-          '';
-        };
+        enable = mkEnableOption "ratelimit capabilities";

        size = mkOption {
          type        = types.int;
@ -548,13 +528,7 @@ in


      remoteControl = {
-        enable = mkOption {
-          type        = types.bool;
-          default     = false;
-          description = ''
-            Wheter to enable remote control via nsd-control(8).
-          '';
-        };
+        enable = mkEnableOption "remote control via nsd-control";

        interfaces = mkOption {
          type        = types.listOf types.str;
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@ -12,6 +12,7 @@ in
    ./bspwm.nix
    ./clfswm.nix
    ./compiz.nix
+    ./dwm.nix
    ./fluxbox.nix
    ./herbstluftwm.nix
    ./i3.nix
--- a/nixos/modules/services/x11/window-managers/dwm.nix
+++ b/nixos/modules/services/x11/window-managers/dwm.nix
@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.xserver.windowManager.dwm;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+    services.xserver.windowManager.dwm.enable = mkEnableOption "dwm";
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.xserver.windowManager.session = singleton
+      { name = "dwm";
+        start =
+          ''
+            ${pkgs.dwm}/bin/dwm &
+            waitPID=$!
+          '';
+      };
+
+    environment.systemPackages = [ pkgs.dwm ];
+
+  };
+
+}
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@ -25,7 +25,7 @@ in
 import ./make-test.nix ({ pkgs, ...} : {
  name = "cjdns";
  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ emery ];
+    maintainers = [ ehmry ];
  };

  nodes = rec
@ -122,4 +122,4 @@ import ./make-test.nix ({ pkgs, ...} : {

      $bob->succeed("curl --fail -g http://[$aliceIp6]");
    '';
-})
+})
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@ -1,22 +1,120 @@
-{ stdenv, fetchgit, ncurses, pkgconfig, alsaLib, flac, libmad, ffmpeg, libvorbis, libmpc, mp4v2, libcue, libpulseaudio}:
+{ stdenv, fetchFromGitHub, ncurses, pkgconfig
+
+, alsaSupport ? stdenv.isLinux, alsaLib ? null
+# simple fallback for everyone else
+, aoSupport ? !stdenv.isLinux, libao ? null
+, jackSupport ? false, libjack ? null
+, samplerateSupport ? jackSupport, libsamplerate ? null
+, ossSupport ? false, alsaOss ? null
+, pulseaudioSupport ? false, libpulseaudio ? null
+
+# TODO: add these
+#, artsSupport
+#, roarSupport
+#, sndioSupport
+#, sunSupport
+#, waveoutSupport
+
+, cddbSupport ? true, libcddb ? null
+, cdioSupport ? true, libcdio ? null
+, cueSupport ? true, libcue ? null
+, discidSupport ? true, libdiscid ? null
+, ffmpegSupport ? true, ffmpeg ? null
+, flacSupport ? true, flac ? null
+, madSupport ? true, libmad ? null
+, mikmodSupport ? true, libmikmod ? null
+, modplugSupport ? true, libmodplug ? null
+, mpcSupport ? true, libmpcdec ? null
+, tremorSupport ? false, tremor ? null
+, vorbisSupport ? true, libvorbis ? null
+, wavpackSupport ? true, wavpack ? null
+
+# can't make these work, something is broken
+#, aacSupport ? true, faac ? null
+#, mp4Support ? true, mp4v2 ? null
+#, opusSupport ? true, opusfile ? null
+
+# not in nixpkgs
+#, vtxSupport ? true, libayemu ? null
+}:
+
+with stdenv.lib;
+
+assert samplerateSupport -> jackSupport;
+
+# vorbis and tremor are mutually exclusive
+assert vorbisSupport -> !tremorSupport;
+assert tremorSupport -> !vorbisSupport;
+
+let
+
+  mkFlag = b: f: dep: if b
+    then { flags = [ f ]; deps = [ dep ]; }
+    else { flags = []; deps = []; };
+
+  opts = [
+    # Audio output
+    (mkFlag alsaSupport       "CONFIG_ALSA=y"       alsaLib)
+    (mkFlag aoSupport         "CONFIG_AO=y"         libao)
+    (mkFlag jackSupport       "CONFIG_JACK=y"       libjack)
+    (mkFlag samplerateSupport "CONFIG_SAMPLERATE=y" libsamplerate)
+    (mkFlag ossSupport        "CONFIG_OSS=y"        alsaOss)
+    (mkFlag pulseaudioSupport "CONFIG_PULSE=y"      libpulseaudio)
+
+    #(mkFlag artsSupport      "CONFIG_ARTS=y")
+    #(mkFlag roarSupport      "CONFIG_ROAR=y")
+    #(mkFlag sndioSupport     "CONFIG_SNDIO=y")
+    #(mkFlag sunSupport       "CONFIG_SUN=y")
+    #(mkFlag waveoutSupport   "CONFIG_WAVEOUT=y")
+
+    # Input file formats
+    (mkFlag cddbSupport    "CONFIG_CDDB=y"    libcddb)
+    (mkFlag cdioSupport    "CONFIG_CDIO=y"    libcdio)
+    (mkFlag cueSupport     "CONFIG_CUE=y"     libcue)
+    (mkFlag discidSupport  "CONFIG_DISCID=y"  libdiscid)
+    (mkFlag ffmpegSupport  "CONFIG_FFMPEG=y"  ffmpeg)
+    (mkFlag flacSupport    "CONFIG_FLAC=y"    flac)
+    (mkFlag madSupport     "CONFIG_MAD=y"     libmad)
+    (mkFlag mikmodSupport  "CONFIG_MIKMOD=y"  libmikmod)
+    (mkFlag modplugSupport "CONFIG_MODPLUG=y" libmodplug)
+    (mkFlag mpcSupport     "CONFIG_MPC=y"     libmpcdec)
+    (mkFlag tremorSupport  "CONFIG_TREMOR=y"  tremor)
+    (mkFlag vorbisSupport  "CONFIG_VORBIS=y"  libvorbis)
+    (mkFlag wavpackSupport "CONFIG_WAVPACK=y" wavpack)
+
+    #(mkFlag opusSupport   "CONFIG_OPUS=y"    opusfile)
+    #(mkFlag mp4Support    "CONFIG_MP4=y"     mp4v2)
+    #(mkFlag aacSupport    "CONFIG_AAC=y"     faac)
+
+    #(mkFlag vtxSupport    "CONFIG_VTX=y"     libayemu)
+  ];
+
+in

 stdenv.mkDerivation rec {
  name = "cmus-${version}";
-  version = "2.6.0";
+  version = "2.7.0";

-  src = fetchgit {
-    url = https://github.com/cmus/cmus.git;
-    rev = "46b71032da827d22d4fae5bf2afcc4c9afef568c";
-    sha256 = "1hkqifll5ryf3ljp3w1dxz1p8m6rk34fpazc6vwavis6ga310hka";
+  src = fetchFromGitHub {
+    owner  = "cmus";
+    repo   = "cmus";
+    rev    = "0306cc74c5073a85cf8619c61da5b94a3f863eaa";
+    sha256 = "18w9mznb843nzkrcqvshfha51mlpdl92zlvb5wfc5dpgrbf37728";
  };

-  configurePhase = "./configure prefix=$out";
+  patches = [ ./option-debugging.patch ];

-  buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis libmpc mp4v2 libcue libpulseaudio ];
+  configurePhase = "./configure " + concatStringsSep " " ([
+    "prefix=$out"
+    "CONFIG_WAV=y"
+  ] ++ concatMap (a: a.flags) opts);
+
+  buildInputs = [ ncurses pkgconfig ] ++ concatMap (a: a.deps) opts;

  meta = {
    description = "Small, fast and powerful console music player for Linux and *BSD";
    homepage = https://cmus.github.io/;
    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.oxij ];
  };
 }
--- a/pkgs/applications/audio/cmus/option-debugging.patch
+++ b/pkgs/applications/audio/cmus/option-debugging.patch
@ -0,0 +1,42 @@
+Shows build and link errors in configure for ease of debugging which
+options require what.
+diff --git a/scripts/checks.sh b/scripts/checks.sh
+index 64cbbf3..fab4d9b 100644
+--- a/scripts/checks.sh
+++ b/scripts/checks.sh
+@@ -425,7 +425,7 @@ try_compile()
+ 		echo "$1" > $__src || exit 1
+ 		shift
+ 		__cmd="$CC -c $CFLAGS $@ $__src -o $__obj"
+-		$CC -c $CFLAGS "$@" $__src -o $__obj 2>/dev/null
+		$CC -c $CFLAGS "$@" $__src -o $__obj
+ 		;;
+ 	cxx)
+ 		__src=`tmp_file prog.cc`
+@@ -433,7 +433,7 @@ try_compile()
+ 		echo "$1" > $__src || exit 1
+ 		shift
+ 		__cmd="$CXX -c $CXXFLAGS $@ $__src -o $__obj"
+-		$CXX -c $CXXFLAGS "$@" $__src -o $__obj 2>/dev/null
+		$CXX -c $CXXFLAGS "$@" $__src -o $__obj
+ 		;;
+ 	esac
+ 	return $?
+@@ -451,7 +451,7 @@ try_compile_link()
+ 		echo "$1" > $__src || exit 1
+ 		shift
+ 		__cmd="$CC $__src -o $__exe $CFLAGS $LDFLAGS $@"
+-		$CC $__src -o $__exe $CFLAGS $LDFLAGS "$@" 2>/dev/null
+		$CC $__src -o $__exe $CFLAGS $LDFLAGS "$@"
+ 		;;
+ 	cxx)
+ 		__src=`tmp_file prog.cc`
+@@ -459,7 +459,7 @@ try_compile_link()
+ 		echo "$1" > $__src || exit 1
+ 		shift
+ 		__cmd="$CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS $@"
+-		$CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@" 2>/dev/null
+		$CXX $__src -o $__exe $CXXFLAGS $CXXLDFLAGS "$@"
+ 		;;
+ 	esac
+ 	return $?
--- a/pkgs/applications/audio/gnaural/default.nix
+++ b/pkgs/applications/audio/gnaural/default.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    { description = "Auditory binaural-beat generator";
      homepage = http://gnaural.sourceforge.net/;
      license = licenses.gpl2;
-      maintainers = [ maintainers.emery ];
+      maintainers = [ maintainers.ehmry ];
      platforms = platforms.linux;
    };
 }
--- a/pkgs/applications/audio/meters_lv2/default.nix
+++ b/pkgs/applications/audio/meters_lv2/default.nix
@ -40,7 +40,7 @@ stdenv.mkDerivation {
  meta = with stdenv.lib;
    { description = "Collection of audio level meters with GUI in LV2 plugin format";
      homepage = http://x42.github.io/meters.lv2/;
-      maintainers = with maintainers; [ emery ];
+      maintainers = with maintainers; [ ehmry ];
      license = licenses.gpl2;
      platforms = platforms.linux;
    };
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@ -35,7 +35,7 @@ buildPythonPackage {
  meta = with stdenv.lib; {
    homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard";
    description = "The official MusicBrainz tagger";
-    maintainers = with maintainers; [ emery ];
+    maintainers = with maintainers; [ ehmry ];
    license = licenses.gpl2;
    platforms = platforms.all;
  };
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@ -1,20 +1,20 @@
 { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk
-, libjack2, libsndfile, lv2, mesa, minixml, pkgconfig, zlib, xorg
+, libjack2, libsndfile, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg
 }:

 assert stdenv ? glibc;

 stdenv.mkDerivation  rec {
  name = "yoshimi-${version}";
-  version = "1.3.6";
+  version = "1.3.7.1";

  src = fetchurl {
    url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "0c2y59m945rrspnwdxmixk92z9nfiayxdxh582gf15nj8bvkh1l6";
+    sha256 = "13xc1x8jrr2rn26jx4dini692ww3771d5j5xf7f56ixqr7mmdhvz";
  };

  buildInputs = [
-    alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile lv2 mesa
+    alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile readline lv2 mesa
    minixml zlib xorg.libpthreadstubs
  ];

@ -22,7 +22,7 @@ stdenv.mkDerivation  rec {

  preConfigure = "cd src";

-  cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so" ];
+  cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so -DCMAKE_INSTALL_DATAROOTDIR=$out" ];

  meta = with stdenv.lib; {
    description = "high quality software synthesizer based on ZynAddSubFX";
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
 , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
-, alsaLib, cairo, acl, gpm, AppKit
+, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
 , withX ? !stdenv.isDarwin
 , withGTK3 ? false, gtk3 ? null
 , withGTK2 ? true, gtk2
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
    ++ stdenv.lib.optional (withX && withGTK3) gtk3
    ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;

-  propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin AppKit;
+  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];

  configureFlags =
    if stdenv.isDarwin
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@ -15,15 +15,15 @@ with stdenv.lib;

 let

-  version = "0.1.0";
+  version = "0.1.1";

  # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
-  neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation {
+  neovimLibvterm = let version = "2015-11-06"; in stdenv.mkDerivation {
    name = "neovim-libvterm-${version}";

    src = fetchFromGitHub {
-      sha256 = "0i2h74jrx4fy90sv57xj8g4lbjjg4nhrq2rv6rz576fmqfpllcc5";
-      rev = "20ad1396c178c72873aeeb2870bd726f847acb70";
+      sha256 = "0f9r0wnr9ajcdd6as24igmch0n8s1annycb9f4k0vg6fngwaypy9";
+      rev = "04781d37ce5af3f580376dc721bd3b89c434966b";
      repo = "libvterm";
      owner = "neovim";
    };
@ -63,7 +63,7 @@ let
    name = "neovim-${version}";

    src = fetchFromGitHub {
-      sha256 = "1704f3dqf5p6hicpzf0pi21n6ymylra9prsm4azvqp86allmvnfx";
+      sha256 = "0crswjslp687yp1cpn7nmm0j2sccqhcxryzxv1s81cgpai0fzf60";
      rev = "v${version}";
      repo = "neovim";
      owner = "neovim";
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@ -69,7 +69,7 @@ stdenv.mkDerivation {
    { description = "Set of integrated tools for the R language";
      homepage = http://www.rstudio.com/;
      license = licenses.agpl3;
-      maintainers = [ maintainers.emery ];
+      maintainers = [ maintainers.ehmry ];
      platforms = platforms.linux;
    };
 }
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
    ];
  };

+  __impureHostDeps = [ "/dev/ptmx" ];
+
  # To fix the trouble in vim73, that it cannot cross-build with this patch
  # to bypass a configure script check that cannot be done cross-building.
  # http://groups.google.com/group/vim_dev/browse_thread/thread/66c02efd1523554b?pli=1
--- a/pkgs/applications/graphics/sane/backends-git.nix
+++ b/pkgs/applications/graphics/sane/backends-git.nix
@ -7,12 +7,12 @@ in
 assert hotplugSupport -> (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux");

 stdenv.mkDerivation {
-  name = "sane-backends-1.0.24.73-g6c4f6bc";
+  name = "sane-backends-1.0.25.177-g753d123";

  src = fetchgit {
    url = "git://alioth.debian.org/git/sane/sane-backends.git";
-    rev = "6c4f6bc58615755dc734281703b594cea3ebf848";
-    sha256 = "0f7lbv1rnr53n4rpihcd8dkfm01xvwfnx9i1nqaadrzbpvgkjrfa";
+    rev = "753d123f36d08cdb8047adac7c89a9fe015c4b25";
+    sha256 = "1f5b4606f9b1b65a312794726e8d5d06056510b7426f86845ebeb8ca1a9b2f1f";
  };

  udevSupport = hotplugSupport;
@ -38,12 +38,19 @@ stdenv.mkDerivation {
      "echo epson2 > \${out}/etc/sane.d/dll.conf"
    else "";

-  meta = {
+  meta = with stdenv.lib; {
    homepage = "http://www.sane-project.org/";
-    description = "Scanner Access Now Easy";
-    license = stdenv.lib.licenses.gpl2Plus;
+    description = "SANE (Scanner Access Now Easy) backends";
+    longDescription = ''
+      Collection of open-source SANE backends (device drivers).
+      SANE is a universal scanner interface providing standardized access to
+      any raster image scanner hardware: flatbed scanners, hand-held scanners,
+      video- and still-cameras, frame-grabbers, etc. For a list of supported
+      scanners, see http://www.sane-project.org/sane-backends.html.
+    '';
+    license = licenses.gpl2Plus;

-    maintainers = [ stdenv.lib.maintainers.simons ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ nckx simons ];
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/graphics/sane/backends.nix
+++ b/pkgs/applications/graphics/sane/backends.nix
@ -8,16 +8,16 @@ let
  firmware = gt68xxFirmware { inherit fetchurl; };
 in
 stdenv.mkDerivation rec {
-  version = "1.0.24";
+  version = "1.0.25";
  name = "sane-backends-${version}";

  src = fetchurl {
    urls = [
-      "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-1.0.24.tar.gz/1ca68e536cd7c1852322822f5f6ac3a4/${name}.tar.gz"
-      "https://alioth.debian.org/frs/download.php/file/3958/${name}.tar.gz"
+      "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-1.0.25.tar.gz/f9ed5405b3c12f07c6ca51ee60225fe7/${name}.tar.gz"
+      "https://alioth.debian.org/frs/download.php/file/4146/${name}.tar.gz"
    ];
    curlOpts = "--insecure";
-    sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7";
+    sha256 = "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4";
  };

  outputs = [ "out" "doc" "man" ];
@ -49,12 +49,19 @@ stdenv.mkDerivation rec {
      " \${out}/share/sane/snapscan/your-firmwarefile.bin"
    else "";

-  meta = {
+  meta = with stdenv.lib; {
    homepage = "http://www.sane-project.org/";
-    description = "Scanner Access Now Easy";
-    license = stdenv.lib.licenses.gpl2Plus;
+    description = "SANE (Scanner Access Now Easy) backends";
+    longDescription = ''
+      Collection of open-source SANE backends (device drivers).
+      SANE is a universal scanner interface providing standardized access to
+      any raster image scanner hardware: flatbed scanners, hand-held scanners,
+      video- and still-cameras, frame-grabbers, etc. For a list of supported
+      scanners, see http://www.sane-project.org/sane-backends.html.
+    '';
+    license = licenses.gpl2Plus;

-    maintainers = [ stdenv.lib.maintainers.simons ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ nckx simons ];
+    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@ -40,6 +40,6 @@ buildPythonPackage rec {
    '';
    homepage = https://electrum.org;
    license = licenses.gpl3;
-    maintainers = with maintainers; [ emery joachifm ];
+    maintainers = with maintainers; [ ehmry joachifm ];
  };
 }
--- a/pkgs/applications/misc/monero/default.nix
+++ b/pkgs/applications/misc/monero/default.nix
@ -34,7 +34,7 @@ stdenv.mkDerivation {
    description = "Private, secure, untraceable currency";
    homepage = http://monero.cc/;
    license = licenses.bsd3;
-    maintainers = [ maintainers.emery ];
+    maintainers = [ maintainers.ehmry ];
    platforms = [ "x86_64-linux" ];
  };
 }
--- a/pkgs/applications/misc/qtbitcointrader/default.nix
+++ b/pkgs/applications/misc/qtbitcointrader/default.nix
@ -30,6 +30,6 @@ stdenv.mkDerivation {
      homepage = https://centrabit.com/;
      license = licenses.lgpl3;
      platforms = qt.meta.platforms;
-      maintainers = [ maintainers.emery ];
+      maintainers = [ maintainers.ehmry ];
    };
 }
--- a/pkgs/applications/misc/xcruiser/default.nix
+++ b/pkgs/applications/misc/xcruiser/default.nix
@ -25,6 +25,6 @@ stdenv.mkDerivation {
      '';
      homepage = http://xcruiser.sourceforge.net/;
      license = licenses.gpl2;
-      maintainers = with maintainers; [ emery ];
+      maintainers = with maintainers; [ ehmry ];
    };
 }
--- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
@ -38,7 +38,7 @@ stdenv.mkDerivation {
    { description = "Plugin for browser to TREZOR device communication";
      homepage = https://mytrezor.com;
      license = licenses.unfree;
-      maintainers = with maintainers; [ emery ];
+      maintainers = with maintainers; [ ehmry ];
    };

 }
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@ -1,16 +1,18 @@
 { stdenv, fetchurl
-, sslSupport ? true
-, graphicsSupport ? false
-, mouseSupport ? false
-, ncurses, openssl ? null, boehmgc, gettext, zlib
-, imlib2 ? null, xlibsWrapper ? null, fbcon ? null
-, gpm-ncurses ? null
+, ncurses, boehmgc, gettext, zlib
+, sslSupport ? true, openssl ? null
+, graphicsSupport ? true, imlib2 ? null
+, x11Support ? graphicsSupport, libX11 ? null
+, mouseSupport ? true, gpm-ncurses ? null
 }:

 assert sslSupport -> openssl != null;
-assert graphicsSupport -> imlib2 != null && (xlibsWrapper != null || fbcon != null);
+assert graphicsSupport -> imlib2 != null;
+assert x11Support -> graphicsSupport && libX11 != null;
 assert mouseSupport -> gpm-ncurses != null;

+with stdenv.lib;
+
 stdenv.mkDerivation rec {
  name = "w3m-0.5.3";

@ -19,19 +21,24 @@ stdenv.mkDerivation rec {
    sha256 = "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579";
  };

+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isSunOS "-lsocket -lnsl";
+
  patches = [ ./glibc214.patch ]
    # Patch for the newer unstable boehm-gc 7.2alpha. Not all platforms use that
    # alpha. At the time of writing this, boehm-gc-7.1 is the last stable.
-    ++ stdenv.lib.optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ]
-    ++ stdenv.lib.optional stdenv.isCygwin ./cygwin.patch;
+    ++ optional (boehmgc.name != "boehm-gc-7.1") [ ./newgc.patch ]
+    ++ optional stdenv.isCygwin ./cygwin.patch
+    # for frame buffer only version
+    ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ];

  buildInputs = [ncurses boehmgc gettext zlib]
-    ++ stdenv.lib.optional sslSupport openssl
-    ++ stdenv.lib.optional mouseSupport gpm-ncurses
-    ++ stdenv.lib.optionals graphicsSupport [imlib2 xlibsWrapper fbcon];
+    ++ optional sslSupport openssl
+    ++ optional mouseSupport gpm-ncurses
+    ++ optional graphicsSupport imlib2
+    ++ optional x11Support libX11;

  configureFlags = "--with-ssl=${openssl} --with-gc=${boehmgc}"
-    + stdenv.lib.optionalString graphicsSupport " --enable-image=x11,fb";
+    + optionalString graphicsSupport " --enable-image=${optionalString x11Support "x11,"}fb";

  preConfigure = ''
    substituteInPlace ./configure --replace "/lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib /lib64 /usr/lib64" /no-such-path
@ -40,7 +47,10 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = false;

-  meta = with stdenv.lib; {
+  # for w3mimgdisplay
+  LIBS = optionalString x11Support "-lX11";
+
+  meta = {
    homepage = http://w3m.sourceforge.net/;
    description = "A text-mode web browser";
    maintainers = [ maintainers.mornfall ];
--- a/pkgs/applications/networking/browsers/w3m/no-x11.patch
+++ b/pkgs/applications/networking/browsers/w3m/no-x11.patch
@ -0,0 +1,15 @@
+Forget about X11 in fb module.
+This breaks w3mimgdisplay under X11, but removes X11 dependency it in pure fb.
+diff --git a/w3mimg/fb/fb_imlib2.c b/w3mimg/fb/fb_imlib2.c
+index ea36637..d3d7bc3 100644
+--- a/w3mimg/fb/fb_imlib2.c
+++ b/w3mimg/fb/fb_imlib2.c
+@@ -3,7 +3,7 @@
+                 fb_imlib2.c 0.3 Copyright (C) 2002, hito
+  **************************************************************************/
+ 
+-#include <X11/Xlib.h>
+#define X_DISPLAY_MISSING
+ #include <Imlib2.h>
+ #include "fb.h"
+ #include "fb_img.h"
--- a/pkgs/applications/networking/instant-messengers/ratox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
    { description = "FIFO based tox client";
      homepage = http://ratox.2f30.org/;
      license = licenses.isc;
-      maintainers = with maintainers; [ emery ];
+      maintainers = with maintainers; [ ehmry ];
      platforms = platforms.linux;
    };
 }
--- a/pkgs/applications/networking/newsreaders/slrn/default.nix
+++ b/pkgs/applications/networking/newsreaders/slrn/default.nix
@ -25,7 +25,7 @@ stdenv.mkDerivation {
  meta = with stdenv.lib; {
    description = "The slrn (S-Lang read news) newsreader";
    homepage = http://slrn.sourceforge.net/index.html;
-    maintainers = with maintainers; [ emery ];
+    maintainers = with maintainers; [ ehmry ];
    license = licenses.gpl2;
  };
 }
--- a/pkgs/applications/networking/p2p/firestr/default.nix
+++ b/pkgs/applications/networking/p2p/firestr/default.nix
@ -29,7 +29,7 @@ stdenv.mkDerivation {
    description = "Grass computing platform";
    homepage = http://firestr.com/;
    license = licenses.gpl3;
-    maintainers = [ maintainers.emery ];
+    maintainers = [ maintainers.ehmry ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@ -18,6 +18,6 @@ stdenv.mkDerivation {
    homepage = http://dev.yorhel.nl/ncdc;
    license = stdenv.lib.licenses.mit;
    platforms = stdenv.lib.platforms.linux; # arbitrary
-    maintainers = [ stdenv.lib.maintainers.emery ];
+    maintainers = [ stdenv.lib.maintainers.ehmry ];
  };
 }
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
    { description = "GTK remote control for the Transmission BitTorrent client";
      homepage = https://github.com/ajf8/transmission-remote-gtk;
      license = licenses.gpl2;
-      maintainers = [ maintainers.emery ];
+      maintainers = [ maintainers.ehmry ];
      platforms = platforms.linux;
    };
 }
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
    description = "A fast incremental file transfer utility";
    license = licenses.gpl3Plus;
    platforms = platforms.unix;
-    maintainers = with maintainers; [ simons emery ];
+    maintainers = with maintainers; [ simons ehmry ];
  };
 }
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@ -36,6 +36,9 @@ stdenv.mkDerivation {
  # required to support pthread_cancel()
  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";

+  # without this, git fails when trying to check for /etc/gitconfig existence
+  propagatedSandboxProfile = stdenv.lib.sandbox.allowDirectoryList "/etc";
+
  makeFlags = "prefix=\${out} sysconfdir=/etc/ PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
      + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
      + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "")
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pythonPackages, python} :
+
+pythonPackages.buildPythonPackage rec {
+  name = "git-review-${version}";
+  version = "1.25.0";
+
+  # Manually set version because prb wants to get it from the git
+  # upstream repository (and we are installing from tarball instead)
+  PBR_VERSION = "${version}";
+
+  src = fetchurl rec {
+    url = "https://github.com/openstack-infra/git-review/archive/${version}.tar.gz";
+    sha256 = "aa594690ed586041a524d6e5ae76152cbd53d4f03a98b20b213d15cecbe128ce";
+  };
+
+  propagatedBuildInputs = [ pythonPackages.pbr pythonPackages.requests2 pythonPackages.argparse pythonPackages.setuptools ];
+
+  # Don't do tests because they require gerrit which is not packaged
+  doCheck = false;
+
+  meta = {
+    homepage = "https://github.com/openstack-infra/git-review";
+    description = "Tool to submit code to Gerrit";
+    license = stdenv.lib.licenses.asl20;
+  };
+}
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@ -1,8 +1,23 @@
-{ stdenv, fetchFromGitHub, kodi, steam }:
+{ stdenv, fetchFromGitHub, cmake, kodi, steam, libcec_platform, tinyxml }:

 let

-  pluginDir = "/lib/kodi/plugin";
+  pluginDir = "/share/kodi/addons";
+
+  kodi-platform = stdenv.mkDerivation rec {
+    project = "kodi-platform";
+    version = "15.2";
+    name = "${project}-${version}";
+
+    src = fetchFromGitHub {
+      owner = "xbmc";
+      repo = project;
+      rev = "45d6ad1984fdb1dc855076ff18484dbec33939d1";
+      sha256 = "1fai33mwyv5ab47b16i692g7a3vcnmxavx13xin2gh16y0qm62hi";
+    };
+
+    buildInputs = [ cmake kodi libcec_platform tinyxml ];
+  };

  mkKodiPlugin = { plugin, namespace, version, src, meta, ... }:
  stdenv.lib.makeOverridable stdenv.mkDerivation rec {
@ -134,4 +149,36 @@ in
    propagatedBuildinputs = [ steam ];
  };

+  pvr-hts = (mkKodiPlugin rec {
+    plugin = "pvr-hts";
+    namespace = "pvr.hts";
+    version = "2.1.18";
+
+    src = fetchFromGitHub {
+      owner = "kodi-pvr";
+      repo = "pvr.hts";
+      rev = "016b0b3251d6d5bffaf68baf59010e4347759c4a";
+      sha256 = "03lhxipz03r516pycabqc9b89kd7wih3c2dr4p602bk64bsmpi0j";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/kodi-pvr/pvr.hts;
+      description = "Kodi's Tvheadend HTSP client addon";
+      platforms = platforms.all;
+      maintainers = with maintainers; [ page ];
+    };
+  }).override {
+    buildInputs = [ cmake kodi libcec_platform kodi-platform ];
+
+    # disables check ensuring install prefix is that of kodi
+    cmakeFlags = [ "-DOVERRIDE_PATHS=1" ];
+
+    # kodi checks for plugin .so libs existance in the addon folder (share/...)
+    # and the non-wrapped kodi lib/... folder before even trying to dlopen
+    # them. Symlinking .so, as setting LD_LIBRARY_PATH is of no use
+    installPhase = ''
+      make install
+      ln -s $out/lib/kodi/addons/pvr.hts/pvr.hts.so $out/share/kodi/addons/pvr.hts
+    '';
+  };
 }
--- a/pkgs/applications/video/kodi/wrapper.nix
+++ b/pkgs/applications/video/kodi/wrapper.nix
@ -14,7 +14,7 @@ stdenv.mkDerivation {
  buildInputs = [ makeWrapper ];

  buildCommand = ''
-    mkdir -p $out/share/kodi/addons/packages
+    mkdir -p $out/share/kodi/addons
    ${stdenv.lib.concatMapStrings
        (plugin: "ln -s ${plugin.out
                            + plugin.kodiPlugin
@ -50,4 +50,4 @@ stdenv.mkDerivation {

  };

-}
+}
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@ -18,7 +18,7 @@ let
  # revision/hash as well. See
  # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS
  # for hashes.
-  version = "5.0.6";
+  version = "5.0.10";

  forEachModule = action: ''
    for mod in \
@ -39,12 +39,12 @@ let
  '';

  # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "103037";
+  extpackRevision = "104061";
  extensionPack = requireFile rec {
    name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
    # IMPORTANT: Hash must be base16 encoded because it's used as an input to
    # VBoxExtPackHelperApp!
-    sha256 = "4eed4f3d253bffe4ce61ee9431d79cbe1f897b3583efc2ff3746f453450787b5";
+    sha256 = "c846fa26fec8587e57180c85c408cad377c48ad26830b0dc839ebf9025e3d29c";
    message = ''
      In order to use the extension pack, you need to comply with the VirtualBox Personal Use
      and Evaluation License (PUEL) by downloading the related binaries from:
@ -63,7 +63,7 @@ in stdenv.mkDerivation {

  src = fetchurl {
    url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "0hsqd9bvbbzs3ihlfp2m15z6vx3nydjirv6drhfs6r9iqhl3zmi2";
+    sha256 = "56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89";
  };

  buildInputs =
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "59ed9911c2bb22357345448c3df6104938b45fa780311d20c330e39c6e309991";
+    sha256 = "8f7ffee3fac75793e48d1859b65a95879b3ed5bc1c3164c967e85d69244c594b";
  };

  KERN_DIR = "${kernel.dev}/lib/modules/*/build";
--- a/pkgs/applications/window-managers/cwm/default.nix
+++ b/pkgs/applications/window-managers/cwm/default.nix
@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "cwm-5.6";
+
+  src = fetchFromGitHub {
+      owner = "chneukirchen";
+      repo = "cwm";
+      rev = "b7a8c11750d11721a897fdb8442d52f15e7a24a0";
+      sha256 = "0a0x8rgqif4kxy7hj70hck7jma6c8jy4428ybl8fz9qxgxh014ml";
+  };
+
+  buildInputs = [ libX11 libXinerama libXrandr libXft yacc pkgconfig ];
+
+  prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
+
+  meta = with stdenv.lib; {
+    description = "A lightweight and efficient window manager for X11";
+    homepage = https://github.com/chneukirchen/cwm;
+    maintainers = [];
+    license     = licenses.isc;
+    platforms   = platforms.linux;
+  };
+}
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@ -145,7 +145,7 @@ stdenv.mkDerivation {
    + optionalString (stdenv.isSunOS && nativePrefix != "") ''
      # Solaris needs an additional ld wrapper.
      ldPath="${nativePrefix}/bin"
-      ld="$out/bin/ld-solaris"
+      exec="$ldPath/ld"
      wrap ld-solaris ${./ld-solaris-wrapper.sh}
    '')

--- a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh
@ -6,7 +6,7 @@ set -u
 # I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'(
 # Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3
 #   but still no success.
-cmd="@prog@ -z ignore"
+cmd="@ld@ -z ignore"

 args=("$@");

--- a/pkgs/build-support/fetchgit/builder.sh
+++ b/pkgs/build-support/fetchgit/builder.sh
@ -6,7 +6,7 @@ source $stdenv/setup

 header "exporting $url (rev $rev) into $out"

-$fetcher --builder --url "$url" --out "$out" --rev "$rev" \
+$SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \
  ${leaveDotGit:+--leave-dotGit} \
  ${deepClone:+--deepClone} \
  ${fetchSubmodules:+--fetch-submodules} \
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@ -45,7 +45,7 @@ assert deepClone -> leaveDotGit;
 stdenv.mkDerivation {
  inherit name;
  builder = ./builder.sh;
-  fetcher = "${stdenv.shell} ${./nix-prefetch-git}";
+  fetcher = "${./nix-prefetch-git}";  # This must be a string to ensure it's called with bash.
  buildInputs = [git];

  outputHashAlgo = if sha256 == "" then "md5" else "sha256";
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@ -51,50 +51,12 @@ rec {

  # GnuPG.
  gnupg = [
-    http://gd.tuwien.ac.at/privacy/gnupg/
-    ftp://gd.tuwien.ac.at/privacy/gnupg/
-    ftp://gnupg.x-zone.org/pub/gnupg/
-    ftp://ftp.gnupg.cz/pub/gcrypt/
-    ftp://sunsite.dk/pub/security/gcrypt/
-    http://gnupg.wildyou.net/
-    http://ftp.gnupg.zone-h.org/
-    ftp://ftp.jyu.fi/pub/crypt/gcrypt/
-    ftp://trumpetti.atm.tut.fi/gcrypt/
-    ftp://mirror.cict.fr/gnupg/
-    ftp://ftp.strasbourg.linuxfr.org/pub/gnupg/
-    ftp://ftp.cert.dfn.de/pub/tools/crypt/gcrypt/
-    ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/
-    ftp://ftp.freenet.de/pub/ftp.gnupg.org/gcrypt/
-    ftp://hal.csd.auth.gr/mirrors/gnupg/
-    ftp://igloo.linux.gr/pub/crypto/gnupg/
-    ftp://ftp.uoi.gr/mirror/gcrypt/
-    ftp://ftp.crysys.hu/pub/gnupg/
-    ftp://ftp.kfki.hu/pub/packages/security/gnupg/
-    ftp://ftp.hi.is/pub/mirrors/gnupg/
-    ftp://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/
-    ftp://ftp3.linux.it/pub/mirrors/gnupg/
-    ftp://ftp.linux.it/pub/mirrors/gnupg/
-    ftp://ftp.bit.nl/mirror/gnupg/
-    ftp://ftp.demon.nl/pub/mirrors/gnupg/
-    ftp://ftp.surfnet.nl/pub/security/gnupg/
-    ftp://sunsite.icm.edu.pl/pub/security/gnupg/
-    ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/
-    http://ftp.gnupg.tsuren.net/
-    http://www.mirror386.com/gnupg/
-    ftp://ftp.sunet.se/pub/security/gnupg/
-    ftp://mirror.switch.ch/mirror/gnupg/
-    ftp://ftp.mirrorservice.org/sites/ftp.gnupg.org/gcrypt
-
-    http://gnupg.unixmexico.org/ftp/
-    ftp://ftp.gnupg.ca/
-    http://gulus.usherbrooke.ca/pub/appl/GnuPG/
-    http://mirrors.rootmode.com/ftp.gnupg.org/
-
-    ftp://ftp.planetmirror.com/pub/gnupg/
-
-    ftp://pgp.iijlab.net/pub/pgp/gnupg/
-    ftp://ftp.ring.gr.jp/pub/net/gnupg/
-    ftp://gnupg.cdpa.nsysu.edu.tw/gnupg/
+    https://gnupg.org/ftp/gcrypt/
+    http://www.ring.gr.jp/pub/net/
+    http://gd.tuwien.ac.at/privacy/
+    http://mirrors.dotsrc.org/
+    http://ftp.heanet.ie/mirrors/ftp.gnupg.org/
+    http://www.mirrorservice.org/sites/ftp.gnupg.org/
  ];

  # kernel.org's /pub (/pub/{linux,software}) tree.
--- a/pkgs/build-support/gcc-wrapper-old/utils.sh
+++ b/pkgs/build-support/gcc-wrapper-old/utils.sh
@ -14,6 +14,8 @@ badPath() {
    # the temporary build directory).
    if test "${p:0:1}" != "/"; then return 1; fi
    
+    @extraPathTests@
+
    # Otherwise, the path should refer to the store or some temporary
    # directory (including the build directory).
    test \
--- a/pkgs/build-support/setup-hooks/patch-shebangs.sh
+++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh
@ -19,12 +19,12 @@ patchShebangs() {
    local newInterpreterLine

    find "$dir" -type f -perm -0100 | while read f; do
-        if [ "$(head -1 "$f" | head -c +2)" != '#!' ]; then
+        if [ "$(head -1 "$f" | head -c+2)" != '#!' ]; then
            # missing shebang => not a script
            continue
        fi

-        oldInterpreterLine=$(head -1 "$f" | tail -c +3)
+        oldInterpreterLine=$(head -1 "$f" | tail -c+3)
        read -r oldPath arg0 args <<< "$oldInterpreterLine"

        if $(echo "$oldPath" | grep -q "/bin/env$"); then
--- a/pkgs/data/fonts/ipafont/default.nix
+++ b/pkgs/data/fonts/ipafont/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "ipafont-003.03";

  src = fetchurl {
-    url = "http://ipafont.ipa.go.jp/ipafont/IPAfont00303.php";
+    url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php";
    sha256 = "f755ed79a4b8e715bed2f05a189172138aedf93db0f465b4e20c344a02766fe5";
  };

--- a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix
@ -2,12 +2,12 @@
 , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }:

 stdenv.mkDerivation rec {
-  version = "${gnome3.version}.3";
+  version = "${gnome3.version}.2";
  name = "gpaste-${version}";

  src = fetchurl {
    url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "1czc707y2ksb8lgq1la0qkj3wpi202hjfiyshsndhw0pqn3qjj4a";
+    sha256 = "0w9d0vbqhvc78vqlsyaywmrpzibr7137398azpfh416bm6vh6d3h";
  };

  buildInputs = [ intltool autoreconfHook pkgconfig vala glib
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@ -294,7 +294,6 @@ stdenv.mkDerivation ({
    ++ (optional stdenv.isDarwin gnused)
    ;

-  NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";

  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
    export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
@ -519,6 +518,7 @@ stdenv.mkDerivation ({
    platforms =
      stdenv.lib.platforms.linux ++
      stdenv.lib.platforms.freebsd ++
+      stdenv.lib.platforms.illumos ++
      optionals (langAda == false) stdenv.lib.platforms.darwin;
  };
 }
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@ -293,9 +293,8 @@ stdenv.mkDerivation ({
    ++ (optional stdenv.isDarwin gnused)
    ;

-  NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
-
  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+    sed -i -e "s/-lrt//g" libstdc++-v3/configure
    export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
    export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
    export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
@ -518,6 +517,7 @@ stdenv.mkDerivation ({
    platforms =
      stdenv.lib.platforms.linux ++
      stdenv.lib.platforms.freebsd ++
+      stdenv.lib.platforms.illumos ++
      optionals (langAda == false) stdenv.lib.platforms.darwin;
  };
 }
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@ -0,0 +1,39 @@
+{ stdenv, fetchurl, makeWrapper, jre, unzip, which }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.0-beta-3594";
+  name = "kotlin-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/JetBrains/kotlin/releases/download/build-${version}/kotlin-compiler-${version}.zip";
+    sha256 = "a633dc27bc9bc87174835ea47d5be8ec73e0a673bb46c4b9a5a784db95f3c733";
+  };
+
+  propagatedBuildInputs = [ jre which ] ;
+  buildInputs = [ makeWrapper unzip ] ;
+
+  installPhase = ''
+    mkdir -p $out
+    rm "bin/"*.bat
+    mv * $out
+
+    for p in $(ls $out/bin/) ; do
+      wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ;
+    done
+  '';
+
+  meta = {
+    description = "General purpose programming language";
+    longDescription = ''
+      Kotlin is a statically typed language that targets the JVM and JavaScript.
+      It is a general-purpose language intended for industry use.
+      It is developed by a team at JetBrains although it is an OSS language 
+      and has external contributors.
+    '';
+    homepage = http://kotlinlang.org/;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with stdenv.lib.maintainers;
+      [ nequissimus ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@ -14,6 +14,7 @@
 , compiler-rt_src
 , libcxxabi
 , debugVersion ? false
+, enableSharedLibraries ? !stdenv.isDarwin
 }:

 let
@ -46,10 +47,11 @@ in stdenv.mkDerivation rec {
    "-DLLVM_BUILD_TESTS=ON"
    "-DLLVM_ENABLE_FFI=ON"
    "-DLLVM_ENABLE_RTTI=ON"
-  ] ++ stdenv.lib.optionals (!isDarwin) [
+  ] ++ stdenv.lib.optional enableSharedLibraries
    "-DBUILD_SHARED_LIBS=ON"
+    ++ stdenv.lib.optional (!isDarwin)
    "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
-  ] ++ stdenv.lib.optionals ( isDarwin) [
+    ++ stdenv.lib.optionals ( isDarwin) [
    "-DLLVM_ENABLE_LIBCXX=ON"
    "-DCAN_TARGET_i386=false"
  ];
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
    { description = "Statically typed, imperative programming language";
      homepage = http://nim-lang.org/;
      license = licenses.mit;
-      maintainers = with maintainers; [ emery ];
+      maintainers = with maintainers; [ ehmry ];
      platforms = platforms.linux ++ platforms.darwin; # arbitrary
    };
 }
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@ -37,6 +37,8 @@ let version = if isRelease then

    name = "rustc-${version}";

+    llvmShared = llvmPackages_37.llvm.override { enableSharedLibraries = true; };
+
    platform = if stdenv.system == "i686-linux"
      then "linux-i386"
      else if stdenv.system == "x86_64-linux"
@ -84,6 +86,8 @@ with stdenv.lib; stdenv.mkDerivation {

  __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ];

+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";
+
  src = if isRelease then
      fetchzip {
        url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
@ -119,7 +123,7 @@ with stdenv.lib; stdenv.mkDerivation {
                # ++ [ "--jemalloc-root=${jemalloc}/lib"
                ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${stdenv.cc.binutils}/bin/ar" ]
                ++ optional (stdenv.cc.cc ? isClang) "--enable-clang"
-                ++ optional (!forceBundledLLVM) "--llvm-root=${llvmPackages_37.llvm}";
+                ++ optional (!forceBundledLLVM) "--llvm-root=${llvmShared}";

  inherit patches;

@ -155,11 +159,10 @@ with stdenv.lib; stdenv.mkDerivation {
    configureFlagsArray+=("--infodir=$out/share/info")
  '';

-  # Procps is needed for one of the test cases
-  nativeBuildInputs = [ file python2 ]
-    ++ optionals stdenv.isLinux [ procps ];
+  # ps is needed for one of the test cases
+  nativeBuildInputs = [ file python2 procps ];
  buildInputs = [ ncurses ]
-    ++ optional (!forceBundledLLVM) llvmPackages_37.llvm;
+    ++ optional (!forceBundledLLVM) llvmShared;

  enableParallelBuilding = true;

--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@ -23,6 +23,7 @@ let
      sha256 = "0sp5445rbvms6qvzhld0kwwvydw51vq5iaf4kdqsf2d9jvaz3yx5";
    };
    armv6l-linux = armv7l-linux;
+    x86_64-solaris = x86_64-linux;
  };
  cfg = options.${stdenv.system};
 in
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@ -168,6 +168,6 @@ go.stdenv.mkDerivation (
  } // meta // {
    # add an extra maintainer to every package
    maintainers = (meta.maintainers or []) ++
-                  [ lib.maintainers.emery lib.maintainers.lethalman ];
+                  [ lib.maintainers.ehmry lib.maintainers.lethalman ];
  };
 })
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -926,5 +926,4 @@ self: super: {

  # https://github.com/mainland/language-c-quote/issues/57
  language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; };
-
 }
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -204,6 +204,7 @@ dont-distribute-packages:
  ajhc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  alea:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  algebraic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  al:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  AlignmentAlgorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  Allure:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  alms:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -221,7 +222,6 @@ dont-distribute-packages:
  altfloat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  alure:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  ALUT:                                         [ x86_64-darwin ]
-  al:                                           [ x86_64-darwin ]
  amazon-emailer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  amazonka-ec2:                                 [ i686-linux ]
  amazonka-rds:                                 [ i686-linux ]
@ -423,6 +423,7 @@ dont-distribute-packages:
  BiobaseVienna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  BiobaseXNA:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  bio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bioinformatics-toolkit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  biosff:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  biostockholm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  bird:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -461,6 +462,7 @@ dont-distribute-packages:
  Blueprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  bluetile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  bluetileutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BNFC:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  boolean-normal-forms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -788,6 +790,7 @@ dont-distribute-packages:
  ctemplate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  ctkl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  ctpl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cubical:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  cubicbezier:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  cuboid:                                       [ x86_64-darwin ]
  cudd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -986,7 +989,7 @@ dont-distribute-packages:
  Dust-tools-pcap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  dvda:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  dvdread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynamic-graph:                                [ x86_64-darwin ]
+  dynamic-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  dynamic-object:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  dynamic-plot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  dynamic-pp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -1025,6 +1028,7 @@ dont-distribute-packages:
  electrum-mnemonic:                            [ i686-linux ]
  elerea-examples:                              [ x86_64-darwin ]
  elerea-sdl:                                   [ x86_64-darwin ]
+  elm-init:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  emacs-keys:                                   [ x86_64-darwin ]
  email-header:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  email:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -1188,6 +1192,7 @@ dont-distribute-packages:
  forml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  ForSyDe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  forth-hll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  foscam-sort:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  Foster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  fpco-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  fpnla-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -1197,6 +1202,7 @@ dont-distribute-packages:
  frame-markdown:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  franchise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  Frank:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-functors:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  free-game:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  freekick2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  freenect:                                     [ x86_64-darwin ]
@ -1353,7 +1359,7 @@ dont-distribute-packages:
  gloss-sodium:                                 [ x86_64-darwin ]
  gloss:                                        [ x86_64-darwin ]
  GLURaw:                                       [ x86_64-darwin ]
-  GLUtil:                                       [ x86_64-darwin ]
+  GLUtil:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  gluturtle:                                    [ x86_64-darwin ]
  GLUT:                                         [ x86_64-darwin ]
  gmap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -1506,6 +1512,7 @@ dont-distribute-packages:
  hampp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  hamtmap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  hamusic:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  handsy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  hannahci:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  happindicator3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  happindicator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -1539,6 +1546,7 @@ dont-distribute-packages:
  HaRe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  hark:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  HARM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  harmony:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  HarmTrace-Base:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  HarmTrace:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  haroonga-httpd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -1554,6 +1562,7 @@ dont-distribute-packages:
  hashed-storage:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
  Hashell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  hash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hashids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  has:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
  hasim:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  haskakafka:                                   [ x86_64-darwin ]
@ -2128,6 +2137,7 @@ dont-distribute-packages:
  InfixApplicative:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  infix:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  inflist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  influxdb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  informative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  inilist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  inline-c-cpp:                                 [ x86_64-darwin ]
@ -2244,8 +2254,6 @@ dont-distribute-packages:
  keera-hails-reactive-polling:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  keera-hails-reactivevalues:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  keera-hails-reactive-wx:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-wx:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-wx:                      [ x86_64-darwin ]
  keera-hails-reactive-yampa:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  keera-posture:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  keiretsu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2385,6 +2393,7 @@ dont-distribute-packages:
  LinkChecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  linkchk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  linkcore:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linode:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  linux-blkid:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  linux-evdev:                                  [ x86_64-darwin ]
  linux-file-extents:                           [ x86_64-darwin ]
@ -2533,7 +2542,7 @@ dont-distribute-packages:
  mfsolve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  Mhailist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  MHask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Michelangelo:                                 [ x86_64-darwin ]
+  Michelangelo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  mida:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  midi-alsa:                                    [ x86_64-darwin ]
  midimory:                                     [ x86_64-darwin ]
@ -2772,6 +2781,7 @@ dont-distribute-packages:
  OpenAL:                                       [ x86_64-darwin ]
  OpenCL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  OpenCLRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opencog-atomspace:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  opencv-raw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  openexchangerates:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
  openflow:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -2806,6 +2816,7 @@ dont-distribute-packages:
  ot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  package-vt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  packedstring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  packman:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  padKONTROL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  PageIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  pam:                                          [ x86_64-darwin ]
@ -3089,6 +3100,7 @@ dont-distribute-packages:
  recursive-line-count:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  Redmine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reedsolomon:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  Referees:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  refh:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3388,6 +3400,7 @@ dont-distribute-packages:
  snaplet-haxl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  snaplet-hdbc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  snaplet-i18n:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-influxdb:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
  snaplet-lss:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  snaplet-mongoDB:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
  snaplet-mongodb-minimalistic:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3613,6 +3626,7 @@ dont-distribute-packages:
  th-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
  th-kinds:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  threadscope:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  threads-supervisor:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
  thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  tianbar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3815,7 +3829,7 @@ dont-distribute-packages:
  vigilance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  vimus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
  vintage-basic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vinyl-gl:                                     [ x86_64-darwin ]
+  vinyl-gl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  vinyl-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  virthualenv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  vision:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3859,7 +3873,7 @@ dont-distribute-packages:
  watchdog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  watcher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
  watchit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WaveFront:                                    [ x86_64-darwin ]
+  WaveFront:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
  wavesurfer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
  weather-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
  WebBits-Html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@ -3904,6 +3918,7 @@ dont-distribute-packages:
  woffex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
  wolf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
  word24:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  WordAlignment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  Wordlint:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
  WordNet-ghc74:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
  WordNet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@ -2508,6 +2508,7 @@ self: super: {
  "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";
@ -3203,6 +3204,7 @@ self: super: {
  "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";
@ -7172,6 +7174,7 @@ self: super: {
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
  "setenv" = doDistribute super."setenv_0_1_1_1";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7304,6 +7307,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8390,6 +8394,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@ -2507,6 +2507,7 @@ self: super: {
  "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";
@ -3202,6 +3203,7 @@ self: super: {
  "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";
@ -7171,6 +7173,7 @@ self: super: {
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
  "setenv" = doDistribute super."setenv_0_1_1_1";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7303,6 +7306,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8389,6 +8393,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@ -2507,6 +2507,7 @@ self: super: {
  "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";
@ -3202,6 +3203,7 @@ self: super: {
  "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";
@ -7171,6 +7173,7 @@ self: super: {
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
  "setenv" = doDistribute super."setenv_0_1_1_1";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7303,6 +7306,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8389,6 +8393,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@ -2507,6 +2507,7 @@ self: super: {
  "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";
@ -3202,6 +3203,7 @@ self: super: {
  "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";
@ -7171,6 +7173,7 @@ self: super: {
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
  "setenv" = doDistribute super."setenv_0_1_1_1";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7303,6 +7306,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8389,6 +8393,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@ -2507,6 +2507,7 @@ self: super: {
  "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";
@ -3201,6 +3202,7 @@ self: super: {
  "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";
@ -7167,6 +7169,7 @@ self: super: {
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
  "setenv" = doDistribute super."setenv_0_1_1_1";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7299,6 +7302,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8384,6 +8388,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@ -2507,6 +2507,7 @@ self: super: {
  "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";
@ -3201,6 +3202,7 @@ self: super: {
  "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";
@ -7167,6 +7169,7 @@ self: super: {
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
  "setenv" = doDistribute super."setenv_0_1_1_1";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7299,6 +7302,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8384,6 +8388,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@ -2504,6 +2504,7 @@ self: super: {
  "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";
@ -3198,6 +3199,7 @@ self: super: {
  "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";
@ -7161,6 +7163,7 @@ self: super: {
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
  "setenv" = doDistribute super."setenv_0_1_1_1";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7293,6 +7296,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8378,6 +8382,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@ -2504,6 +2504,7 @@ self: super: {
  "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";
@ -3198,6 +3199,7 @@ self: super: {
  "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";
@ -7161,6 +7163,7 @@ self: super: {
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
  "setenv" = doDistribute super."setenv_0_1_1_1";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7293,6 +7296,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8378,6 +8382,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@ -2495,6 +2495,7 @@ self: super: {
  "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";
@ -3188,6 +3189,7 @@ self: super: {
  "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";
@ -7146,6 +7148,7 @@ self: super: {
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
  "setenv" = doDistribute super."setenv_0_1_1_1";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7278,6 +7281,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8361,6 +8365,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@ -2492,6 +2492,7 @@ self: super: {
  "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";
@ -3184,6 +3185,7 @@ self: super: {
  "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";
@ -7136,6 +7138,7 @@ self: super: {
  "set-monad" = dontDistribute super."set-monad";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7268,6 +7271,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8346,6 +8350,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@ -2486,6 +2486,7 @@ self: super: {
  "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";
@ -3175,6 +3176,7 @@ self: super: {
  "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";
@ -6394,6 +6396,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -7105,6 +7108,7 @@ self: super: {
  "set-monad" = dontDistribute super."set-monad";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7236,6 +7240,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8308,6 +8313,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@ -2486,6 +2486,7 @@ self: super: {
  "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";
@ -3174,6 +3175,7 @@ self: super: {
  "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";
@ -6390,6 +6392,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -7101,6 +7104,7 @@ self: super: {
  "set-monad" = dontDistribute super."set-monad";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7232,6 +7236,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8304,6 +8309,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@ -2486,6 +2486,7 @@ self: super: {
  "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";
@ -3174,6 +3175,7 @@ self: super: {
  "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";
@ -6389,6 +6391,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -7100,6 +7103,7 @@ self: super: {
  "set-monad" = dontDistribute super."set-monad";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7231,6 +7235,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8301,6 +8306,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@ -2486,6 +2486,7 @@ self: super: {
  "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";
@ -3173,6 +3174,7 @@ self: super: {
  "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";
@ -6387,6 +6389,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -7098,6 +7101,7 @@ self: super: {
  "set-monad" = dontDistribute super."set-monad";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7229,6 +7233,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8298,6 +8303,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@ -2483,6 +2483,7 @@ self: super: {
  "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";
@ -3170,6 +3171,7 @@ self: super: {
  "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";
@ -6380,6 +6382,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -7090,6 +7093,7 @@ self: super: {
  "set-monad" = dontDistribute super."set-monad";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7221,6 +7225,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8290,6 +8295,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@ -2479,6 +2479,7 @@ self: super: {
  "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";
@ -3165,6 +3166,7 @@ self: super: {
  "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";
@ -6373,6 +6375,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -7081,6 +7084,7 @@ self: super: {
  "set-monad" = dontDistribute super."set-monad";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7212,6 +7216,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8279,6 +8284,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@ -2490,6 +2490,7 @@ self: super: {
  "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";
@ -3182,6 +3183,7 @@ self: super: {
  "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";
@ -7130,6 +7132,7 @@ self: super: {
  "set-monad" = dontDistribute super."set-monad";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7262,6 +7265,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8340,6 +8344,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@ -2489,6 +2489,7 @@ self: super: {
  "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";
@ -3180,6 +3181,7 @@ self: super: {
  "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";
@ -7125,6 +7127,7 @@ self: super: {
  "set-monad" = dontDistribute super."set-monad";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7257,6 +7260,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8334,6 +8338,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@ -2488,6 +2488,7 @@ self: super: {
  "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";
@ -3179,6 +3180,7 @@ self: super: {
  "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";
@ -7123,6 +7125,7 @@ self: super: {
  "set-monad" = dontDistribute super."set-monad";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7255,6 +7258,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8330,6 +8334,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@ -2488,6 +2488,7 @@ self: super: {
  "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";
@ -3179,6 +3180,7 @@ self: super: {
  "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";
@ -7117,6 +7119,7 @@ self: super: {
  "set-monad" = dontDistribute super."set-monad";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7249,6 +7252,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8324,6 +8328,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@ -2488,6 +2488,7 @@ self: super: {
  "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";
@ -3177,6 +3178,7 @@ self: super: {
  "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";
@ -7112,6 +7114,7 @@ self: super: {
  "set-monad" = dontDistribute super."set-monad";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7244,6 +7247,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8318,6 +8322,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@ -2488,6 +2488,7 @@ self: super: {
  "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";
@ -3177,6 +3178,7 @@ self: super: {
  "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";
@ -7109,6 +7111,7 @@ self: super: {
  "set-monad" = dontDistribute super."set-monad";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7241,6 +7244,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8315,6 +8319,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@ -1692,6 +1692,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2460,6 +2461,7 @@ self: super: {
  "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";
@ -3141,6 +3143,7 @@ self: super: {
  "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";
@ -4895,6 +4898,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6312,6 +6316,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -7018,6 +7023,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7149,6 +7155,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8208,6 +8215,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@ -1692,6 +1692,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2459,6 +2460,7 @@ self: super: {
  "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";
@ -3140,6 +3142,7 @@ self: super: {
  "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";
@ -4893,6 +4896,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6310,6 +6314,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -7016,6 +7021,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7147,6 +7153,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8205,6 +8212,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@ -1683,6 +1683,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2444,6 +2445,7 @@ self: super: {
  "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";
@ -3121,6 +3123,7 @@ self: super: {
  "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";
@ -4862,6 +4865,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6264,6 +6268,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -6967,6 +6972,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7097,6 +7103,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8144,6 +8151,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@ -1682,6 +1682,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2443,6 +2444,7 @@ self: super: {
  "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";
@ -3120,6 +3122,7 @@ self: super: {
  "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";
@ -4857,6 +4860,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6257,6 +6261,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -6959,6 +6964,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7089,6 +7095,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8134,6 +8141,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@ -1682,6 +1682,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2443,6 +2444,7 @@ self: super: {
  "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";
@ -3120,6 +3122,7 @@ self: super: {
  "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";
@ -4857,6 +4860,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6257,6 +6261,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -6958,6 +6963,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7088,6 +7094,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8133,6 +8140,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@ -1682,6 +1682,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2443,6 +2444,7 @@ self: super: {
  "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";
@ -3120,6 +3122,7 @@ self: super: {
  "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";
@ -4855,6 +4858,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6254,6 +6258,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -6955,6 +6960,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7085,6 +7091,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8130,6 +8137,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@ -1681,6 +1681,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2442,6 +2443,7 @@ self: super: {
  "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";
@ -3118,6 +3120,7 @@ self: super: {
  "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";
@ -4852,6 +4855,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6251,6 +6255,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -6951,6 +6956,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7080,6 +7086,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8125,6 +8132,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@ -1681,6 +1681,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2442,6 +2443,7 @@ self: super: {
  "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";
@ -3117,6 +3119,7 @@ self: super: {
  "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";
@ -4851,6 +4854,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6247,6 +6251,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -6947,6 +6952,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7076,6 +7082,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8120,6 +8127,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@ -1680,6 +1680,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2439,6 +2440,7 @@ self: super: {
  "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";
@ -3111,6 +3113,7 @@ self: super: {
  "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";
@ -4844,6 +4847,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6239,6 +6243,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -6939,6 +6944,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7068,6 +7074,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8111,6 +8118,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@ -1678,6 +1678,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2436,6 +2437,7 @@ self: super: {
  "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";
@ -3106,6 +3108,7 @@ self: super: {
  "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";
@ -4837,6 +4840,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6231,6 +6235,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -6930,6 +6935,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7059,6 +7065,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8102,6 +8109,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@ -1678,6 +1678,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2434,6 +2435,7 @@ self: super: {
  "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";
@ -3103,6 +3105,7 @@ self: super: {
  "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";
@ -4832,6 +4835,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6224,6 +6228,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -6923,6 +6928,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7052,6 +7058,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8094,6 +8101,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@ -1678,6 +1678,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2434,6 +2435,7 @@ self: super: {
  "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";
@ -3102,6 +3104,7 @@ self: super: {
  "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";
@ -4831,6 +4834,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6221,6 +6225,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -6920,6 +6925,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7049,6 +7055,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8089,6 +8096,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@ -1691,6 +1691,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2456,6 +2457,7 @@ self: super: {
  "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";
@ -3137,6 +3139,7 @@ self: super: {
  "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";
@ -4889,6 +4892,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6305,6 +6309,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -7011,6 +7016,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7142,6 +7148,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8200,6 +8207,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@ -1678,6 +1678,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2433,6 +2434,7 @@ self: super: {
  "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";
@ -3100,6 +3102,7 @@ self: super: {
  "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";
@ -4828,6 +4831,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6217,6 +6221,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -6916,6 +6921,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7044,6 +7050,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8084,6 +8091,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@ -1678,6 +1678,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2433,6 +2434,7 @@ self: super: {
  "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";
@ -3100,6 +3102,7 @@ self: super: {
  "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";
@ -4827,6 +4830,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6214,6 +6218,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -6913,6 +6918,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7041,6 +7047,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8079,6 +8086,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@ -1677,6 +1677,7 @@ self: super: {
  "blake2" = dontDistribute super."blake2";
  "blakesum" = dontDistribute super."blakesum";
  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blank-canvas" = doDistribute super."blank-canvas_0_5";
  "blas" = dontDistribute super."blas";
  "blas-hs" = dontDistribute super."blas-hs";
  "blaze" = dontDistribute super."blaze";
@ -2432,6 +2433,7 @@ self: super: {
  "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";
@ -3099,6 +3101,7 @@ self: super: {
  "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";
@ -4824,6 +4827,7 @@ self: super: {
  "kafka-client" = dontDistribute super."kafka-client";
  "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
  "kansas-lava" = dontDistribute super."kansas-lava";
  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@ -6210,6 +6214,7 @@ self: super: {
  "postgresql-orm" = dontDistribute super."postgresql-orm";
  "postgresql-query" = dontDistribute super."postgresql-query";
  "postgresql-schema" = dontDistribute super."postgresql-schema";
+  "postgresql-simple" = doDistribute super."postgresql-simple_0_4_10_0";
  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
@ -6909,6 +6914,7 @@ self: super: {
  "set-extra" = dontDistribute super."set-extra";
  "set-with" = dontDistribute super."set-with";
  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
  "setlocale" = dontDistribute super."setlocale";
  "setops" = dontDistribute super."setops";
  "sets" = dontDistribute super."sets";
@ -7037,6 +7043,7 @@ self: super: {
  "skeleton" = dontDistribute super."skeleton";
  "skeletons" = dontDistribute super."skeletons";
  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
  "skype4hs" = dontDistribute super."skype4hs";
  "skypelogexport" = dontDistribute super."skypelogexport";
  "slack" = dontDistribute super."slack";
@ -8075,6 +8082,7 @@ self: super: {
  "vinyl-gl" = dontDistribute super."vinyl-gl";
  "vinyl-json" = dontDistribute super."vinyl-json";
  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
  "virthualenv" = dontDistribute super."virthualenv";
  "vision" = dontDistribute super."vision";
  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
--- a/Show More
+++ b/Show More