about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-02-14 08:33:51 +0100
committerVladimír Čunát <vcunat@gmail.com>2016-02-14 08:33:51 +0100
commitd039c879845ddcde6108203781e4b001c409e2c2 (patch)
tree1f9e2a99d95c8866ddbef81b4bfa6a49ce979451
parent34922a3951a0ada7af4fe808250abaf5feb4e28e (diff)
parent6a036d9fca013265b4109ffcaf6df62efa010fa3 (diff)
Merge branch 'master' into closure-size
-rw-r--r--doc/haskell-users-guide.md2
-rw-r--r--lib/maintainers.nix11
-rw-r--r--nixos/doc/manual/configuration/config-file.xml2
-rw-r--r--nixos/doc/manual/default.nix15
-rw-r--r--nixos/doc/manual/man-nixos-generate-config.xml4
-rw-r--r--nixos/doc/manual/release-notes/rl-unstable.xml16
-rw-r--r--nixos/modules/config/zram.nix6
-rw-r--r--nixos/modules/hardware/video/webcam/facetimehd.nix45
-rw-r--r--nixos/modules/installer/cd-dvd/iso-image.nix8
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix3
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball.nix2
-rw-r--r--nixos/modules/installer/tools/nixos-generate-config.pl4
-rw-r--r--nixos/modules/installer/tools/nixos-install.sh5
-rw-r--r--nixos/modules/installer/tools/nixos-rebuild.sh7
-rw-r--r--nixos/modules/module-list.nix9
-rw-r--r--nixos/modules/programs/ssh.nix3
-rw-r--r--nixos/modules/security/acme.nix4
-rw-r--r--nixos/modules/services/databases/postgresql.nix38
-rw-r--r--nixos/modules/services/hardware/acpid.nix174
-rw-r--r--nixos/modules/services/hardware/bluetooth.nix60
-rw-r--r--nixos/modules/services/hardware/udev.nix87
-rw-r--r--nixos/modules/services/logging/logstash.nix6
-rw-r--r--nixos/modules/services/mail/dovecot.nix1
-rw-r--r--nixos/modules/services/mail/dspam.nix5
-rw-r--r--nixos/modules/services/mail/opensmtpd.nix21
-rw-r--r--nixos/modules/services/mail/postfix.nix32
-rw-r--r--nixos/modules/services/mail/postsrsd.nix6
-rw-r--r--nixos/modules/services/misc/gitit.nix1
-rw-r--r--nixos/modules/services/misc/sundtek.nix2
-rw-r--r--nixos/modules/services/networking/connman.nix6
-rw-r--r--nixos/modules/services/networking/i2pd.nix300
-rw-r--r--nixos/modules/services/networking/ssh/sshd.nix13
-rw-r--r--nixos/modules/services/networking/tinc.nix12
-rw-r--r--nixos/modules/services/networking/unifi.nix2
-rw-r--r--nixos/modules/services/networking/wpa_supplicant.nix28
-rw-r--r--nixos/modules/services/search/elasticsearch.nix13
-rw-r--r--nixos/modules/services/search/kibana.nix65
-rw-r--r--nixos/modules/services/security/haka.nix156
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/mediawiki.nix4
-rw-r--r--nixos/modules/services/x11/desktop-managers/default.nix8
-rw-r--r--nixos/modules/services/x11/desktop-managers/gnome3.nix2
-rw-r--r--nixos/modules/services/x11/desktop-managers/kde4.nix6
-rw-r--r--nixos/modules/services/x11/desktop-managers/kde5.nix10
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix3
-rw-r--r--nixos/modules/services/x11/display-managers/lightdm.nix2
-rw-r--r--nixos/modules/services/x11/hardware/synaptics.nix29
-rw-r--r--nixos/modules/services/x11/window-managers/i3.nix2
-rw-r--r--nixos/modules/system/activation/switch-to-configuration.pl2
-rw-r--r--nixos/modules/system/boot/initrd-network.nix178
-rw-r--r--nixos/modules/system/boot/initrd-ssh.nix124
-rw-r--r--nixos/modules/system/boot/kernel.nix3
-rw-r--r--nixos/modules/system/boot/loader/init-script/init-script-builder.sh9
-rw-r--r--nixos/modules/system/boot/stage-1-init.sh4
-rw-r--r--nixos/modules/system/boot/stage-1.nix20
-rw-r--r--nixos/modules/tasks/filesystems.nix18
-rw-r--r--nixos/modules/tasks/kbd.nix51
-rw-r--r--nixos/modules/tasks/network-interfaces-scripted.nix7
-rw-r--r--nixos/modules/tasks/network-interfaces.nix2
-rw-r--r--nixos/modules/virtualisation/amazon-image.nix29
-rw-r--r--nixos/modules/virtualisation/amazon-init.nix23
-rw-r--r--nixos/modules/virtualisation/azure-agent.nix9
-rw-r--r--nixos/modules/virtualisation/ec2-data.nix38
-rw-r--r--nixos/modules/virtualisation/qemu-vm.nix13
-rw-r--r--nixos/release.nix1
-rw-r--r--nixos/tests/chromium.nix4
-rw-r--r--nixos/tests/ec2.nix12
-rw-r--r--nixos/tests/haka.nix24
-rw-r--r--nixos/tests/initrd-network.nix22
-rw-r--r--nixos/tests/misc.nix2
-rw-r--r--nixos/tests/nfs.nix2
-rw-r--r--nixos/tests/simple.nix4
-rw-r--r--pkgs/applications/audio/abcde/default.nix4
-rw-r--r--pkgs/applications/audio/deadbeef/default.nix3
-rw-r--r--pkgs/applications/audio/faust/faust1.nix11
-rw-r--r--pkgs/applications/audio/faust/faust2.nix (renamed from pkgs/applications/audio/faust/default.nix)0
-rw-r--r--pkgs/applications/audio/ladspa-sdk/default.nix4
-rw-r--r--pkgs/applications/audio/ladspa-sdk/ladspah.nix35
-rw-r--r--pkgs/applications/audio/non/default.nix6
-rw-r--r--pkgs/applications/audio/qtscrobbler/default.nix36
-rw-r--r--pkgs/applications/audio/sonata/default.nix73
-rw-r--r--pkgs/applications/audio/spotify/default.nix9
-rw-r--r--pkgs/applications/audio/timemachine/default.nix29
-rw-r--r--pkgs/applications/display-managers/slim/default.nix6
-rw-r--r--pkgs/applications/display-managers/slim/sort-sessions.patch40
-rw-r--r--pkgs/applications/editors/atom/default.nix4
-rw-r--r--pkgs/applications/editors/eclipse/default.nix78
-rw-r--r--pkgs/applications/editors/eclipse/plugins.nix12
-rw-r--r--pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix2
-rw-r--r--pkgs/applications/editors/emacs-modes/elpa-generated.nix105
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-generated.nix8429
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix3373
-rw-r--r--pkgs/applications/editors/idea/default.nix6
-rw-r--r--pkgs/applications/editors/lighttable/default.nix57
-rw-r--r--pkgs/applications/editors/sublime3/default.nix14
-rw-r--r--pkgs/applications/editors/vim/configurable.nix1
-rw-r--r--pkgs/applications/graphics/darktable/default.nix35
-rw-r--r--pkgs/applications/graphics/imv/default.nix17
-rw-r--r--pkgs/applications/graphics/sane/backends/generic.nix3
-rw-r--r--pkgs/applications/graphics/synfigstudio/default.nix48
-rw-r--r--pkgs/applications/misc/adobe-reader/default.nix2
-rw-r--r--pkgs/applications/misc/calibre/default.nix4
-rw-r--r--pkgs/applications/misc/cli-visualizer/default.nix29
-rw-r--r--pkgs/applications/misc/ctodo/default.nix6
-rw-r--r--pkgs/applications/misc/dmenu/default.nix4
-rw-r--r--pkgs/applications/misc/dmenu/wayland.nix34
-rw-r--r--pkgs/applications/misc/electrum-dash/default.nix44
-rw-r--r--pkgs/applications/misc/electrum/default.nix10
-rw-r--r--pkgs/applications/misc/gollum/Gemfile2
-rw-r--r--pkgs/applications/misc/gollum/Gemfile.lock55
-rw-r--r--pkgs/applications/misc/gollum/default.nix18
-rw-r--r--pkgs/applications/misc/gollum/gemset.nix170
-rw-r--r--pkgs/applications/misc/hstr/default.nix4
-rw-r--r--pkgs/applications/misc/keepass/default.nix21
-rw-r--r--pkgs/applications/misc/keepass/keepass.patch89
-rw-r--r--pkgs/applications/misc/keepassx/2.0.nix4
-rw-r--r--pkgs/applications/misc/keybase/default.nix4
-rw-r--r--pkgs/applications/misc/keybase/package.nix1964
-rw-r--r--pkgs/applications/misc/kgocode/default.nix4
-rw-r--r--pkgs/applications/misc/khard/default.nix5
-rw-r--r--pkgs/applications/misc/mdp/default.nix4
-rw-r--r--pkgs/applications/misc/pdfmod/default.nix1
-rw-r--r--pkgs/applications/misc/qtpass/default.nix18
-rw-r--r--pkgs/applications/misc/ranger/default.nix4
-rw-r--r--pkgs/applications/misc/sc-im/default.nix41
-rw-r--r--pkgs/applications/misc/scim/default.nix42
-rw-r--r--pkgs/applications/misc/solaar/default.nix17
-rw-r--r--pkgs/applications/misc/st/wayland.nix34
-rw-r--r--pkgs/applications/misc/synergy/default.nix6
-rw-r--r--pkgs/applications/networking/browsers/chromium/plugins.nix8
-rw-r--r--pkgs/applications/networking/browsers/chromium/source/sources.nix16
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/sources.nix358
-rw-r--r--pkgs/applications/networking/browsers/firefox/default.nix8
-rw-r--r--pkgs/applications/networking/browsers/firefox/wrapper.nix3
-rw-r--r--pkgs/applications/networking/browsers/links/default.nix9
-rw-r--r--pkgs/applications/networking/browsers/links2/default.nix4
-rw-r--r--pkgs/applications/networking/cluster/marathon/default.nix8
-rw-r--r--pkgs/applications/networking/davmail/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix58
-rw-r--r--pkgs/applications/networking/instant-messengers/mcabber/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/teamspeak/client.nix11
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix2
-rw-r--r--pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix2
-rw-r--r--pkgs/applications/networking/irc/irssi/otr/default.nix21
-rw-r--r--pkgs/applications/networking/mailreaders/claws-mail/default.nix7
-rw-r--r--pkgs/applications/networking/newsreaders/liferea/default.nix6
-rw-r--r--pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch12
-rw-r--r--pkgs/applications/networking/nntp-proxy/default.nix31
-rw-r--r--pkgs/applications/networking/remote/citrix-receiver/default.nix12
-rw-r--r--pkgs/applications/networking/remote/ssvnc/default.nix3
-rw-r--r--pkgs/applications/office/gnucash/2.6.nix14
-rw-r--r--pkgs/applications/office/mendeley/default.nix6
-rw-r--r--pkgs/applications/science/logic/isabelle/default.nix15
-rw-r--r--pkgs/applications/science/logic/tptp/default.nix104
-rw-r--r--pkgs/applications/science/math/content/default.nix98
-rw-r--r--pkgs/applications/version-management/cvs/default.nix3
-rw-r--r--pkgs/applications/version-management/mercurial/default.nix9
-rw-r--r--pkgs/applications/version-management/monotone-viz/default.nix44
-rw-r--r--pkgs/applications/version-management/monotone-viz/mtn-head.nix33
-rw-r--r--pkgs/applications/version-management/mr/default.nix4
-rw-r--r--pkgs/applications/version-management/smartgithg/default.nix8
-rw-r--r--pkgs/applications/version-management/tailor/default.nix16
-rw-r--r--pkgs/applications/version-management/viewmtn/0.10.nix44
-rw-r--r--pkgs/applications/video/obs-studio/default.nix4
-rw-r--r--pkgs/applications/video/vlc/default.nix2
-rw-r--r--pkgs/applications/virtualization/docker/default.nix4
-rw-r--r--pkgs/applications/virtualization/rkt/default.nix8
-rw-r--r--pkgs/applications/window-managers/awesome/default.nix4
-rw-r--r--pkgs/applications/window-managers/compton/git.nix2
-rw-r--r--pkgs/applications/window-managers/i3/default.nix9
-rw-r--r--pkgs/applications/window-managers/i3/status.nix11
-rw-r--r--pkgs/applications/window-managers/orbment/default.nix57
-rw-r--r--pkgs/applications/window-managers/sway/default.nix40
-rw-r--r--pkgs/applications/window-managers/velox/default.nix31
-rw-r--r--pkgs/build-support/emacs/wrapper.nix64
-rwxr-xr-xpkgs/build-support/fetchgit/nix-prefetch-git27
-rw-r--r--pkgs/build-support/fetchgitlocal/default.nix2
-rw-r--r--pkgs/build-support/kernel/modules-closure.nix4
-rw-r--r--pkgs/build-support/kernel/modules-closure.sh2
-rw-r--r--pkgs/build-support/vm/default.nix12
-rw-r--r--pkgs/data/fonts/arkpandora/default.nix18
-rw-r--r--pkgs/data/fonts/google-fonts/default.nix2
-rw-r--r--pkgs/data/fonts/libertine/default.nix39
-rw-r--r--pkgs/data/fonts/powerline-fonts/default.nix8
-rw-r--r--pkgs/data/fonts/redhat-liberation-fonts/binary.nix29
-rw-r--r--pkgs/data/fonts/redhat-liberation-fonts/default.nix14
-rw-r--r--pkgs/data/misc/geolite-legacy/default.nix14
-rw-r--r--pkgs/data/misc/media-player-info/default.nix2
-rw-r--r--pkgs/data/misc/wireless-regdb/default.nix4
-rw-r--r--pkgs/desktops/gnome-2/platform/gtkglext/default.nix3
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix28
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix41
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix30
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix54
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix33
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix38
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/glade/default.nix35
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix47
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix27
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix32
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix44
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix20
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix29
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix35
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix26
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix36
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix22
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/polari/default.nix27
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix42
-rw-r--r--pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix29
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix26
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/baobab/default.nix37
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/caribou/default.nix31
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix28
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/dconf/default.nix23
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/empathy/default.nix57
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/eog/default.nix31
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix54
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch10
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/evince/default.nix69
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix36
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/folks/default.nix43
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gconf/default.nix32
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gcr/default.nix33
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix41
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch15
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch17
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch83
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gdm/default.nix46
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch13
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch20
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch17
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch15
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix21
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gjs/default.nix28
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix17
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix27
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix35
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix52
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch10
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix64
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch19
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix32
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix37
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix40
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix36
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix41
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix22
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix38
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix37
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix36
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix31
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix36
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix57
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix10
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix36
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix37
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix44
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix18
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix20
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix52
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix27
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/grilo/default.nix33
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh7
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix32
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gsound/default.nix22
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix27
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch11
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix38
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix21
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix33
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/libgee/default.nix26
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch13
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/libgee/libgee-1.nix26
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix26
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix22
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix20
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix32
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix16
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/mutter/default.nix37
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch20
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix30
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch24
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/rest/default.nix19
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/sushi/default.nix38
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix20
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/totem/default.nix47
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/tracker/default.nix55
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/vino/default.nix32
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix40
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/vte/default.nix48
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch226
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix23
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/yelp/default.nix31
-rw-r--r--pkgs/desktops/gnome-3/3.16/core/zenity/default.nix28
-rw-r--r--pkgs/desktops/gnome-3/3.16/default.nix399
-rw-r--r--pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix16
-rw-r--r--pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix34
-rw-r--r--pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix23
-rw-r--r--pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix25
-rw-r--r--pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix20
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix25
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix25
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix22
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix23
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/hitori/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/iagno/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix26
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/games/tali/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch39
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/california/default.nix39
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/geary/default.nix53
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch24
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix28
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix23
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix47
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch123
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch103
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch29
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix49
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch22
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix20
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix44
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix24
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix30
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix21
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix22
-rw-r--r--pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix50
-rw-r--r--pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix6
-rw-r--r--pkgs/desktops/plasma-5.5/bluedevil.nix2
-rw-r--r--pkgs/development/compilers/as31/default.nix23
-rw-r--r--pkgs/development/compilers/dtc/default.nix2
-rw-r--r--pkgs/development/compilers/ecl/default.nix8
-rw-r--r--pkgs/development/compilers/ecl/default.upstream6
-rw-r--r--pkgs/development/compilers/gcl/default.nix70
-rw-r--r--pkgs/development/compilers/ghc/8.0.1.nix6
-rw-r--r--pkgs/development/compilers/ghcjs/ghcjs-boot.nix4
-rw-r--r--pkgs/development/compilers/ghcjs/ghcjs.patch22
-rw-r--r--pkgs/development/compilers/icedtea-web/default.nix4
-rw-r--r--pkgs/development/compilers/kotlin/default.nix8
-rw-r--r--pkgs/development/compilers/mono/default.nix5
-rw-r--r--pkgs/development/compilers/oraclejdk/jdk8-linux.nix6
-rw-r--r--pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix6
-rw-r--r--pkgs/development/compilers/rustc/default.nix4
-rw-r--r--pkgs/development/compilers/rustc/head.nix8
-rw-r--r--pkgs/development/compilers/sbcl/default.nix4
-rw-r--r--pkgs/development/compilers/uhc/default.nix11
-rw-r--r--pkgs/development/coq-modules/contribs/all.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix24
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix3
-rw-r--r--pkgs/development/haskell-modules/configuration-ghcjs.nix21
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.0.nix52
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.1.nix52
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.2.nix52
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.3.nix52
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.4.nix52
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.5.nix52
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.6.nix52
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-0.7.nix52
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.0.nix53
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.1.nix53
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.10.nix53
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.11.nix53
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.12.nix53
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.13.nix53
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.14.nix53
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.15.nix54
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.2.nix53
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.4.nix53
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.5.nix53
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.7.nix53
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.8.nix53
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-1.9.nix53
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.0.nix56
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.1.nix56
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.10.nix57
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.11.nix57
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.12.nix57
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.13.nix57
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.14.nix57
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.15.nix57
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.16.nix57
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.17.nix57
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.18.nix57
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.19.nix58
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.2.nix56
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.20.nix58
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.21.nix58
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.22.nix58
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.3.nix56
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.4.nix56
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.5.nix56
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.6.nix56
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.7.nix56
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.8.nix57
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-2.9.nix57
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.0.nix62
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.1.nix62
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.10.nix69
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.11.nix69
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.12.nix69
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.13.nix70
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.14.nix70
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.15.nix71
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.16.nix72
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.17.nix72
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.18.nix72
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.19.nix73
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.2.nix62
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.20.nix75
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.21.nix75
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.22.nix75
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.3.nix63
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.4.nix64
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.5.nix65
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.6.nix65
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.7.nix67
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.8.nix67
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-3.9.nix67
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-4.0.nix92
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-4.1.nix92
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-4.2.nix100
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-5.0.nix117
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-5.1.nix7658
-rw-r--r--pkgs/development/haskell-modules/configuration-lts-5.2.nix7646
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix3597
-rw-r--r--pkgs/development/haskell-modules/hoogle.nix35
-rw-r--r--pkgs/development/haskell-modules/patches/hans-disable-webserver.patch11
-rw-r--r--pkgs/development/interpreters/acl2/default.nix50
-rw-r--r--pkgs/development/interpreters/bats/default.nix21
-rw-r--r--pkgs/development/interpreters/elixir/default.nix4
-rw-r--r--pkgs/development/interpreters/jruby/default.nix8
-rw-r--r--pkgs/development/interpreters/php/default.nix13
-rw-r--r--pkgs/development/interpreters/rakudo/default.nix4
-rw-r--r--pkgs/development/interpreters/ruby/bundix/default.nix54
-rw-r--r--pkgs/development/interpreters/ruby/default.nix12
-rw-r--r--pkgs/development/interpreters/ruby/patchsets.nix5
-rw-r--r--pkgs/development/interpreters/ruby/rvm-patchsets.nix4
-rw-r--r--pkgs/development/libraries/SDL/default.nix5
-rw-r--r--pkgs/development/libraries/SDL_ttf/default.nix27
-rw-r--r--pkgs/development/libraries/acl/default.nix1
-rw-r--r--pkgs/development/libraries/attr/default.nix1
-rw-r--r--pkgs/development/libraries/cdk/default.nix21
-rw-r--r--pkgs/development/libraries/cln/default.nix5
-rw-r--r--pkgs/development/libraries/cmocka/default.nix48
-rw-r--r--pkgs/development/libraries/hyena/default.nix4
-rw-r--r--pkgs/development/libraries/libaacs/default.nix2
-rw-r--r--pkgs/development/libraries/libao/default.nix4
-rw-r--r--pkgs/development/libraries/libbdplus/default.nix2
-rw-r--r--pkgs/development/libraries/libbluray/default.nix2
-rw-r--r--pkgs/development/libraries/libcutl/default.nix21
-rw-r--r--pkgs/development/libraries/libdvbpsi/default.nix8
-rw-r--r--pkgs/development/libraries/libdvdcss/default.nix9
-rw-r--r--pkgs/development/libraries/libdvdnav/default.nix2
-rw-r--r--pkgs/development/libraries/libdvdread/default.nix2
-rw-r--r--pkgs/development/libraries/libgpg-error/default.nix4
-rw-r--r--pkgs/development/libraries/libimobiledevice/default.nix4
-rw-r--r--pkgs/development/libraries/libimobiledevice/disable_sslv3.patch25
-rw-r--r--pkgs/development/libraries/libinput/default.nix4
-rw-r--r--pkgs/development/libraries/libpsl/default.nix6
-rw-r--r--pkgs/development/libraries/libsrs2/default.nix17
-rw-r--r--pkgs/development/libraries/miniball/default.nix25
-rw-r--r--pkgs/development/libraries/nanomsg/default.nix2
-rw-r--r--pkgs/development/libraries/ncbi/default.nix54
-rw-r--r--pkgs/development/libraries/nss/default.nix6
-rw-r--r--pkgs/development/libraries/openal/default.nix35
-rw-r--r--pkgs/development/libraries/openjpeg/generic.nix2
-rw-r--r--pkgs/development/libraries/openssl/chacha.nix70
-rw-r--r--pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix2
-rw-r--r--pkgs/development/libraries/pugixml/default.nix4
-rw-r--r--pkgs/development/libraries/science/math/openblas/0.2.14.nix65
-rw-r--r--pkgs/development/libraries/swc/default.nix30
-rw-r--r--pkgs/development/libraries/wcslib/default.nix4
-rw-r--r--pkgs/development/libraries/wlc/default.nix68
-rw-r--r--pkgs/development/libraries/wld/default.nix30
-rw-r--r--pkgs/development/libraries/x264/default.nix6
-rw-r--r--pkgs/development/libraries/x265/default.nix5
-rw-r--r--pkgs/development/libraries/zeromq/4.x.nix12
-rw-r--r--pkgs/development/mobile/titaniumenv/build-app.nix35
-rw-r--r--pkgs/development/mobile/titaniumenv/examples/default.nix13
-rw-r--r--pkgs/development/ocaml-modules/x509/default.nix4
-rw-r--r--pkgs/development/python-modules/bootstrapped-pip/default.nix14
-rw-r--r--pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch151
-rw-r--r--pkgs/development/python-modules/cairocffi/dlopen-paths.patch47
-rw-r--r--pkgs/development/python-modules/graph-tool/2.x.x.nix19
-rw-r--r--pkgs/development/python-modules/libsexy/default.nix33
-rw-r--r--pkgs/development/python-modules/numpy-scipy-support.nix35
-rw-r--r--pkgs/development/python-modules/numpy.nix51
-rw-r--r--pkgs/development/python-modules/scipy.nix47
-rw-r--r--pkgs/development/tools/analysis/rr/default.nix4
-rw-r--r--pkgs/development/tools/backblaze-b2/default.nix31
-rw-r--r--pkgs/development/tools/build-managers/cargo/default.nix6
-rw-r--r--pkgs/development/tools/build-managers/gradle/default.nix4
-rw-r--r--pkgs/development/tools/build-managers/nant/default.nix69
-rw-r--r--pkgs/development/tools/build-managers/waf/default.nix31
-rw-r--r--pkgs/development/tools/misc/kibana/default.nix5
-rw-r--r--pkgs/development/tools/ocaml/ocaml-top/default.nix2
-rw-r--r--pkgs/development/tools/packer/default.nix2
-rw-r--r--pkgs/development/tools/packer/deps.nix536
-rw-r--r--pkgs/development/tools/sunxi-tools/default.nix29
-rw-r--r--pkgs/development/web/nodejs/no-xcode.patch14
-rw-r--r--pkgs/development/web/nodejs/pkg-libpath.patch13
-rw-r--r--pkgs/development/web/nodejs/v4.nix2
-rw-r--r--pkgs/development/web/nodejs/v5.nix3
-rw-r--r--pkgs/games/arx-libertatis/default.nix45
-rw-r--r--pkgs/games/dwarf-fortress/default.nix3
-rw-r--r--pkgs/games/dwarf-fortress/themes/cla.nix32
-rw-r--r--pkgs/games/dwarf-fortress/themes/phoebus.nix10
-rw-r--r--pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in2
-rw-r--r--pkgs/games/gzdoom/default.nix2
-rw-r--r--pkgs/games/jamp/default.nix30
-rw-r--r--pkgs/games/jamp/src-for-default.nix9
-rw-r--r--pkgs/games/jamp/src-info-for-default.nix4
-rw-r--r--pkgs/games/lincity/default.nix29
-rw-r--r--pkgs/games/vassal/default.nix35
-rw-r--r--pkgs/games/wesnoth/default.nix4
-rw-r--r--pkgs/games/zandronum/bin.nix12
-rw-r--r--pkgs/games/zandronum/default.nix2
-rw-r--r--pkgs/games/zangband/default.nix43
-rw-r--r--pkgs/games/zdoom/default.nix2
-rw-r--r--pkgs/misc/drivers/sundtek/default.nix6
-rw-r--r--pkgs/misc/emulators/mednafen/default.nix6
-rw-r--r--pkgs/misc/emulators/mednafen/server.nix6
-rw-r--r--pkgs/misc/emulators/mupen64plus/1.5.nix33
-rw-r--r--pkgs/misc/emulators/wine/packages.nix51
-rw-r--r--pkgs/misc/emulators/wine/sources.nix55
-rw-r--r--pkgs/misc/emulators/wine/staging.nix13
-rw-r--r--pkgs/misc/emulators/wine/versions.nix30
-rw-r--r--pkgs/misc/emulators/wine/winetricks.nix14
-rw-r--r--pkgs/misc/themes/vertex/default.nix2
-rw-r--r--pkgs/misc/vim-plugins/default.nix11
-rw-r--r--pkgs/misc/vim-plugins/vim-plugin-names1
-rw-r--r--pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch61
-rw-r--r--pkgs/os-specific/linux/bluez/bluez5.nix3
-rw-r--r--pkgs/os-specific/linux/bluez/bluez5_28.nix1
-rw-r--r--pkgs/os-specific/linux/drbd/default.nix2
-rw-r--r--pkgs/os-specific/linux/facetimehd/default.nix34
-rw-r--r--pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix51
-rw-r--r--pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix6
-rw-r--r--pkgs/os-specific/linux/htop/default.nix6
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix9
-rw-r--r--pkgs/os-specific/linux/kernel/cve-2016-0728.patch78
-rw-r--r--pkgs/os-specific/linux/kernel/generic.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-3.10.nix6
-rw-r--r--pkgs/os-specific/linux/kernel/linux-3.12.nix6
-rw-r--r--pkgs/os-specific/linux/kernel/linux-3.14.nix7
-rw-r--r--pkgs/os-specific/linux/kernel/linux-3.18.nix6
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.1.nix6
-rw-r--r--pkgs/os-specific/linux/kernel/linux-4.4.nix7
-rw-r--r--pkgs/os-specific/linux/kernel/linux-mptcp.nix2
-rw-r--r--pkgs/os-specific/linux/kernel/linux-testing.nix8
-rw-r--r--pkgs/os-specific/linux/kernel/linux.upstream.template13
-rw-r--r--pkgs/os-specific/linux/kernel/manual-config.nix9
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix2
-rw-r--r--pkgs/os-specific/linux/kmod/default.nix6
-rw-r--r--pkgs/os-specific/linux/mcelog/default.nix4
-rw-r--r--pkgs/os-specific/linux/pagemon/default.nix4
-rw-r--r--pkgs/os-specific/linux/pam_u2f/default.nix4
-rw-r--r--pkgs/os-specific/linux/pflask/default.nix33
-rw-r--r--pkgs/os-specific/linux/powertop/default.nix1
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix12
-rw-r--r--pkgs/servers/mail/dspam/default.nix7
-rw-r--r--pkgs/servers/mail/opensmtpd/default.nix1
-rw-r--r--pkgs/servers/mail/postfix/pfixtools.nix48
-rw-r--r--pkgs/servers/mail/rmilter/default.nix2
-rw-r--r--pkgs/servers/mail/rspamd/default.nix2
-rw-r--r--pkgs/servers/nosql/cassandra/2.1.nix4
-rw-r--r--pkgs/servers/plex/default.nix6
-rw-r--r--pkgs/servers/pulseaudio/default.nix6
-rw-r--r--pkgs/servers/quagga/default.nix72
-rw-r--r--pkgs/servers/search/elasticsearch/2.x.nix41
-rw-r--r--pkgs/servers/search/elasticsearch/es-home-2.x.patch31
-rw-r--r--pkgs/servers/sql/postgresql/default.nix26
-rw-r--r--pkgs/servers/x11/xorg/default.nix6
-rw-r--r--pkgs/servers/x11/xorg/tarballs-7.7.list2
-rw-r--r--pkgs/servers/xmpp/ejabberd/default.nix147
-rw-r--r--pkgs/servers/xmpp/prosody/default.nix4
-rw-r--r--pkgs/servers/xmpp/pyIRCt/default.nix42
-rw-r--r--pkgs/servers/xmpp/pyMAILt/default.nix36
-rw-r--r--pkgs/shells/fish/default.nix1
-rw-r--r--pkgs/tools/X11/ckbcomp/default.nix2
-rw-r--r--pkgs/tools/X11/screen-message/default.nix9
-rw-r--r--pkgs/tools/admin/webdruid/default.nix30
-rw-r--r--pkgs/tools/admin/webdruid/src-for-default.nix8
-rw-r--r--pkgs/tools/admin/webdruid/src-info-for-default.nix7
-rw-r--r--pkgs/tools/audio/beets/default.nix55
-rw-r--r--pkgs/tools/backup/obnam/default.nix4
-rw-r--r--pkgs/tools/compression/zstd/default.nix4
-rw-r--r--pkgs/tools/filesystems/darling-dmg/default.nix24
-rw-r--r--pkgs/tools/graphics/asymptote/default.nix18
-rw-r--r--pkgs/tools/graphics/cuneiform/default.nix37
-rw-r--r--pkgs/tools/graphics/vips/default.nix4
-rw-r--r--pkgs/tools/graphics/welkin/default.nix68
-rw-r--r--pkgs/tools/inputmethods/m17n-db/default.nix24
-rw-r--r--pkgs/tools/inputmethods/m17n-lib/default.nix19
-rw-r--r--pkgs/tools/inputmethods/uim/default.nix6
-rw-r--r--pkgs/tools/misc/bibutils/default.nix25
-rw-r--r--pkgs/tools/misc/cpulimit/default.nix2
-rw-r--r--pkgs/tools/misc/dvtm/default.nix4
-rw-r--r--pkgs/tools/misc/gnokii/default.nix34
-rw-r--r--pkgs/tools/misc/gnokii/src-for-default.nix9
-rw-r--r--pkgs/tools/misc/gnokii/src-info-for-default.nix4
-rw-r--r--pkgs/tools/misc/parallel/default.nix4
-rw-r--r--pkgs/tools/misc/progress/default.nix7
-rw-r--r--pkgs/tools/misc/rrdtool/default.nix5
-rw-r--r--pkgs/tools/misc/trash-cli/default.nix2
-rw-r--r--pkgs/tools/misc/vdirsyncer/default.nix4
-rw-r--r--pkgs/tools/networking/altermime/default.nix54
-rw-r--r--pkgs/tools/networking/cmst/default.nix16
-rw-r--r--pkgs/tools/networking/curl/default.nix2
-rw-r--r--pkgs/tools/networking/dropbear/default.nix2
-rw-r--r--pkgs/tools/networking/email/default.nix40
-rw-r--r--pkgs/tools/networking/i2pd/default.nix4
-rw-r--r--pkgs/tools/networking/miniupnpd/default.nix4
-rw-r--r--pkgs/tools/networking/mu/default.nix4
-rw-r--r--pkgs/tools/networking/nethogs/default.nix2
-rw-r--r--pkgs/tools/networking/openssh/default.nix15
-rw-r--r--pkgs/tools/networking/openssh/disable-roaming.patch51
-rw-r--r--pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch65
-rw-r--r--pkgs/tools/networking/privoxy/default.nix10
-rw-r--r--pkgs/tools/package-management/nix/default.nix40
-rw-r--r--pkgs/tools/security/cipherscan/default.nix43
-rw-r--r--pkgs/tools/security/cipherscan/path.patch93
-rw-r--r--pkgs/tools/security/gnupg/21.nix6
-rw-r--r--pkgs/tools/security/gnupg/gpgkey2ssh-21.patch13
-rw-r--r--pkgs/tools/security/haka/default.nix34
-rw-r--r--pkgs/tools/security/pass/default.nix4
-rw-r--r--pkgs/tools/security/pass/program-name.patch13
-rw-r--r--pkgs/tools/security/rarcrack/default.nix39
-rw-r--r--pkgs/tools/security/tor/torbrowser.nix6
-rw-r--r--pkgs/tools/system/lr/default.nix26
-rw-r--r--pkgs/tools/system/nq/default.nix25
-rw-r--r--pkgs/tools/system/xe/default.nix20
-rw-r--r--pkgs/tools/text/colordiff/default.nix2
-rw-r--r--pkgs/tools/text/popfile/default.nix71
-rw-r--r--pkgs/tools/typesetting/tex/disser/default.nix55
-rw-r--r--pkgs/tools/virtualization/azure-cli/node-packages.nix701
-rw-r--r--pkgs/top-level/all-packages.nix219
-rw-r--r--pkgs/top-level/dotnet-packages.nix4
-rw-r--r--pkgs/top-level/emacs-packages.nix65
-rw-r--r--pkgs/top-level/go-packages.nix81
-rw-r--r--pkgs/top-level/haskell-packages.nix15
-rw-r--r--pkgs/top-level/node-packages-generated.nix11
-rw-r--r--pkgs/top-level/perl-packages.nix104
-rw-r--r--pkgs/top-level/python-packages.nix620
-rw-r--r--pkgs/top-level/release.nix16
-rw-r--r--pkgs/top-level/rust-packages.nix6
671 files changed, 37265 insertions, 16573 deletions
diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md
index b11e4cf09f848..b9b2fe9e3bc9d 100644
--- a/doc/haskell-users-guide.md
+++ b/doc/haskell-users-guide.md
@@ -234,7 +234,7 @@ library promises to give its users access to GHC's installation paths. Only,
 the library can't possible know that path when it's compiled, because the path
 GHC considers its own is determined only much later, when the user configures
 it through `ghcWithPackages`. So we [patched
-ghc-paths](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/ghc-paths-nix.patch)
+ghc-paths](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch)
 to return the paths found in those environment variables at run-time rather
 than trying to guess them at compile-time.
 
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index def1c4a22d965..808d78d499de4 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -27,6 +27,7 @@
   anderspapitto = "Anders Papitto <anderspapitto@gmail.com>";
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   andrewrk = "Andrew Kelley <superjoe30@gmail.com>";
+  aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>";
   antono = "Antono Vasiljev <self@antono.info>";
   ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";
   aristid = "Aristid Breitkreuz <aristidb@gmail.com>";
@@ -93,10 +94,11 @@
   eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
+  ehmry = "Emery Hemingway <emery@vfemail.net>";
   eikek = "Eike Kettner <eike.kettner@posteo.de>";
   elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>";
+  elitak = "Eric Litak <elitak@gmail.com>";
   ellis = "Ellis Whitehead <nixos@ellisw.net>";
-  ehmry = "Emery Hemingway <emery@vfemail.net>";
   epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
   ericbmerritt = "Eric Merritt <eric@afiniate.com>";
   ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>";
@@ -104,6 +106,7 @@
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
   exi = "Reno Reckling <nixos@reckling.org>";
   exlevan = "Alexey Levan <exlevan@gmail.com>";
+  fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
   fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
@@ -124,7 +127,7 @@
   gfxmonk = "Tim Cuthbertson <tim@gfxmonk.net>";
   giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
   gleber = "Gleb Peregud <gleber.p@gmail.com>";
-  globin = "Robin Gloster <robin@glob.in>";
+  globin = "Robin Gloster <mail@glob.in>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   gridaphobe = "Eric Seidel <eric@seidel.io>";
   guibert = "David Guibert <david.guibert@gmail.com>";
@@ -159,6 +162,7 @@
   jzellner = "Jeff Zellner <jeffz@eml.cc>";
   kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
   kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>";
+  kevincox = "Kevin Cox <kevincox@kevincox.ca>";
   khumba = "Bryan Gardiner <bog@khumba.net>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   koral = "Koral <koral@mailoo.org>";
@@ -300,6 +304,7 @@
   taeer = "Taeer Bar-Yam <taeer@necsi.edu>";
   tailhook = "Paul Colomiets <paul@colomiets.name>";
   taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
+  tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
   telotortium = "Robert Irelan <rirelan@gmail.com>";
   thall = "Niclas Thall <niclas.thall@gmail.com>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
@@ -315,9 +320,11 @@
   tstrobel = "Thomas Strobel <ts468@cam.ac.uk>";
   ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
   tv = "Tomislav Viljetić <tv@shackspace.de>";
+  tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>";
   twey = "James ‘Twey’ Kay <twey@twey.co.uk>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";
+  vanzef = "Ivan Solyankin <vanzef@gmail.com>";
   vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>";
   vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>";
   vcunat = "Vladimír Čunát <vcunat@gmail.com>";
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index b613c7f06cc89..9b240979273df 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -157,7 +157,7 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60;
 fileSystems."/boot" =
   { device = "/dev/sda1";
     fsType = "ext4";
-    options = "rw,data=ordered,relatime";
+    options = [ "rw" "data=ordered" "relatime" ];
   };
 </programlisting>
       </para>
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index c1f21a2f5da68..0f08094783391 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -17,7 +17,7 @@ let
 
   # Clean up declaration sites to not refer to the NixOS source tree.
   optionsList' = flip map optionsList (opt: opt // {
-    declarations = map (fn: stripAnyPrefixes fn) opt.declarations;
+    declarations = map stripAnyPrefixes opt.declarations;
   }
   // optionalAttrs (opt ? example) { example = substFunction opt.example; }
   // optionalAttrs (opt ? default) { default = substFunction opt.default; }
@@ -28,16 +28,9 @@ let
   # or else the build will fail.
   #
   # E.g. if some `options` came from modules in ${pkgs.customModules}/nix,
-  # you'd need to include `extraSources = [ "#{pkgs.customModules}" ]`
-  herePrefix = toString ../../..;
-  prefixesToStrip = [ herePrefix ] ++ extraSources;
-
-  stripAnyPrefixes = fn:
-    flip (flip fold fn) prefixesToStrip (fn: prefix:
-      if substring 0 (stringLength prefix) fn == prefix then
-        substring (stringLength prefix + 1) 1000 fn
-      else
-        fn);
+  # you'd need to include `extraSources = [ pkgs.customModules ]`
+  prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources);
+  stripAnyPrefixes = flip (fold removePrefix) prefixesToStrip;
 
   # Convert the list of options into an XML file.
   optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList');
diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml
index e4fba4a40a975..140642bc9c9c5 100644
--- a/nixos/doc/manual/man-nixos-generate-config.xml
+++ b/nixos/doc/manual/man-nixos-generate-config.xml
@@ -165,13 +165,13 @@ look like this:
   fileSystems."/" =
     { device = "/dev/disk/by-label/nixos";
       fsType = "ext3";
-      options = "rw,data=ordered,relatime";
+      options = [ "rw" "data=ordered" "relatime" ];
     };
 
   fileSystems."/boot" =
     { device = "/dev/sda1";
       fsType = "ext3";
-      options = "rw,errors=continue,user_xattr,acl,barrier=1,data=writeback,relatime";
+      options = [ "rw" "errors=continue" "user_xattr" "acl" "barrier=1" "data=writeback" "relatime" ];
     };
 
   swapDevices =
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index ffde542d4e18c..768b51d84a46d 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -42,6 +42,7 @@ nixos.path = ./nixpkgs-unstable-2015-12-06/nixos;
   <itemizedlist>
     <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem>
     <listitem><para><literal>services/web-apps/pump.io.nix</literal></para></listitem>
+    <listitem><para><literal>services/security/haka.nix</literal></para></listitem>
   </itemizedlist>
 </para>
 
@@ -156,6 +157,21 @@ nginx.override {
   </listitem>
 
   <listitem>
+    <para>Filesystem options should now be configured as a list of strings, not
+    a comma-separated string. The old style will continue to work, but print a
+    warning, until the 16.09 release. An example of the new style:
+
+<programlisting>
+fileSystems."/example" = {
+  device = "/dev/sdc";
+  fsType = "btrfs";
+  options = [ "noatime" "compress=lzo" "space_cache" "autodefrag" ];
+};
+</programlisting>
+    </para>
+  </listitem>
+
+  <listitem>
     <para>CUPS, installed by <literal>services.printing</literal> module, now
     has its data directory in <filename>/var/lib/cups</filename>. Old
     configurations from <filename>/etc/cups</filename> are moved there
diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix
index 22b74847f871f..019932b04e8d4 100644
--- a/nixos/modules/config/zram.nix
+++ b/nixos/modules/config/zram.nix
@@ -98,11 +98,9 @@ in
             script = ''
               set -u
               set -o pipefail
-
-              PATH=${pkgs.procps}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin
-
+              
               # Calculate memory to use for zram
-              totalmem=$(free | grep -e "^Mem:" | sed -e 's/^Mem: *//' -e 's/  *.*//')
+              totalmem=$(${pkgs.gnugrep}/bin/grep 'MemTotal: ' /proc/meminfo | ${pkgs.gawk}/bin/awk '{print $2}')
               mem=$(((totalmem * ${toString cfg.memoryPercent} / 100 / ${toString cfg.numDevices}) * 1024))
 
               echo $mem > /sys/class/block/${dev}/disksize
diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix
new file mode 100644
index 0000000000000..b35709763b903
--- /dev/null
+++ b/nixos/modules/hardware/video/webcam/facetimehd.nix
@@ -0,0 +1,45 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.hardware.facetimehd;
+
+  kernelPackages = config.boot.kernelPackages;
+
+in
+
+{
+
+  options.hardware.facetimehd.enable = mkEnableOption "facetimehd kernel module";
+
+  config = mkIf cfg.enable {
+
+    assertions = singleton {
+      assertion = versionAtLeast kernelPackages.kernel.version "3.19";
+      message = "facetimehd is not supported for kernels older than 3.19";
+    };
+
+    boot.kernelModules = [ "facetimehd" ];
+
+    boot.blacklistedKernelModules = [ "bdc_pci" ];
+
+    boot.extraModulePackages = [ kernelPackages.facetimehd ];
+
+    hardware.firmware = [ pkgs.facetimehd-firmware ];
+
+    # unload module during suspend/hibernate as it crashes the whole system
+    powerManagement.powerDownCommands = ''
+      ${pkgs.module_init_tools}/bin/rmmod -f facetimehd
+    '';
+
+    # and load it back on resume
+    powerManagement.resumeCommands = ''
+      export MODULE_DIR=/run/current-system/kernel-modules/lib/modules
+      ${pkgs.module_init_tools}/bin/modprobe -v facetimehd
+    '';
+
+  };
+
+}
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 248b0f00283c6..5702e2d9a1e50 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -249,7 +249,7 @@ in
 
     fileSystems."/" =
       { fsType = "tmpfs";
-        options = "mode=0755";
+        options = [ "mode=0755" ];
       };
 
     # Note that /dev/root is a symlink to the actual root device
@@ -266,20 +266,20 @@ in
     fileSystems."/nix/.ro-store" =
       { fsType = "squashfs";
         device = "/iso/nix-store.squashfs";
-        options = "loop";
+        options = [ "loop" ];
         neededForBoot = true;
       };
 
     fileSystems."/nix/.rw-store" =
       { fsType = "tmpfs";
-        options = "mode=0755";
+        options = [ "mode=0755" ];
         neededForBoot = true;
       };
 
     fileSystems."/nix/store" =
       { fsType = "unionfs-fuse";
         device = "unionfs";
-        options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro";
+        options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ];
       };
 
     boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" ];
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index de0cc604bf3bd..7badfcb8df220 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -86,8 +86,7 @@ in
   system.boot.loader.kernelFile = "uImage";
 
   boot.initrd.availableKernelModules =
-    [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ums-cypress" "rtc_mv"
-      "ext4" ];
+    [ "mvsdio" "reiserfs" "ext3" "ums-cypress" "rtc_mv" "ext4" ];
 
   boot.postBootCommands =
     ''
diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix
index c24fe97fba461..90e9b98a4575f 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball.nix
@@ -43,7 +43,7 @@ in
     # so that we don't need to know its device.
     fileSystems = [ ];
 
-    # boot.initrd.availableKernelModules = [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ext4" ];
+    # boot.initrd.availableKernelModules = [ "mvsdio" "reiserfs" "ext3" "ext4" ];
 
     # boot.initrd.kernelModules = [ "rtc_mv" ];
 
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 2284eba07a2d6..ec880e0847263 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -349,7 +349,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
   fileSystems.\"$mountPoint\" =
     { device = \"$base$path\";
       fsType = \"none\";
-      options = \"bind\";
+      options = \[ \"bind\" \];
     };
 
 EOF
@@ -409,7 +409,7 @@ EOF
 
     if (scalar @extraOptions > 0) {
       $fileSystems .= <<EOF;
-      options = \"${\join ",", uniq(@extraOptions)}\";
+      options = \[ ${\join " ", map { "\"" . $_ . "\"" } uniq(@extraOptions)} \];
 EOF
     }
 
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 4e10615f902f6..c23d7e5b509d0 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -73,11 +73,6 @@ if ! test -e "$mountPoint"; then
     exit 1
 fi
 
-if ! grep -F -q " $mountPoint " /proc/mounts; then
-    echo "$mountPoint doesn't appear to be a mount point"
-    exit 1
-fi
-
 
 # Mount some stuff in the target root directory.
 mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 105d1cd162526..e0e79f63fab76 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -149,10 +149,11 @@ nixBuild() {
                 local j="$1"; shift 1
                 instArgs+=("$i" "$j")
                 ;;
-              -I)
-                # We don't want this in buildArgs
+              -I) # We don't want this in buildArgs
                 shift 1
                 ;;
+              --no-out-link) # We don't want this in buildArgs
+                ;;
               "<"*) # nix paths
                 instArgs+=("$i")
                 ;;
@@ -329,7 +330,7 @@ fi
 if [ -z "$rollback" ]; then
     echo "building the system configuration..." >&2
     if [ "$action" = switch -o "$action" = boot ]; then
-        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system "${extraBuildFlags[@]}")"
+        pathToConfig="$(nixBuild '<nixpkgs/nixos>' --no-out-link -A system "${extraBuildFlags[@]}")"
         copyToTarget "$pathToConfig"
         targetHostCmd nix-env -p "$profile" --set "$pathToConfig"
     elif [ "$action" = test -o "$action" = build -o "$action" = dry-build -o "$action" = dry-activate ]; then
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2ff61877c23d0..0011544988d63 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -42,6 +42,7 @@
   ./hardware/video/bumblebee.nix
   ./hardware/video/nvidia.nix
   ./hardware/video/ati.nix
+  ./hardware/video/webcam/facetimehd.nix
   ./installer/tools/auto-upgrade.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
@@ -395,6 +396,7 @@
   ./services/security/fprintd.nix
   ./services/security/fprot.nix
   ./services/security/frandom.nix
+  ./services/security/haka.nix
   ./services/security/haveged.nix
   ./services/security/hologram.nix
   ./services/security/munge.nix
@@ -460,10 +462,10 @@
   ./system/boot/coredump.nix
   ./system/boot/emergency-mode.nix
   ./system/boot/initrd-network.nix
+  ./system/boot/initrd-ssh.nix
   ./system/boot/kernel.nix
   ./system/boot/kexec.nix
   ./system/boot/loader/efi.nix
-  ./system/boot/loader/loader.nix
   ./system/boot/loader/generations-dir/generations-dir.nix
   ./system/boot/loader/generic-extlinux-compatible
   ./system/boot/loader/grub/grub.nix
@@ -471,15 +473,16 @@
   ./system/boot/loader/grub/memtest.nix
   ./system/boot/loader/gummiboot/gummiboot.nix
   ./system/boot/loader/init-script/init-script.nix
+  ./system/boot/loader/loader.nix
   ./system/boot/loader/raspberrypi/raspberrypi.nix
   ./system/boot/luksroot.nix
   ./system/boot/modprobe.nix
+  ./system/boot/networkd.nix
+  ./system/boot/resolved.nix
   ./system/boot/shutdown.nix
   ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
   ./system/boot/systemd.nix
-  ./system/boot/networkd.nix
-  ./system/boot/resolved.nix
   ./system/boot/timesyncd.nix
   ./system/boot/tmp.nix
   ./system/etc/etc.nix
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 2da8ff738fbc4..169c6a38e75bf 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -186,6 +186,9 @@ in
 
         ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
 
+        # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
+        PubkeyAcceptedKeyTypes +ssh-dss
+
         ${cfg.extraConfig}
       '';
 
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 15e5b49878f6d..3d25e811e670f 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -56,8 +56,8 @@ let
 
       plugins = mkOption {
         type = types.listOf (types.enum [
-          "cert.der" "cert.pem" "chain.der" "chain.pem" "external_pem.sh"
-          "fullchain.der" "fullchain.pem" "key.der" "key.pem" "account_key.json"
+          "cert.der" "cert.pem" "chain.pem" "external_pem.sh"
+          "fullchain.pem" "full.pem" "key.der" "key.pem" "account_key.json"
         ]);
         default = [ "fullchain.pem" "key.pem" "account_key.json" ];
         description = ''
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index c2045a5859c55..31ffe51c11efa 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -158,7 +158,7 @@ in
       # Note: when changing the default, make it conditional on
       # ‘system.stateVersion’ to maintain compatibility with existing
       # systems!
-      mkDefault pkgs.postgresql94;
+      mkDefault (if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95 else pkgs.postgresql94);
 
     services.postgresql.authentication = mkAfter
       ''
@@ -177,7 +177,7 @@ in
 
     users.extraGroups.postgres.gid = config.ids.gids.postgres;
 
-    environment.systemPackages = [postgresql];
+    environment.systemPackages = [ postgresql ];
 
     systemd.services.postgresql =
       { description = "PostgreSQL Server";
@@ -187,35 +187,37 @@ in
 
         environment.PGDATA = cfg.dataDir;
 
-        path = [ pkgs.su postgresql ];
+        path = [ postgresql ];
 
         preStart =
           ''
-            # Initialise the database.
+            # Create data directory.
             if ! test -e ${cfg.dataDir}/PG_VERSION; then
-                mkdir -m 0700 -p ${cfg.dataDir}
-                rm -f ${cfg.dataDir}/*.conf
-                if [ "$(id -u)" = 0 ]; then
-                  chown -R postgres ${cfg.dataDir}
-                  su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root'
-                else
-                  # For non-root operation.
-                  initdb
-                fi
-                # See postStart!
-                touch "${cfg.dataDir}/.first_startup"
+              mkdir -m 0700 -p ${cfg.dataDir}
+              rm -f ${cfg.dataDir}/*.conf
+              chown -R postgres:postgres ${cfg.dataDir}
             fi
+          ''; # */
 
+        script =
+          ''
+            # Initialise the database.
+            if ! test -e ${cfg.dataDir}/PG_VERSION; then
+              initdb -U root
+              # See postStart!
+              touch "${cfg.dataDir}/.first_startup"
+            fi
             ln -sfn "${configFile}" "${cfg.dataDir}/postgresql.conf"
             ${optionalString (cfg.recoveryConfig != null) ''
               ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \
                 "${cfg.dataDir}/recovery.conf"
             ''}
-          ''; # */
+
+             exec postgres ${toString flags}
+          '';
 
         serviceConfig =
-          { ExecStart = "@${postgresql}/bin/postgres postgres ${toString flags}";
-            ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+          { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
             User = "postgres";
             Group = "postgres";
             PermissionsStartOnly = true;
diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix
index 48b2b6be09ede..bb17c8859d842 100644
--- a/nixos/modules/services/hardware/acpid.nix
+++ b/nixos/modules/services/hardware/acpid.nix
@@ -4,111 +4,38 @@ with lib;
 
 let
 
-  acpiConfDir = pkgs.runCommand "acpi-events" {}
-    ''
-      mkdir -p $out
-      ${
-        # Generate a configuration file for each event. (You can't have
-        # multiple events in one config file...)
-        let f = event:
-          ''
-            fn=$out/${event.name}
-            echo "event=${event.event}" > $fn
-            echo "action=${pkgs.writeScript "${event.name}.sh" event.action}" >> $fn
-          '';
-        in lib.concatMapStrings f events
-      }
-    '';
-
-  events = [powerEvent lidEvent acEvent muteEvent volumeDownEvent volumeUpEvent cdPlayEvent cdNextEvent cdPrevEvent];
-
-  # Called when the power button is pressed.
-  powerEvent =
-    { name = "power-button";
+  canonicalHandlers = {
+    powerEvent = {
       event = "button/power.*";
-      action =
-        ''
-          #! ${pkgs.bash}/bin/sh
-          ${config.services.acpid.powerEventCommands}
-        '';
+      action = config.services.acpid.powerEventCommands;
     };
 
-  # Called when the laptop lid is opened/closed.
-  lidEvent =
-    { name = "lid";
+    lidEvent = {
       event = "button/lid.*";
-      action =
-        ''
-          #! ${pkgs.bash}/bin/sh
-          ${config.services.acpid.lidEventCommands}
-        '';
+      action = config.services.acpid.lidEventCommands;
     };
 
-  # Called when the AC power is connected or disconnected.
-  acEvent =
-    { name = "ac-power";
+    acEvent = {
       event = "ac_adapter.*";
-      action =
-        ''
-          #! ${pkgs.bash}/bin/sh
-          ${config.services.acpid.acEventCommands}
-        '';
+      action = config.services.acpid.acEventCommands;
     };
-
-  muteEvent = {
-    name = "mute";
-    event = "button/mute.*";
-    action = ''
-      #! ${pkgs.bash}/bin/sh
-      ${config.services.acpid.muteCommands}
-    '';
-  };
-
-  volumeDownEvent = {
-    name = "volume-down";
-    event = "button/volumedown.*";
-    action = ''
-      #! ${pkgs.bash}/bin/sh
-      ${config.services.acpid.volumeDownEventCommands}
-    '';
   };
 
-  volumeUpEvent = {
-    name = "volume-up";
-    event = "button/volumeup.*";
-    action = ''
-      #! ${pkgs.bash}/bin/sh
-      ${config.services.acpid.volumeUpEventCommands}
-    '';
-  };
-
-  cdPlayEvent = {
-    name = "cd-play";
-    event = "cd/play.*";
-    action = ''
-      #! ${pkgs.bash}/bin/sh
-      ${config.services.acpid.cdPlayEventCommands}
-    '';
-  };
-
-  cdNextEvent = {
-    name = "cd-next";
-    event = "cd/next.*";
-    action = ''
-      #! ${pkgs.bash}/bin/sh
-      ${config.services.acpid.cdNextEventCommands}
-    '';
-  };
-
-  cdPrevEvent = {
-    name = "cd-prev";
-    event = "cd/prev.*";
-    action = ''
-      #! ${pkgs.bash}/bin/sh
-      ${config.services.acpid.cdPrevEventCommands}
+  acpiConfDir = pkgs.runCommand "acpi-events" {}
+    ''
+      mkdir -p $out
+      ${
+        # Generate a configuration file for each event. (You can't have
+        # multiple events in one config file...)
+        let f = name: handler:
+          ''
+            fn=$out/${name}
+            echo "event=${handler.event}" > $fn
+            echo "action=${pkgs.writeScript "${name}.sh" (concatStringsSep "\n" [ "#! ${pkgs.bash}/bin/sh" handler.action ])}" >> $fn
+          '';
+        in concatStringsSep "\n" (mapAttrsToList f (canonicalHandlers // config.services.acpid.handlers))
+      }
     '';
-  };
-
 
 in
 
@@ -126,58 +53,45 @@ in
         description = "Whether to enable the ACPI daemon.";
       };
 
-      powerEventCommands = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Shell commands to execute on a button/power.* event.";
-      };
+      handlers = mkOption {
+        type = types.attrsOf (types.submodule {
+          options = {
+            event = mkOption {
+              type = types.str;
+              example = [ "button/power.*" "button/lid.*" "ac_adapter.*" "button/mute.*" "button/volumedown.*" "cd/play.*" "cd/next.*" ];
+              description = "Event type.";
+            };
 
-      lidEventCommands = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Shell commands to execute on a button/lid.* event.";
-      };
+            action = mkOption {
+              type = types.lines;
+              description = "Shell commands to execute when the event is triggered.";
+            };
+          };
+        });
 
-      acEventCommands = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Shell commands to execute on an ac_adapter.* event.";
-      };
-
-      muteCommands = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Shell commands to execute on an button/mute.* event.";
-      };
+        description = "Event handlers.";
+        default = {};
+        example = { mute = { event = "button/mute.*"; action = "amixer set Master toggle"; }; };
 
-      volumeDownEventCommands = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Shell commands to execute on an button/volumedown.* event.";
-      };
 
-      volumeUpEventCommands = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Shell commands to execute on an button/volumeup.* event.";
       };
 
-      cdPlayEventCommands = mkOption {
+      powerEventCommands = mkOption {
         type = types.lines;
         default = "";
-        description = "Shell commands to execute on an cd/play.* event.";
+        description = "Shell commands to execute on a button/power.* event.";
       };
 
-      cdNextEventCommands = mkOption {
+      lidEventCommands = mkOption {
         type = types.lines;
         default = "";
-        description = "Shell commands to execute on an cd/next.* event.";
+        description = "Shell commands to execute on a button/lid.* event.";
       };
 
-      cdPrevEventCommands = mkOption {
+      acEventCommands = mkOption {
         type = types.lines;
         default = "";
-        description = "Shell commands to execute on an cd/prev.* event.";
+        description = "Shell commands to execute on an ac_adapter.* event.";
       };
 
     };
diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index 68d0406e63bd5..fc95c4910bf71 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -1,6 +1,43 @@
 { config, lib, pkgs, ... }:
 
 with lib;
+let
+    bluez-bluetooth = if config.services.xserver.desktopManager.kde4.enable then pkgs.bluez else pkgs.bluez5;
+
+    configBluez = {
+        description = "Bluetooth Service";
+        serviceConfig = {
+          Type = "dbus";
+          BusName = "org.bluez";
+          ExecStart = "${bluez-bluetooth}/sbin/bluetoothd -n";
+        };
+        wantedBy = [ "bluetooth.target" ];
+    };
+
+    configBluez5 =  {
+        description = "Bluetooth Service";
+        serviceConfig = {
+          Type = "dbus";
+          BusName = "org.bluez";
+          ExecStart = "${bluez-bluetooth}/sbin/bluetoothd -n";
+          NotifyAccess="main";
+          CapabilityBoundingSet="CAP_NET_ADMIN CAP_NET_BIND_SERVICE";
+          LimitNPROC=1;
+        };
+        wantedBy = [ "bluetooth.target" ];
+    };
+
+    obexConfig = {
+        description = "Bluetooth OBEX service";
+        serviceConfig = {
+          Type = "dbus";
+          BusName = "org.bluez.obex";
+          ExecStart = "${bluez-bluetooth}/sbin/obexd";
+        };
+    };
+
+    bluezConfig = if config.services.xserver.desktopManager.kde4.enable then configBluez else configBluez5;
+in
 
 {
 
@@ -16,26 +53,15 @@ with lib;
 
   };
 
-
   ###### implementation
-
+  
   config = mkIf config.hardware.bluetooth.enable {
 
-    environment.systemPackages = [ pkgs.bluez pkgs.openobex pkgs.obexftp ];
-
-    services.udev.packages = [ pkgs.bluez ];
-
-    services.dbus.packages = [ pkgs.bluez ];
-
-    systemd.services."dbus-org.bluez" = {
-      description = "Bluetooth Service";
-      serviceConfig = {
-        Type = "dbus";
-        BusName = "org.bluez";
-        ExecStart = "${pkgs.bluez}/sbin/bluetoothd -n";
-      };
-      wantedBy = [ "bluetooth.target" ];
-    };
+    environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
+    services.udev.packages = [ bluez-bluetooth ];
+    services.dbus.packages = [ bluez-bluetooth ];
+    systemd.services."dbus-org.bluez" = bluezConfig;
+    systemd.services."dbus-org.bluez.obex" = obexConfig;
 
   };
 
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 107e1012b88df..369a50bd6a853 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -16,6 +16,12 @@ let
     destination = "/etc/udev/rules.d/10-local.rules";
   };
 
+  extraHwdbFile = pkgs.writeTextFile {
+    name = "extra-hwdb-file";
+    text = cfg.extraHwdb;
+    destination = "/etc/udev/hwdb.d/10-local.hwdb";
+  };
+
   nixosRules = ''
     # Miscellaneous devices.
     KERNEL=="kvm",                  MODE="0666"
@@ -55,7 +61,9 @@ let
           --replace \"/sbin/modprobe \"${config.system.sbin.modprobe}/sbin/modprobe \
           --replace \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \
           --replace \"/sbin/blkid \"${pkgs.utillinux}/sbin/blkid \
-          --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount
+          --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount \
+          --replace /usr/bin/readlink ${pkgs.coreutils}/bin/readlink \
+          --replace /usr/bin/basename ${pkgs.coreutils}/bin/basename
       done
 
       echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev... "
@@ -86,10 +94,30 @@ let
       done
       echo "OK"
 
-      echo "Consider fixing the following udev rules:"
-      for i in ${toString cfg.packages}; do
-        grep -l '\(RUN+\|IMPORT{program}\)="\(/usr\)\?/s\?bin' $i/*/udev/rules.d/* || true
-      done
+      filesToFixup="$(for i in "$out"/*; do
+        grep -l '\B\(/usr\)\?/s\?bin' "$i" || :
+      done)"
+
+      if [ -n "$filesToFixup" ]; then
+        echo "Consider fixing the following udev rules:"
+        echo "$filesToFixup" | while read localFile; do
+          remoteFile="origin unknown"
+          for i in ${toString cfg.packages}; do
+            for j in "$i"/*/udev/rules.d/*; do
+              [ -e "$out/$(basename "$j")" ] || continue
+              [ "$(basename "$j")" = "$(basename "$localFile")" ] || continue
+              remoteFile="originally from $j"
+              break 2
+            done
+          done
+          refs="$(
+            grep -o '\B\(/usr\)\?/s\?bin/[^ "]\+' "$localFile" \
+              | sed -e ':r;N;''${s/\n/ and /;br};s/\n/, /g;br'
+          )"
+          echo "$localFile ($remoteFile) contains references to $refs."
+        done
+        exit 1
+      fi
 
       ${optionalString config.networking.usePredictableInterfaceNames ''
         cp ${./80-net-setup-link.rules} $out/80-net-setup-link.rules
@@ -104,6 +132,27 @@ let
     ''; # */
   };
 
+  hwdbBin = stdenv.mkDerivation {
+    name = "hwdb.bin";
+
+    preferLocalBuild = true;
+    allowSubstitutes = false;
+
+    buildCommand = ''
+      mkdir -p etc/udev/hwdb.d
+      for i in ${toString ([udev] ++ cfg.packages)}; do
+        echo "Adding hwdb files for package $i"
+        for j in $i/{etc,lib}/udev/hwdb.d/*; do
+          ln -s $j etc/udev/hwdb.d/$(basename $j)
+        done
+      done
+
+      echo "Generating hwdb database..."
+      ${udev}/bin/udevadm hwdb --update --root=$(pwd)
+      mv etc/udev/hwdb.bin $out
+    '';
+  };
+
   # Udev has a 512-character limit for ENV{PATH}, so create a symlink
   # tree to work around this.
   udevPath = pkgs.buildEnv {
@@ -168,6 +217,21 @@ in
         '';
       };
 
+      extraHwdb = mkOption {
+        default = "";
+        example = ''
+          evdev:input:b0003v05AFp8277*
+            KEYBOARD_KEY_70039=leftalt
+            KEYBOARD_KEY_700e2=leftctrl
+        '';
+        type = types.lines;
+        description = ''
+          Additional <command>hwdb</command> files. They'll be written
+          into file <filename>10-local.hwdb</filename>. Thus they are
+          read before all other files.
+        '';
+      };
+
     };
 
     hardware.firmware = mkOption {
@@ -216,7 +280,7 @@ in
 
     services.udev.extraRules = nixosRules;
 
-    services.udev.packages = [ extraUdevRules ];
+    services.udev.packages = [ extraUdevRules extraHwdbFile ];
 
     services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux udev ];
 
@@ -224,6 +288,9 @@ in
       [ { source = udevRules;
           target = "udev/rules.d";
         }
+        { source = hwdbBin;
+          target = "udev/hwdb.bin";
+        }
       ];
 
     system.requiredKernelConfig = with config.lib.kernelConfig; [
@@ -241,13 +308,6 @@ in
           echo "" > /proc/sys/kernel/hotplug
         fi
 
-        # Regenerate the hardware database /var/lib/udev/hwdb.bin
-        # whenever systemd changes.
-        if [ ! -e /var/lib/udev/prev-systemd -o "$(readlink /var/lib/udev/prev-systemd)" != ${config.systemd.package} ]; then
-          echo "regenerating udev hardware database..."
-          ${config.systemd.package}/bin/udevadm hwdb --update && ln -sfn ${config.systemd.package} /var/lib/udev/prev-systemd
-        fi
-
         # Allow the kernel to find our firmware.
         if [ -e /sys/module/firmware_class/parameters/path ]; then
           echo -n "${config.hardware.firmware}/lib/firmware" > /sys/module/firmware_class/parameters/path
@@ -256,6 +316,7 @@ in
 
     systemd.services.systemd-udevd =
       { environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
+        restartTriggers = cfg.packages;
       };
 
   };
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index e019e6c3f2376..d27456e59e88d 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -85,7 +85,7 @@ in
         type = types.lines;
         default = ''stdin { type => "example" }'';
         description = "Logstash input configuration.";
-        example = ''
+        example = literalExample ''
           # Read from journal
           pipe {
             command => "''${pkgs.systemd}/bin/journalctl -f -o json"
@@ -98,7 +98,7 @@ in
         type = types.lines;
         default = ''noop {}'';
         description = "logstash filter configuration.";
-        example = ''
+        example = literalExample ''
           if [type] == "syslog" {
             # Keep only relevant systemd fields
             # http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
@@ -114,7 +114,7 @@ in
 
       outputConfig = mkOption {
         type = types.lines;
-        default = ''stdout { debug => true debug_format => "json"}'';
+        default = literalExample ''stdout { debug => true debug_format => "json"}'';
         description = "Logstash output configuration.";
         example = ''
           redis { host => "localhost" data_type => "list" key => "logstash" codec => json }
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 11e8b26c75ef1..333a03315bca6 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -13,6 +13,7 @@ let
     ''
       base_dir = ${baseDir}
       protocols = ${concatStringsSep " " cfg.protocols}
+      sendmail_path = /var/setuid-wrappers/sendmail
     ''
 
     (if isNull cfg.sslServerCert then ''
diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix
index 10352ba6abcc4..2d8aebe205751 100644
--- a/nixos/modules/services/mail/dspam.nix
+++ b/nixos/modules/services/mail/dspam.nix
@@ -109,6 +109,9 @@ in {
           Group = cfg.group;
           RuntimeDirectory = optional (cfg.domainSocket == defaultSock) "dspam";
           PermissionsStartOnly = true;
+          # DSPAM segfaults on just about every error
+          Restart = "on-failure";
+          RestartSec = "1s";
         };
 
         preStart = ''
@@ -136,7 +139,7 @@ in {
         restartTriggers = [ cfgfile ];
 
         serviceConfig = {
-          ExecStart = "${dspam}/bin/dspam_maintenance";
+          ExecStart = "${dspam}/bin/dspam_maintenance --verbose";
           Type = "oneshot";
           User = cfg.user;
           Group = cfg.group;
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index a1cfd84365a2a..42a1244cde57e 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -9,6 +9,11 @@ let
   conf = writeText "smtpd.conf" cfg.serverConfiguration;
   args = concatStringsSep " " cfg.extraServerArgs;
 
+  sendmail = pkgs.runCommand "opensmtpd-sendmail" {} ''
+    mkdir -p $out/bin
+    ln -s ${opensmtpd}/sbin/smtpctl $out/bin/sendmail
+  '';
+
 in {
 
   ###### interface
@@ -23,6 +28,15 @@ in {
         description = "Whether to enable the OpenSMTPD server.";
       };
 
+      addSendmailToSystemPath = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to add OpenSMTPD's sendmail binary to the
+          system path or not.
+        '';
+      };
+
       extraServerArgs = mkOption {
         type = types.listOf types.str;
         default = [];
@@ -64,7 +78,7 @@ in {
 
   ###### implementation
 
-  config = mkIf config.services.opensmtpd.enable {
+  config = mkIf cfg.enable {
     users.extraGroups = {
       smtpd.gid = config.ids.gids.smtpd;
       smtpq.gid = config.ids.gids.smtpq;
@@ -98,9 +112,6 @@ in {
       environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
     };
 
-    environment.systemPackages = [ (pkgs.runCommand "opensmtpd-sendmail" {} ''
-      mkdir -p $out/bin
-      ln -s ${opensmtpd}/sbin/smtpctl $out/bin/sendmail
-    '') ];
+    environment.systemPackages = mkIf cfg.addSendmailToSystemPath [ sendmail ];
   };
 }
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index f2d8189de6ef0..404cdf0f564bc 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -13,6 +13,18 @@ let
   haveTransport = cfg.transport != "";
   haveVirtual = cfg.virtual != "";
 
+  clientAccess =
+    if (cfg.dnsBlacklistOverrides != "")
+    then [ "check_client_access hash:/etc/postfix/client_access" ]
+    else [];
+
+  dnsBl =
+    if (cfg.dnsBlacklists != [])
+    then [ (concatStringsSep ", " (map (s: "reject_rbl_client " + s) cfg.dnsBlacklists)) ]
+    else [];
+
+  clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl);
+
   mainCf =
     ''
       compatibility_level = 2
@@ -104,6 +116,9 @@ let
     + optionalString haveVirtual ''
       virtual_alias_maps = hash:/etc/postfix/virtual
     ''
+    + optionalString (cfg.dnsBlacklists != []) ''
+      smtpd_client_restrictions = ${clientRestrictions}
+    ''
     + cfg.extraConfig;
 
   masterCf = ''
@@ -161,6 +176,7 @@ let
 
   aliasesFile = pkgs.writeText "postfix-aliases" aliases;
   virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual;
+  checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides;
   mainCfFile = pkgs.writeText "postfix-main.cf" mainCf;
   masterCfFile = pkgs.writeText "postfix-master.cf" masterCf;
   transportFile = pkgs.writeText "postfix-transport" cfg.transport;
@@ -366,6 +382,17 @@ in
         ";
       };
 
+      dnsBlacklists = mkOption {
+        default = [];
+        type = with types; listOf string;
+        description = "dns blacklist servers to use with smtpd_client_restrictions";
+      };
+
+      dnsBlacklistOverrides = mkOption {
+        default = "";
+        description = "contents of check_client_access for overriding dnsBlacklists";
+      };
+
       extraMasterConf = mkOption {
         type = types.lines;
         default = "";
@@ -461,7 +488,7 @@ in
             rm -rf /var/lib/postfix/conf
             mkdir -p /var/lib/postfix/conf
             chmod 0755 /var/lib/postfix/conf
-            ln -sf ${pkgs.postfix}/etc/postfix/postfix-files
+            ln -sf ${pkgs.postfix}/etc/postfix/postfix-files /var/lib/postfix/conf/postfix-files
             ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf
             ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf
 
@@ -494,6 +521,9 @@ in
     (mkIf haveVirtual {
       services.postfix.mapFiles."virtual" = virtualFile;
     })
+    (mkIf (cfg.dnsBlacklists != []) {
+      services.postfix.mapFiles."client_access" = checkClientAccessFile;
+    })
   ]);
 
 }
diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix
index 36a0f8218d88c..68a4c10120645 100644
--- a/nixos/modules/services/mail/postsrsd.nix
+++ b/nixos/modules/services/mail/postsrsd.nix
@@ -95,7 +95,11 @@ in {
       preStart = ''
         if [ ! -e "${cfg.secretsFile}" ]; then
           echo "WARNING: secrets file not found, autogenerating!"
-          mkdir -p -m750 "$(dirname "${cfg.secretsFile}")"
+          DIR="$(dirname "${cfg.secretsFile}")"
+          if [ ! -d "$DIR" ]; then
+            mkdir -p -m750 "$DIR"
+            chown "${cfg.user}:${cfg.group}" "$DIR"
+          fi
           dd if=/dev/random bs=18 count=1 | base64 > "${cfg.secretsFile}"
           chmod 600 "${cfg.secretsFile}"
         fi
diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index ab4d385ba1654..befd8c628f160 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -35,7 +35,6 @@ let
       };
 
       haskellPackages = mkOption {
-        type = types.attrsOf types.package;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
diff --git a/nixos/modules/services/misc/sundtek.nix b/nixos/modules/services/misc/sundtek.nix
index 8438ef79904fc..e3234518c940a 100644
--- a/nixos/modules/services/misc/sundtek.nix
+++ b/nixos/modules/services/misc/sundtek.nix
@@ -23,7 +23,7 @@ in
         Type = "oneshot";
         ExecStart = ''
           ${pkgs.sundtek}/bin/mediasrv -d -v -p ${pkgs.sundtek}/bin ;\
-          ${pkgs.sundtek}/bin/mediaclient --start=5 --wait-for-devices
+          ${pkgs.sundtek}/bin/mediaclient --start --wait-for-devices
           '';
         ExecStop = "${pkgs.sundtek}/bin/mediaclient --shutdown";
         RemainAfterExit = true;
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index deb1cbfc18580..3fecfbb13a049 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -53,13 +53,13 @@ in {
   config = mkIf cfg.enable {
 
     assertions = [{
-      assertion = config.networking.useDHCP == false;
+      assertion = !config.networking.useDHCP;
       message = "You can not use services.networking.connman with services.networking.useDHCP";
     }{
-      assertion = config.networking.wireless.enable == true;
+      assertion = config.networking.wireless.enable;
       message = "You must use services.networking.connman with services.networking.wireless";
     }{
-      assertion = config.networking.networkmanager.enable == false;
+      assertion = !config.networking.networkmanager.enable;
       message = "You can not use services.networking.connman with services.networking.networkmanager";
     }];
 
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index c467402dbcf69..c32b935cf940b 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -12,21 +12,69 @@ let
 
   toOneZero = b: if b then "1" else "0";
 
+  mkEndpointOpt = name: addr: port: {
+    name = mkOption {
+      type = types.str;
+      default = name;
+      description = "The endpoint name.";
+    };
+    address = mkOption {
+      type = types.str;
+      default = addr;
+      description = "Bind address for ${name} endpoint. Default: " + addr;
+    };
+    port = mkOption {
+      type = types.int;
+      default = port;
+      description = "Bind port for ${name} endoint. Default: " + toString port;
+    };
+  };
+
+  commonTunOpts = let
+    i2cpOpts = {
+      length = mkOption {
+        type = types.int;
+        description = "Guaranteed minimum hops.";
+        default = 3;
+      };
+      quantity = mkOption {
+        type = types.int;
+        description = "Number of simultaneous tunnels.";
+        default = 5;
+      };
+    };
+  in name: {
+    outbound = i2cpOpts;
+    inbound = i2cpOpts;
+    crypto.tagsToSend = mkOption {
+      type = types.int;
+      description = "Number of ElGamal/AES tags to send.";
+      default = 40;
+    };
+   destination = mkOption {
+      type = types.str;
+      description = "Remote endpoint, I2P hostname or b32.i2p address.";
+    };
+    keys = mkOption {
+      type = types.str;
+      default = name + "-keys.dat";
+      description = "Keyset used for tunnel identity.";
+    };
+  } // mkEndpointOpt name "127.0.0.1" 0;
+
   i2pdConf = pkgs.writeText "i2pd.conf" ''
-      v6 = ${toOneZero cfg.enableIPv6}
-      unreachable = ${toOneZero cfg.unreachable}
+      ipv6 = ${toOneZero cfg.enableIPv6}
+      notransit = ${toOneZero cfg.notransit}
       floodfill = ${toOneZero cfg.floodfill}
       ${if isNull cfg.port then "" else "port = ${toString cfg.port}"}
-      httpproxyport = ${toString cfg.proxy.httpPort}
-      socksproxyport = ${toString cfg.proxy.socksPort}
-      ircaddress = ${cfg.irc.host}
-      ircport = ${toString cfg.irc.port}
-      ircdest = ${cfg.irc.dest}
-      irckeys = ${cfg.irc.keyFile}
-      eepport = ${toString cfg.eep.port}
-      ${if isNull cfg.sam.port then "" else "--samport=${toString cfg.sam.port}"}
-      eephost = ${cfg.eep.host}
-      eepkeys = ${cfg.eep.keyFile}
+      ${flip concatMapStrings
+        (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto)
+        (proto: let portStr = toString proto.port; in ''
+      [${proto.name}]
+      address = ${proto.address}
+      port = ${toString proto.port}
+      '')
+      }
   '';
 
   i2pdTunnelConf = pkgs.writeText "i2pd-tunnels.conf" ''
@@ -39,10 +87,15 @@ let
   keys = ${tun.keys}
   address = ${tun.address}
   port = ${toString tun.port}
+  inbound.length = ${toString tun.inbound.length}
+  outbound.length = ${toString tun.outbound.length}
+  inbound.quantity = ${toString tun.inbound.quantity}
+  outbound.quantity = ${toString tun.outbound.quantity}
+  crypto.tagsToSend = ${toString tun.crypto.tagsToSend}
   '')
   }
   ${flip concatMapStrings
-    (collect (tun: tun ? port && tun ? host) cfg.outTunnels)
+    (collect (tun: tun ? port && tun ? host) cfg.inTunnels)
     (tun: let portStr = toString tun.port; in ''
   [${tun.name}]
   type = server
@@ -59,10 +112,10 @@ let
   i2pdSh = pkgs.writeScriptBin "i2pd" ''
     #!/bin/sh
     ${if isNull cfg.extIp then extip else ""}
-    ${pkgs.i2pd}/bin/i2pd --log=1 --daemon=0 --service=0 \
+    ${pkgs.i2pd}/bin/i2pd --log=1 \
       --host=${if isNull cfg.extIp then "$EXTIP" else cfg.extIp} \
       --conf=${i2pdConf} \
-      --tunnelscfg=${i2pdTunnelConf}
+      --tunconf=${i2pdTunnelConf}
   '';
 
 in
@@ -91,11 +144,11 @@ in
         '';
       };
 
-      unreachable = mkOption {
+      notransit = mkOption {
         type = types.bool;
         default = false;
         description = ''
-          If the router is declared to be unreachable and needs introduction nodes.
+          Tells the router to not accept transit tunnels during startup.
         '';
       };
 
@@ -111,7 +164,7 @@ in
         type = with types; nullOr int;
         default = null;
         description = ''
-	        I2P listen port. If no one is given the router will pick between 9111 and 30777.
+          I2P listen port. If no one is given the router will pick between 9111 and 30777.
         '';
       };
 
@@ -123,184 +176,53 @@ in
         '';
       };
 
-      http = {
-        port = mkOption {
-          type = types.int;
-          default = 7070;
-          description = ''
-            HTTP listen port.
-          '';
-        };
-      };
-
-      proxy = {
-        httpPort = mkOption {
-          type = types.int;
-          default = 4446;
-          description = ''
-            HTTP proxy listen port.
-          '';
-        };
-        socksPort = mkOption {
-          type = types.int;
-          default = 4447;
-          description = ''
-            SOCKS proxy listen port.
-          '';
-        };
-      };
-
-      irc = {
-        host = mkOption {
-          type = types.str;
-          default = "127.0.0.1";
-          description = ''
-            Address to forward incoming traffic to. 127.0.0.1 by default.
-          '';
-        };
-        dest = mkOption {
-          type = types.str;
-          default = "irc.postman.i2p";
-          description = ''
-            Destination I2P tunnel endpoint address of IRC server. irc.postman.i2p by default.
-          '';
-        };
-        port = mkOption {
-          type = types.int;
-          default = 6668;
-          description = ''
-            Local IRC tunnel endoint port to listen on. 6668 by default.
-          '';
-        };
-        keyFile = mkOption {
-          type = types.str;
-          default = "privKeys.dat";
-          description = ''
-            File name containing destination keys. privKeys.dat by default.
-          '';
-        };
-      };
-
-      eep = {
-        host = mkOption {
-          type = types.str;
-          default = "127.0.0.1";
-          description = ''
-            Address to forward incoming traffic to. 127.0.0.1 by default.
-          '';
-        };
-        port = mkOption {
-          type = types.int;
-          default = 80;
-          description = ''
-            Port to forward incoming traffic to. 80 by default.
-          '';
-        };
-        keyFile = mkOption {
-          type = types.str;
-          default = "privKeys.dat";
-          description = ''
-            File name containing destination keys. privKeys.dat by default.
-          '';
-        };
-      };
-
-      sam = {
-        port = mkOption {
-          type = with types; nullOr int;
-          default = null;
-          description = ''
-            Local SAM tunnel endpoint. Usually 7656. SAM is disabled if not specified.
-          '';
-        };
-      };
+      proto.http = mkEndpointOpt "http" "127.0.0.1" 7070;
+      proto.sam = mkEndpointOpt "sam" "127.0.0.1" 7656;
+      proto.bob = mkEndpointOpt "bob" "127.0.0.1" 2827;
+      proto.i2pControl = mkEndpointOpt "i2pcontrol" "127.0.0.1" 7650;
+      proto.httpProxy = mkEndpointOpt "httpproxy" "127.0.0.1" 4446;
+      proto.socksProxy = mkEndpointOpt "socksproxy" "127.0.0.1" 4447;
 
       outTunnels = mkOption {
         default = {};
-	      type = with types; loaOf optionSet;
-	      description = ''
-	      '';
-	      options = [ ({ name, config, ... }: {
-
-	        options = {
-	          name = mkOption {
-	            type = types.str;
-	            description = "The name of the tunnel.";
-	          };
-	          destination = mkOption {
-	            type = types.str;
-	            description = "Remote endpoint, I2P hostname or b32.i2p address.";
-	          };
-	          keys = mkOption {
-	            type = types.str;
-	            default = name + "-keys.dat";
-	            description = "Keyset used for tunnel identity.";
-	          };
-	          address = mkOption {
-	            type = types.str;
-	            default = "127.0.0.1";
-	            description = "Local bind address for tunnel.";
-	          };
-	          port = mkOption {
-	            type = types.int;
-	            default = 0;
-	            description = "Local tunnel listen port.";
-	          };
-	        };
-
-	        config = {
-	          name = mkDefault name;
-	        };
-
-	      }) ];
+        type = with types; loaOf optionSet;
+        description = ''
+          Connect to someone as a client and establish a local accept endpoint
+        '';
+        options = [ ({ name, config, ... }: {
+          options = commonTunOpts name;
+          config = {
+            name = mkDefault name;
+          };
+        }) ];
       };
 
       inTunnels = mkOption {
         default = {};
-	      type = with types; loaOf optionSet;
-	      description = ''
-	      '';
-	      options = [ ({ name, config, ... }: {
-
-	        options = {
-
-	          name = mkOption {
-	            type = types.str;
-	            description = "The name of the tunnel.";
-	          };
-	          keys = mkOption {
-	            type = types.path;
-	            default = name + "-keys.dat";
-	            description = "Keyset used for tunnel identity.";
-	          };
-	          address = mkOption {
-	            type = types.str;
-	            default = "127.0.0.1";
-	            description = "Local service IP address.";
-	          };
-	          port = mkOption {
-	            type = types.int;
-	            default = 0;
-	            description = "Local tunnel listen port.";
-	          };
-	          inPort = mkOption {
-	            type = types.int;
-	            default = 0;
-	            description = "I2P service port. Default to the tunnel's listen port.";
-	          };
-	          accessList = mkOption {
-	            type = with types; listOf str;
-	            default = [];
-	            description = "I2P nodes that are allowed to connect to this service.";
-	          };
-
-	        };
-
-	        config = {
-	          name = mkDefault name;
-	        };
-
-	      }) ];
+        type = with types; loaOf optionSet;
+        description = ''
+          Serve something on I2P network at port and delegate requests to address inPort.
+        '';
+        options = [ ({ name, config, ... }: {
+
+          options = {
+            inPort = mkOption {
+              type = types.int;
+              default = 0;
+              description = "Service port. Default to the tunnel's listen port.";
+            };
+            accessList = mkOption {
+              type = with types; listOf str;
+              default = [];
+              description = "I2P nodes that are allowed to connect to this service.";
+            };
+          } // commonTunOpts name;
+
+          config = {
+            name = mkDefault name;
+          };
+
+        }) ];
       };
     };
   };
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 5baea4bc6aea3..ba3efc8c0c2ae 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -52,6 +52,8 @@ let
     ));
   in listToAttrs (map mkAuthKeyFile usersWithKeys);
 
+  supportOldHostKeys = !versionAtLeast config.system.stateVersion "15.07";
+
 in
 
 {
@@ -177,7 +179,7 @@ in
         default =
           [ { type = "rsa"; bits = 4096; path = "/etc/ssh/ssh_host_rsa_key"; }
             { type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }
-          ] ++ optionals (!versionAtLeast config.system.stateVersion "15.07")
+          ] ++ optionals supportOldHostKeys
           [ { type = "dsa"; path = "/etc/ssh/ssh_host_dsa_key"; }
             { type = "ecdsa"; bits = 521; path = "/etc/ssh/ssh_host_ecdsa_key"; }
           ];
@@ -347,6 +349,15 @@ in
         ${flip concatMapStrings cfg.hostKeys (k: ''
           HostKey ${k.path}
         '')}
+
+        # Allow DSA client keys for now. (These were deprecated
+        # in OpenSSH 7.0.)
+        PubkeyAcceptedKeyTypes +ssh-dss
+
+        # Re-enable DSA host keys for now.
+        ${optionalString supportOldHostKeys ''
+          HostKeyAlgorithms +ssh-dss
+        ''}
       '';
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 34f4f6b37b60f..9330e6c92ba8a 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -95,6 +95,16 @@ in
             '';
           };
 
+          chroot = mkOption {
+            default = true;
+            type = types.bool;
+            description = ''
+              Change process root directory to the directory where the config file is located (/etc/tinc/netname/), for added security.
+              The chroot is performed after all the initialization is done, after writing pid files and opening network sockets.
+
+              Note that tinc can't run scripts anymore (such as tinc-down or host-up), unless it is setup to be runnable inside chroot environment.
+            '';
+          };
         };
       };
     };
@@ -166,7 +176,7 @@ in
           fi
         '';
         script = ''
-          tincd -D -U tinc.${network} -n ${network} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}
+          tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}
         '';
       })
     );
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index be8f12ecd32d0..4dc0cd96904cf 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -61,6 +61,8 @@ in
       partOf = systemdMountPoints;
       bindsTo = systemdMountPoints;
       unitConfig.RequiresMountsFor = stateDir;
+      # This a HACK to fix missing dependencies of dynamic libs extracted from jars
+      environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc}/lib";
 
       preStart = ''
         # Ensure privacy of state
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 1b655af6c82d2..1558c5832892a 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -8,11 +8,15 @@ let
     ${optionalString cfg.userControlled.enable ''
       ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}
       update_config=1''}
-    ${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: ''
+    ${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: let
+      psk = if networkConfig.psk != null
+        then ''"${networkConfig.psk}"''
+        else networkConfig.pskRaw;
+    in ''
       network={
         ssid="${ssid}"
-        ${optionalString (networkConfig.psk != null) ''psk="${networkConfig.psk}"''}
-        ${optionalString (networkConfig.psk == null) ''key_mgmt=NONE''}
+        ${optionalString (psk != null) ''psk=${psk}''}
+        ${optionalString (psk == null) ''key_mgmt=NONE''}
       }
     '') cfg.networks)}
   '' else "/etc/wpa_supplicant.conf";
@@ -49,6 +53,19 @@ in {
 
                 Be aware that these will be written to the nix store
                 in plaintext!
+
+                Mutually exclusive with <varname>pskRaw</varname>.
+              '';
+            };
+
+            pskRaw = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                The network's pre-shared key in hex defaulting
+                to being a network without any authentication.
+
+                Mutually exclusive with <varname>psk</varname>.
               '';
             };
           };
@@ -95,6 +112,11 @@ in {
 
   config = mkMerge [
     (mkIf cfg.enable {
+      assertions = flip mapAttrsToList cfg.networks (name: cfg: {
+        assertion = cfg.psk == null || cfg.pskRaw == null;
+        message = ''networking.wireless."${name}".psk and networking.wireless."${name}".pskRaw are mutually exclusive'';
+      });
+
       environment.systemPackages =  [ pkgs.wpa_supplicant ];
 
       services.dbus.packages = [ pkgs.wpa_supplicant ];
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 478ebcfb9664e..c51a42b8e9c1f 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -9,6 +9,8 @@ let
     network.host: ${cfg.listenAddress}
     network.port: ${toString cfg.port}
     network.tcp.port: ${toString cfg.tcp_port}
+    # TODO: find a way to enable security manager
+    security.manager.enabled: false
     cluster.name: ${cfg.cluster_name}
     ${cfg.extraConf}
   '';
@@ -39,8 +41,8 @@ in {
 
     package = mkOption {
       description = "Elasticsearch package to use.";
-      default = pkgs.elasticsearch;
-      defaultText = "pkgs.elasticsearch";
+      default = pkgs.elasticsearch2;
+      defaultText = "pkgs.elasticsearch2";
       type = types.package;
     };
 
@@ -129,7 +131,9 @@ in {
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
       path = [ pkgs.inetutils ];
-      environment = { ES_HOME = cfg.dataDir; };
+      environment = {
+        ES_HOME = cfg.dataDir;
+      };
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}";
         User = "elasticsearch";
@@ -137,10 +141,11 @@ in {
       };
       preStart = ''
         mkdir -m 0700 -p ${cfg.dataDir}
-        if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi
 
         # Install plugins
         ln -sfT ${esPlugins}/plugins ${cfg.dataDir}/plugins
+        ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib
+        if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi
       '';
       postStart = mkBefore ''
         until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do
diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix
index 4263ed22a8dbc..033b8139d3414 100644
--- a/nixos/modules/services/search/kibana.nix
+++ b/nixos/modules/services/search/kibana.nix
@@ -7,37 +7,33 @@ let
 
   cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON (
     (filterAttrsRecursive (n: v: v != null) ({
-      server = {
-        host = cfg.listenAddress;
-        port = cfg.port;
-        ssl = {
-          cert = cfg.cert;
-          key = cfg.key;
-        };
-      };
-
-      kibana = {
-        index = cfg.index;
-        defaultAppId = cfg.defaultAppId;
-      };
-
-      elasticsearch = {
-        url = cfg.elasticsearch.url;
-        username = cfg.elasticsearch.username;
-        password = cfg.elasticsearch.password;
-        ssl = {
-          cert = cfg.elasticsearch.cert;
-          key = cfg.elasticsearch.key;
-          ca = cfg.elasticsearch.ca;
-        };
-      };
-
-      logging = {
-        verbose = cfg.logLevel == "verbose";
-        quiet = cfg.logLevel == "quiet";
-        silent = cfg.logLevel == "silent";
-        dest = "stdout";
-      };
+      host = cfg.listenAddress;
+      port = cfg.port;
+      ssl_cert_file = cfg.cert;
+      ssl_key_file = cfg.key;
+
+      kibana_index = cfg.index;
+      default_app_id = cfg.defaultAppId;
+
+      elasticsearch_url = cfg.elasticsearch.url;
+      kibana_elasticsearch_username = cfg.elasticsearch.username;
+      kibana_elasticsearch_password = cfg.elasticsearch.password;
+      kibana_elasticsearch_cert = cfg.elasticsearch.cert;
+      kibana_elasticsearch_key = cfg.elasticsearch.key;
+      ca = cfg.elasticsearch.ca;
+
+      bundled_plugin_ids = [
+        "plugins/dashboard/index"
+        "plugins/discover/index"
+        "plugins/doc/index"
+        "plugins/kibana/index"
+        "plugins/markdown_vis/index"
+        "plugins/metric_vis/index"
+        "plugins/settings/index"
+        "plugins/table_vis/index"
+        "plugins/vis_types/index"
+        "plugins/visualize/index"
+      ];
     } // cfg.extraConf)
   )));
 in {
@@ -118,12 +114,6 @@ in {
       };
     };
 
-    logLevel = mkOption {
-      description = "Kibana log level";
-      default = "normal";
-      type = types.enum ["verbose" "normal" "silent" "quiet"];
-    };
-
     package = mkOption {
       description = "Kibana package to use";
       default = pkgs.kibana;
@@ -149,6 +139,7 @@ in {
       description = "Kibana Service";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" "elasticsearch.service" ];
+      environment = { BABEL_CACHE_PATH = "${cfg.dataDir}/.babelcache.json"; };
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/kibana --config ${cfgFile}";
         User = "kibana";
diff --git a/nixos/modules/services/security/haka.nix b/nixos/modules/services/security/haka.nix
new file mode 100644
index 0000000000000..4f2bdd29cc49f
--- /dev/null
+++ b/nixos/modules/services/security/haka.nix
@@ -0,0 +1,156 @@
+# This module defines global configuration for Haka.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.haka;
+
+  haka = cfg.package;
+
+  hakaConf = pkgs.writeText "haka.conf"
+  ''
+    [general]
+    configuration = ${if lib.strings.hasPrefix "/" cfg.configFile
+      then "${cfg.configFile}"
+      else "${haka}/share/haka/sample/${cfg.configFile}"}
+    ${optionalString (builtins.lessThan 0 cfg.threads) "thread = ${cfg.threads}"}
+
+    [packet]
+    ${optionalString cfg.pcap ''module = "packet/pcap"''}
+    ${optionalString cfg.nfqueue ''module = "packet/nqueue"''}
+    ${optionalString cfg.dump.enable ''dump = "yes"''}
+    ${optionalString cfg.dump.enable ''dump_input = "${cfg.dump.input}"''}
+    ${optionalString cfg.dump.enable ''dump_output = "${cfg.dump.output}"''}
+
+    interfaces = "${lib.strings.concatStringsSep "," cfg.interfaces}"
+
+    [log]
+    # Select the log module
+    module = "log/syslog"
+
+    # Set the default logging level
+    #level = "info,packet=debug"
+
+    [alert]
+    # Select the alert module
+    module = "alert/syslog"
+
+    # Disable alert on standard output
+    #alert_on_stdout = no
+
+    # alert/file module option
+    #file = "/dev/null"
+  '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.haka = {
+
+      enable = mkEnableOption "Haka";
+
+      package = mkOption {
+        default = pkgs.haka;
+        type = types.package;
+        description = "
+          Which Haka derivation to use.
+        ";
+      };
+
+      configFile = mkOption {
+        default = "empty.lua";
+        example = "/srv/haka/myfilter.lua";
+        type = types.string;
+        description = ''
+          Specify which configuration file Haka uses.
+          It can be absolute path or a path relative to the sample directory of
+          the haka git repo.
+        '';
+      };
+
+      interfaces = mkOption {
+        default = [ "eth0" ];
+        example = [ "any" ];
+        type = with types; listOf string;
+        description = ''
+          Specify which interface(s) Haka listens to.
+          Use 'any' to listen to all interfaces.
+        '';
+      };
+
+      threads = mkOption {
+        default = 0;
+        example = 4;
+        type = types.int;
+        description = ''
+          The number of threads that will be used.
+          All system threads are used by default.
+        '';
+      };
+
+      pcap = mkOption {
+        default = true;
+        example = false;
+        type = types.bool;
+        description = "Whether to enable pcap";
+      };
+
+      nfqueue = mkEnableOption "nfqueue";
+
+      dump.enable = mkEnableOption "dump";
+      dump.input  = mkOption {
+        default = "/tmp/input.pcap";
+        example = "/path/to/file.pcap";
+        type = types.path;
+        description = "Path to file where incoming packets are dumped";
+      };
+
+      dump.output  = mkOption {
+        default = "/tmp/output.pcap";
+        example = "/path/to/file.pcap";
+        type = types.path;
+        description = "Path to file where outgoing packets are dumped";
+      };
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    assertions = [
+      { assertion = cfg.pcap != cfg.nfqueue;
+        message = "either pcap or nfqueue can be enabled, not both.";
+      }
+      { assertion = cfg.nfqueue -> !dump.enable;
+        message = "dump can only be used with nfqueue.";
+      }
+      { assertion = cfg.interfaces != [];
+        message = "at least one interface must be specified.";
+      }];
+
+
+    environment.systemPackages = [ haka ];
+
+    systemd.services.haka = {
+      description = "Haka";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        ExecStart = "${haka}/bin/haka -c ${hakaConf}";
+        ExecStop = "${haka}/bin/hakactl stop";
+        User = "root";
+        Type = "forking";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 52d8c89baff24..0fe8d1a89cf3c 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -83,11 +83,11 @@ let
 
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
-    name= "mediawiki-1.23.9";
+    name= "mediawiki-1.23.13";
 
     src = pkgs.fetchurl {
       url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz";
-      sha256 = "1l7k4g0pgz92yvrfr52w26x740s4362v0gc95pk0i30vn2sp5bql";
+      sha256 = "168wpf53n4ksj2g5q5r0hxapx6238dvsfng5ff9ixk6axsn0j5d0";
     };
 
     skins = config.skins;
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 998bcd354c535..3e91450a39d22 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -64,7 +64,13 @@ in
           else if any (w: w.name == defaultDM) cfg.session.list then
             defaultDM
           else
-            throw "Default desktop manager ($(defaultDM)) not found.";
+            throw ''
+              Default desktop manager (${defaultDM}) not found.
+              Probably you want to change
+                services.xserver.desktopManager.default = "${defaultDM}";
+              to one of
+                ${concatMapStringsSep "\n  " (w: "services.xserver.desktopManager.default = \"${w.name}\";") cfg.session.list}
+            '';
       };
 
     };
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 55d7fd80cf979..6cb4f3acba8dd 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -64,7 +64,7 @@ in {
     environment.gnome3.packageSet = mkOption {
       type = types.nullOr types.package;
       default = null;
-      example = literalExample "pkgs.gnome3_16";
+      example = literalExample "pkgs.gnome3_18";
       description = "Which GNOME 3 package set to use.";
       apply = p: if p == null then pkgs.gnome3 else p;
     };
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 29cca248cde34..80e408be49237 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -108,6 +108,12 @@ in
                 sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
             fi
 
+            # Load PulseAudio module for routing support.
+            # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
+            ${optionalString config.hardware.pulseaudio.enable ''
+              ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
+            ''}
+
             # Start KDE.
             exec ${kde_workspace}/bin/startkde
           '';
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 4b238938d9275..62e483ae70617 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -55,7 +55,15 @@ in
     services.xserver.desktopManager.session = singleton {
       name = "kde5";
       bgSupport = true;
-      start = ''exec startkde;'';
+      start = ''
+        # Load PulseAudio module for routing support.
+        # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
+        ${optionalString config.hardware.pulseaudio.enable ''
+          ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
+        ''}
+
+        exec startkde
+      '';
     };
 
     security.setuidOwners = singleton {
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 3437d8f389308..b93e7db46003d 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -83,9 +83,6 @@ let
 
         # Publish access credentials in the root window.
         ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
-
-        # Keep track of devices.  Mostly useful for Phonon/KDE.
-        ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-device-manager "do_routing=1"
       ''}
 
       # Tell systemd about our $DISPLAY. This is needed by the
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 9460395f86d60..3949bf01a3164 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -86,7 +86,7 @@ in
       };
 
       background = mkOption {
-        type = types.path;
+        type = types.str;
         description = ''
           The background image or color to use.
         '';
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index e50ed08a218a4..2981e7545e814 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -62,6 +62,13 @@ in {
         description = "Cursor speed factor for highest-speed finger motion.";
       };
 
+      scrollDelta = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        example = 75;
+        description = "Move distance of the finger for a scroll event.";
+      };
+
       twoFingerScroll = mkOption {
         type = types.bool;
         default = false;
@@ -122,6 +129,20 @@ in {
         description = "Whether to enable palm detection (hardware support required)";
       };
 
+      palmMinWidth = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        example = 5;
+        description = "Minimum finger width at which touch is considered a palm";
+      };
+
+      palmMinZ = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        example = 20;
+        description = "Minimum finger pressure at which touch is considered a palm";
+      };
+
       horizontalScroll = mkOption {
         type = types.bool;
         default = true;
@@ -174,8 +195,12 @@ in {
           Option "HorizTwoFingerScroll" "${if cfg.horizTwoFingerScroll then "1" else "0"}"
           Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
           Option "HorizEdgeScroll" "${if cfg.horizEdgeScroll then "1" else "0"}"
-          ${if cfg.palmDetect then ''Option "PalmDetect" "1"'' else ""}
-          ${if cfg.horizontalScroll then "" else ''Option "HorizScrollDelta" "0"''}
+          ${optionalString cfg.palmDetect ''Option "PalmDetect" "1"''}
+          ${optionalString (cfg.palmMinWidth != null) ''Option "PalmMinWidth" "${toString cfg.palmMinWidth}"''}
+          ${optionalString (cfg.palmMinZ != null) ''Option "PalmMinZ" "${toString cfg.palmMinZ}"''}
+          ${optionalString (cfg.scrollDelta != null) ''Option "VertScrollDelta" "${toString cfg.scrollDelta}"''}
+          ${if !cfg.horizontalScroll then ''Option "HorizScrollDelta" "0"''
+            else (optionalString (cfg.scrollDelta != null) ''Option "HorizScrollDelta" "${toString cfg.scrollDelta}"'')}
           ${cfg.additionalOptions}
         EndSection
       '';
diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix
index d43dacb1be6b5..2e2e10cc33b02 100644
--- a/nixos/modules/services/x11/window-managers/i3.nix
+++ b/nixos/modules/services/x11/window-managers/i3.nix
@@ -34,6 +34,6 @@ in
         '';
       }];
     };
-    environment.systemPackages = with pkgs; [ i3 i3status dmenu ];
+    environment.systemPackages = with pkgs; [ i3 ];
   };
 }
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 655fbab2a8431..d9048427801ff 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -323,7 +323,7 @@ foreach my $device (keys %$prevSwaps) {
 
 
 # Should we have systemd re-exec itself?
-my $prevSystemd = abs_path("/proc/1/exe") or die;
+my $prevSystemd = abs_path("/proc/1/exe") // "/unknown";
 my $newSystemd = abs_path("@systemd@/lib/systemd/systemd") or die;
 my $restartSystemd = $prevSystemd ne $newSystemd;
 
diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index d01222243f5d7..6e226c1906090 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -3,9 +3,28 @@
 with lib;
 
 let
+
   cfg = config.boot.initrd.network;
 
+  udhcpcScript = pkgs.writeScript "udhcp-script"
+    ''
+      #! /bin/sh
+      if [ "$1" = bound ]; then
+        ip address add "$ip/$mask" dev "$interface"
+        if [ -n "$router" ]; then
+          ip route add default via "$router" dev "$interface"
+        fi
+        if [ -n "$dns" ]; then
+          rm -f /etc/resolv.conf
+          for i in $dns; do
+            echo "nameserver $dns" >> /etc/resolv.conf
+          done
+        fi
+      fi
+    '';
+
 in
+
 {
 
   options = {
@@ -14,82 +33,25 @@ in
       type = types.bool;
       default = false;
       description = ''
-        Add network connectivity support to initrd.
-
-        Network options are configured via <literal>ip</literal> kernel
-        option, according to the kernel documentation.
-      '';
-    };
-
-    boot.initrd.network.ssh.enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Start SSH service during initrd boot. It can be used to debug failing
-        boot on a remote server, enter pasphrase for an encrypted partition etc.
-        Service is killed when stage-1 boot is finished.
-      '';
-    };
-
-    boot.initrd.network.ssh.port = mkOption {
-      type = types.int;
-      default = 22;
-      description = ''
-        Port on which SSH initrd service should listen.
-      '';
-    };
-
-    boot.initrd.network.ssh.shell = mkOption {
-      type = types.str;
-      default = "/bin/ash";
-      description = ''
-        Login shell of the remote user. Can be used to limit actions user can do.
+        Add network connectivity support to initrd. The network may be
+        configured using the <literal>ip</literal> kernel parameter,
+        as described in <link
+        xlink:href="https://www.kernel.org/doc/Documentation/filesystems/nfs/nfsroot.txt">the
+        kernel documentation</link>.  Otherwise, if
+        <option>networking.useDHCP</option> is enabled, an IP address
+        is acquired using DHCP.
       '';
     };
 
-    boot.initrd.network.ssh.hostRSAKey = mkOption {
-      type = types.nullOr types.path;
-      default = null;
+    boot.initrd.network.postCommands = mkOption {
+      default = "";
+      type = types.lines;
       description = ''
-        RSA SSH private key file in the Dropbear format.
-
-        WARNING: This key is contained insecurely in the global Nix store. Do NOT
-        use your regular SSH host private keys for this purpose or you'll expose
-        them to regular users!
-      '';
-    };
-
-    boot.initrd.network.ssh.hostDSSKey = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        DSS SSH private key file in the Dropbear format.
-
-        WARNING: This key is contained insecurely in the global Nix store. Do NOT
-        use your regular SSH host private keys for this purpose or you'll expose
-        them to regular users!
-      '';
-    };
-
-    boot.initrd.network.ssh.hostECDSAKey = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        ECDSA SSH private key file in the Dropbear format.
-
-        WARNING: This key is contained insecurely in the global Nix store. Do NOT
-        use your regular SSH host private keys for this purpose or you'll expose
-        them to regular users!
+        Shell commands to be executed after stage 1 of the
+        boot has initialised the network.
       '';
     };
 
-    boot.initrd.network.ssh.authorizedKeys = mkOption {
-      type = types.listOf types.str;
-      default = config.users.extraUsers.root.openssh.authorizedKeys.keys;
-      description = ''
-        Authorized keys for the root user on initrd.
-      '';
-    };
 
   };
 
@@ -99,51 +61,43 @@ in
 
     boot.initrd.extraUtilsCommands = ''
       copy_bin_and_libs ${pkgs.mkinitcpio-nfs-utils}/bin/ipconfig
-    '' + optionalString cfg.ssh.enable ''
-      copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear
-
-      cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib
     '';
 
-    boot.initrd.extraUtilsCommandsTest = optionalString cfg.ssh.enable ''
-      $out/bin/dropbear -V
-    '';
-
-    boot.initrd.postEarlyDeviceCommands = ''
-      # Search for interface definitions in command line
-      for o in $(cat /proc/cmdline); do
-        case $o in
-          ip=*)
-            ipconfig $o && hasNetwork=1
-            ;;
-        esac
-      done
-    '' + optionalString cfg.ssh.enable ''
-      if [ -n "$hasNetwork" ]; then
-        mkdir /dev/pts
-        mount -t devpts devpts /dev/pts
-
-        mkdir -p /etc
-        echo 'root:x:0:0:root:/root:${cfg.ssh.shell}' > /etc/passwd
-        echo '${cfg.ssh.shell}' > /etc/shells
-        echo 'passwd: files' > /etc/nsswitch.conf
-
-        mkdir -p /var/log
-        touch /var/log/lastlog
-
-        mkdir -p /etc/dropbear
-        ${optionalString (cfg.ssh.hostRSAKey != null) "ln -s ${cfg.ssh.hostRSAKey} /etc/dropbear/dropbear_rsa_host_key"}
-        ${optionalString (cfg.ssh.hostDSSKey != null) "ln -s ${cfg.ssh.hostDSSKey} /etc/dropbear/dropbear_dss_host_key"}
-        ${optionalString (cfg.ssh.hostECDSAKey != null) "ln -s ${cfg.ssh.hostECDSAKey} /etc/dropbear/dropbear_ecdsa_host_key"}
-
-        mkdir -p /root/.ssh
-        ${concatStrings (map (key: ''
-          echo -n ${escapeShellArg key} >> /root/.ssh/authorized_keys
-        '') cfg.ssh.authorizedKeys)}
-
-        dropbear -s -j -k -E -m -p ${toString cfg.ssh.port}
-      fi
-    '';
+    boot.initrd.preLVMCommands = mkBefore (
+      # Search for interface definitions in command line.
+      ''
+        for o in $(cat /proc/cmdline); do
+          case $o in
+            ip=*)
+              ipconfig $o && hasNetwork=1
+              ;;
+          esac
+        done
+      ''
+
+      # Otherwise, use DHCP.
+      + optionalString config.networking.useDHCP ''
+        if [ -z "$hasNetwork" ]; then
+
+          # Bring up all interfaces.
+          for iface in $(cd /sys/class/net && ls); do
+            echo "bringing up network interface $iface..."
+            ip link set "$iface" up
+          done
+
+          # Acquire a DHCP lease.
+          echo "acquiring IP address via DHCP..."
+          udhcpc --quit --now --script ${udhcpcScript} && hasNetwork=1
+        fi
+      ''
+
+      + ''
+        if [ -n "$hasNetwork" ]; then
+          echo "networking is up!"
+          ${cfg.postCommands}
+        fi
+      '');
 
   };
+
 }
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
new file mode 100644
index 0000000000000..4cdc81541955c
--- /dev/null
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -0,0 +1,124 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.boot.initrd.network.ssh;
+
+in
+
+{
+
+  options = {
+
+    boot.initrd.network.ssh.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Start SSH service during initrd boot. It can be used to debug failing
+        boot on a remote server, enter pasphrase for an encrypted partition etc.
+        Service is killed when stage-1 boot is finished.
+      '';
+    };
+
+    boot.initrd.network.ssh.port = mkOption {
+      type = types.int;
+      default = 22;
+      description = ''
+        Port on which SSH initrd service should listen.
+      '';
+    };
+
+    boot.initrd.network.ssh.shell = mkOption {
+      type = types.str;
+      default = "/bin/ash";
+      description = ''
+        Login shell of the remote user. Can be used to limit actions user can do.
+      '';
+    };
+
+    boot.initrd.network.ssh.hostRSAKey = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        RSA SSH private key file in the Dropbear format.
+
+        WARNING: This key is contained insecurely in the global Nix store. Do NOT
+        use your regular SSH host private keys for this purpose or you'll expose
+        them to regular users!
+      '';
+    };
+
+    boot.initrd.network.ssh.hostDSSKey = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        DSS SSH private key file in the Dropbear format.
+
+        WARNING: This key is contained insecurely in the global Nix store. Do NOT
+        use your regular SSH host private keys for this purpose or you'll expose
+        them to regular users!
+      '';
+    };
+
+    boot.initrd.network.ssh.hostECDSAKey = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        ECDSA SSH private key file in the Dropbear format.
+
+        WARNING: This key is contained insecurely in the global Nix store. Do NOT
+        use your regular SSH host private keys for this purpose or you'll expose
+        them to regular users!
+      '';
+    };
+
+    boot.initrd.network.ssh.authorizedKeys = mkOption {
+      type = types.listOf types.str;
+      default = config.users.extraUsers.root.openssh.authorizedKeys.keys;
+      description = ''
+        Authorized keys for the root user on initrd.
+      '';
+    };
+
+  };
+
+  config = mkIf (config.boot.initrd.network.enable && cfg.enable) {
+
+    boot.initrd.extraUtilsCommands = ''
+      copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear
+      cp -pv ${pkgs.glibc}/lib/libnss_files.so.* $out/lib
+    '';
+
+    boot.initrd.extraUtilsCommandsTest = ''
+      $out/bin/dropbear -V
+    '';
+
+    boot.initrd.network.postCommands = ''
+      mkdir /dev/pts
+      mount -t devpts devpts /dev/pts
+
+      echo '${cfg.shell}' > /etc/shells
+      echo 'root:x:0:0:root:/root:${cfg.shell}' > /etc/passwd
+      echo 'passwd: files' > /etc/nsswitch.conf
+
+      mkdir -p /var/log
+      touch /var/log/lastlog
+
+      mkdir -p /etc/dropbear
+      ${optionalString (cfg.hostRSAKey != null) "ln -s ${cfg.hostRSAKey} /etc/dropbear/dropbear_rsa_host_key"}
+      ${optionalString (cfg.hostDSSKey != null) "ln -s ${cfg.hostDSSKey} /etc/dropbear/dropbear_dss_host_key"}
+      ${optionalString (cfg.hostECDSAKey != null) "ln -s ${cfg.hostECDSAKey} /etc/dropbear/dropbear_ecdsa_host_key"}
+
+      mkdir -p /root/.ssh
+      ${concatStrings (map (key: ''
+        echo -n ${escapeShellArg key} >> /root/.ssh/authorized_keys
+      '') cfg.authorizedKeys)}
+
+      dropbear -s -j -k -E -m -p ${toString cfg.port}
+    '';
+
+  };
+
+}
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 6bc046d02611a..a6bbca9b30bb7 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -184,6 +184,9 @@ in
         "ide_disk"
         "ide_generic"
 
+        # SD cards and internal eMMC drives.
+        "mmc_block"
+
         # Support USB keyboards, in case the boot fails and we only have
         # a USB keyboard.
         "uhci_hcd"
diff --git a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
index 502b3b63af2f8..08d4ab14c9ca2 100644
--- a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
+++ b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
@@ -80,8 +80,13 @@ for generation in $(
     | sort -n -r); do
     link=/nix/var/nix/profiles/system-$generation-link
     date=$(stat --printf="%y\n" $link | sed 's/\..*//')
-    kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *)
-    addEntry "NixOS - Configuration $generation ($date - $kernelVersion)" $link "$generation ($date)"
+    if [ -d $link/kernel ]; then
+      kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *)
+      suffix="($date - $kernelVersion)"
+    else
+      suffix="($date)"
+    fi
+    addEntry "NixOS - Configuration $generation $suffix" $link "$generation ($date)"
 done
 
 mv $tmpOther $targetOther
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 7fb368e8c44ff..95df0ace1ca4c 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -150,10 +150,6 @@ udevadm trigger --action=add
 udevadm settle
 
 
-# Additional devices initialization.
-@postEarlyDeviceCommands@
-
-
 # Load boot-time keymap before any LVM/LUKS initialization
 @extraUtils@/bin/busybox loadkmap < "@busyboxKeymap@"
 
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 81418bdf1c157..3367fedc28652 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -66,10 +66,6 @@ let
         copy_bin_and_libs $BIN
       done
 
-      # Copy modprobe.
-      copy_bin_and_libs ${pkgs.kmod}/bin/kmod
-      ln -sf kmod $out/bin/modprobe
-
       # Copy resize2fs if needed.
       ${optionalString (any (fs: fs.autoResize) (attrValues config.fileSystems)) ''
         # We need mke2fs in the initrd.
@@ -161,7 +157,9 @@ let
             --replace /sbin/blkid ${extraUtils}/bin/blkid \
             --replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \
             --replace /sbin/mdadm ${extraUtils}/bin/mdadm \
-            --replace /bin/sh ${extraUtils}/bin/sh
+            --replace /bin/sh ${extraUtils}/bin/sh \
+            --replace /usr/bin/readlink ${extraUtils}/bin/readlink \
+            --replace /usr/bin/basename ${extraUtils}/bin/basename
       done
 
       # Work around a bug in QEMU, which doesn't implement the "READ
@@ -203,13 +201,13 @@ let
     inherit (config.boot) resumeDevice devSize runSize;
 
     inherit (config.boot.initrd) checkJournalingFS
-      preLVMCommands preDeviceCommands postEarlyDeviceCommands postDeviceCommands postMountCommands kernelModules;
+      preLVMCommands preDeviceCommands postDeviceCommands postMountCommands kernelModules;
 
     resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
                     (filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption) config.swapDevices);
 
     fsInfo =
-      let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType fs.options ];
+      let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType (builtins.concatStringsSep "," fs.options) ];
       in pkgs.writeText "initrd-fsinfo" (concatStringsSep "\n" (concatMap f fileSystems));
 
     setHostId = optionalString (config.networking.hostId != null) ''
@@ -322,14 +320,6 @@ in
       '';
     };
 
-    boot.initrd.postEarlyDeviceCommands = mkOption {
-      default = "";
-      type = types.lines;
-      description = ''
-        Shell commands to be executed early after creation of device nodes.
-      '';
-    };
-
     boot.initrd.postMountCommands = mkOption {
       default = "";
       type = types.lines;
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index d0dd7670157ef..4d1466db22d0f 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -41,11 +41,15 @@ let
       };
 
       options = mkOption {
-        default = "defaults";
-        example = "data=journal";
-        type = types.commas; # FIXME: should be a list
+        default = [ "defaults" ];
+        example = [ "data=journal" ];
         description = "Options used to mount the file system.";
-      };
+      } // (if versionAtLeast lib.nixpkgsVersion "16.09" then {
+        type = types.listOf types.str;
+      } else {
+        type = types.either types.commas (types.listOf types.str);
+        apply = x: if isList x then x else lib.strings.splitString "," (builtins.trace "warning: passing a comma-separated string for filesystem options is deprecated; use a list of strings instead. This will become a hard error in 16.09." x);
+      });
 
       autoFormat = mkOption {
         default = false;
@@ -112,7 +116,7 @@ in
         "/data" = {
           device = "/dev/hda2";
           fsType = "ext3";
-          options = "data=journal";
+          options = [ "data=journal" ];
         };
         "/bigdisk".label = "bigdisk";
       };
@@ -127,7 +131,7 @@ in
         <command>mount</command>; defaults to
         <literal>"auto"</literal>), and <literal>options</literal>
         (the mount options passed to <command>mount</command> using the
-        <option>-o</option> flag; defaults to <literal>"defaults"</literal>).
+        <option>-o</option> flag; defaults to <literal>[ "defaults" ]</literal>).
 
         Instead of specifying <literal>device</literal>, you can also
         specify a volume label (<literal>label</literal>) for file
@@ -177,7 +181,7 @@ in
              else throw "No device specified for mount point ‘${fs.mountPoint}’.")
             + " " + fs.mountPoint
             + " " + fs.fsType
-            + " " + fs.options
+            + " " + builtins.concatStringsSep "," fs.options
             + " 0"
             + " " + (if skipCheck fs then "0" else
                      if fs.mountPoint == "/" then "1" else "2")
diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index e1574fa68ad93..02721bb3bea22 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -12,6 +12,8 @@ let
     FONT=${config.i18n.consoleFont}
     ${colors}
   '';
+
+  setVconsole = !config.boot.isContainer;
 in
 
 {
@@ -41,26 +43,33 @@ in
 
   ###### implementation
 
-  config = {
-
-    environment.systemPackages = [ pkgs.kbd ];
-
-    # Let systemd-vconsole-setup.service do the work of setting up the
-    # virtual consoles.  FIXME: trigger a restart of
-    # systemd-vconsole-setup.service if /etc/vconsole.conf changes.
-    environment.etc."vconsole.conf".source = vconsoleConf;
-
-    # This is identical to the systemd-vconsole-setup.service unit
-    # shipped with systemd, except that it uses /dev/tty1 instead of
-    # /dev/tty0 to prevent putting the X server in non-raw mode, and
-    # it has a restart trigger.
-    systemd.services."systemd-vconsole-setup" =
-      { wantedBy = [ "multi-user.target" ];
-        before = [ "display-manager.service" ];
-        after = [ "systemd-udev-settle.service" ];
-        restartTriggers = [ vconsoleConf ];
-      };
-
-  };
+  config = mkMerge [
+    (mkIf (!setVconsole) {
+      systemd.services."systemd-vconsole-setup".enable = false;
+    })
+
+    (mkIf setVconsole {
+      environment.systemPackages = [ pkgs.kbd ];
+
+      # Let systemd-vconsole-setup.service do the work of setting up the
+      # virtual consoles.  FIXME: trigger a restart of
+      # systemd-vconsole-setup.service if /etc/vconsole.conf changes.
+      environment.etc = [ {
+        target = "vconsole.conf";
+        source = vconsoleConf;
+      } ];
+
+      # This is identical to the systemd-vconsole-setup.service unit
+      # shipped with systemd, except that it uses /dev/tty1 instead of
+      # /dev/tty0 to prevent putting the X server in non-raw mode, and
+      # it has a restart trigger.
+      systemd.services."systemd-vconsole-setup" =
+        { wantedBy = [ "multi-user.target" ];
+          before = [ "display-manager.service" ];
+          after = [ "systemd-udev-settle.service" ];
+          restartTriggers = [ vconsoleConf ];
+        };
+    })
+  ];
 
 }
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index f07e7baeb1198..c960e401f9b1e 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -144,15 +144,12 @@ in
                   fi
                   ${config.systemd.package}/bin/systemctl start ip-up.target
                 '';
-            preStop =
-              ''
-                echo "releasing configured ip's..."
-              '' + flip concatMapStrings (ips) (ip:
+            preStop = flip concatMapStrings (ips) (ip:
                 let
                   address = "${ip.address}/${toString ip.prefixLength}";
                 in
                 ''
-                  echo -n "Deleting ${address}..."
+                  echo -n "deleting ${address}..."
                   ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed"
                   echo ""
                 '');
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index e72c0f8956ed6..503d3813611fc 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -927,7 +927,7 @@ in
         pkgs.nettools
         pkgs.openresolv
       ]
-      ++ optionals (!config.boot.isContainer) [
+      ++ optionals config.networking.wireless.enable [
         pkgs.wirelesstools # FIXME: obsolete?
         pkgs.iw
         pkgs.rfkill
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 7ccc9df740e56..a895f66db8efa 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -20,8 +20,7 @@ let cfg = config.ec2; in
       autoResize = true;
     };
 
-    boot.initrd.kernelModules = [ "xen-blkfront" ];
-    boot.kernelModules = [ "xen-netfront" ];
+    boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ];
     boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" ];
 
     # Prevent the nouveau kernel module from being loaded, as it
@@ -44,6 +43,8 @@ let cfg = config.ec2; in
         kill -9 -1
       '';
 
+    boot.initrd.network.enable = true;
+
     # Mount all formatted ephemeral disks and activate all swap devices.
     # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options
     # because the set of devices is dependent on the instance type
@@ -55,6 +56,28 @@ let cfg = config.ec2; in
     # Nix operations.
     boot.initrd.postMountCommands =
       ''
+        metaDir=$targetRoot/etc/ec2-metadata
+        mkdir -m 0755 -p "$metaDir"
+
+        echo "getting EC2 instance metadata..."
+
+        if ! [ -e "$metaDir/ami-manifest-path" ]; then
+          wget -q -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
+        fi
+
+        if ! [ -e "$metaDir/user-data" ]; then
+          wget -q -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data
+          chmod 600 "$metaDir/user-data"
+        fi
+
+        if ! [ -e "$metaDir/hostname" ]; then
+          wget -q -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
+        fi
+
+        if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then
+          wget -q -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
+        fi
+
         diskNr=0
         diskForUnionfs=
         for device in /dev/xvd[abcde]*; do
@@ -81,7 +104,7 @@ let cfg = config.ec2; in
             mkdir -m 1777 -p $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp
             mount --bind $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp
 
-            if [ ! -e $targetRoot/.ebs ]; then
+            if [ "$(cat "$metaDir/ami-manifest-path")" != "(unknown)" ]; then
                 mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/var $targetRoot/var
                 mount --bind $targetRoot/$diskForUnionfs/root/var $targetRoot/var
 
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index 96cd57e6db5d8..886552f33c2c7 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -4,18 +4,17 @@
 
 let
   bootScript = pkgs.writeScript "bootscript.sh" ''
-    #!${pkgs.stdenv.shell} -eux
+    #!${pkgs.stdenv.shell} -eu
 
-    echo "attempting to fetch configuration from user-data..."
+    echo "attempting to fetch configuration from EC2 user data..."
 
-    export PATH=${config.nix.package}/bin:${pkgs.wget}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH
+    export PATH=${config.nix.package}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH
     export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
 
-    userData="$(mktemp)"
-    wget -q --wait=1 --tries=0 --retry-connrefused -O - http://169.254.169.254/2011-01-01/user-data > "$userData"
+    userData=/etc/ec2-metadata/user-data
+
+    if [ -s "$userData" ]; then
 
-    if [[ $? -eq 0 ]]; then
-      echo "user-data fetched"
       # If the user-data looks like it could be a nix expression,
       # copy it over. Also, look for a magic three-hash comment and set
       # that as the channel.
@@ -30,17 +29,17 @@ let
           nix-channel --update
         fi
 
-        echo "setting configuration"
+        echo "setting configuration from EC2 user data"
         cp "$userData" /etc/nixos/configuration.nix
       else
-        echo "user-data does not appear to be a nix expression; ignoring"
+        echo "user data does not appear to be a Nix expression; ignoring"
+        exit
       fi
     else
-      echo "failed to fetch user-data"
+      echo "no user data is available"
+      exit
     fi
 
-    type -f nixos-rebuild
-
     nixos-rebuild switch
   '';
 in {
diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix
index ef4e3e1e48d4f..96418d61ff850 100644
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixos/modules/virtualisation/azure-agent.nix
@@ -8,10 +8,11 @@ let
 
   waagent = with pkgs; stdenv.mkDerivation rec {
     name = "waagent-2.0";
-    src = pkgs.fetchgit {
-      url = https://github.com/Phreedom/WALinuxAgent.git;
-      rev = "9dba81c7b1239c7971ec96e405e403c7cd224e6b";
-      sha256 = "0khxk3ns3z37v26f2qj6m3m698a0vqpc9bxg5p7fyr3xza5gzwhs";
+    src = pkgs.fetchFromGitHub {
+      owner = "phreedom";
+      repo = "WALinuxAgent";
+      rev = "1d31fe8cbc7f842993eed9b33a3d3f5410c364e3";
+      sha256 = "1s53pfmy3azp0rmympmnphyq96sr9jy07pbsfza6mdzpalx1ripl";
     };
     buildInputs = [ makeWrapper python pythonPackages.wrapPython ];
     runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh
diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index 383750520ab7b..bee2626126804 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -1,6 +1,6 @@
-# This module defines a systemd service that obtains the SSH key and
-# host name of virtual machines running on Amazon EC2, Eucalyptus and
-# OpenStack Compute (Nova).
+# This module defines a systemd service that sets the SSH host key and
+# authorized client key and host name of virtual machines running on
+# Amazon EC2, Eucalyptus and OpenStack Compute (Nova).
 
 { config, lib, pkgs, ... }:
 
@@ -9,55 +9,49 @@ with lib;
 {
   config = {
 
-    systemd.services.fetch-ec2-data =
-      { description = "Fetch EC2 Data";
+    systemd.services.apply-ec2-data =
+      { description = "Apply EC2 Data";
 
         wantedBy = [ "multi-user.target" "sshd.service" ];
         before = [ "sshd.service" ];
-        wants = [ "ip-up.target" ];
-        after = [ "ip-up.target" ];
 
-        path = [ pkgs.wget pkgs.iproute ];
+        path = [ pkgs.iproute ];
 
         script =
           ''
-            wget="wget -q --retry-connrefused -O -"
-
             ${optionalString (config.networking.hostName == "") ''
               echo "setting host name..."
-              ${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/1.0/meta-data/hostname)
+              if [ -s /etc/ec2-metadata/hostname ]; then
+                  ${pkgs.nettools}/bin/hostname $(cat /etc/ec2-metadata/hostname)
+              fi
             ''}
 
-            # Don't download the SSH key if it has already been injected
-            # into the image (a Nova feature).
             if ! [ -e /root/.ssh/authorized_keys ]; then
                 echo "obtaining SSH key..."
                 mkdir -m 0700 -p /root/.ssh
-                $wget http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key > /root/key.pub
-                if [ $? -eq 0 -a -e /root/key.pub ]; then
-                    cat /root/key.pub >> /root/.ssh/authorized_keys
+                if [ -s /etc/ec2-metadata/public-keys-0-openssh-key ]; then
+                    cat /etc/ec2-metadata/public-keys-0-openssh-key >> /root/.ssh/authorized_keys
                     echo "new key added to authorized_keys"
                     chmod 600 /root/.ssh/authorized_keys
-                    rm -f /root/key.pub
                 fi
             fi
 
             # Extract the intended SSH host key for this machine from
             # the supplied user data, if available.  Otherwise sshd will
             # generate one normally.
-            $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
+            userData=/etc/ec2-metadata/user-data
 
             mkdir -m 0755 -p /etc/ssh
 
-            key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)"
-            key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)"
+            key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' $userData)"
+            key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' $userData)"
             if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then
                 (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
                 echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
             fi
 
-            key="$(sed 's/|/\n/g; s/SSH_HOST_ED25519_KEY://; t; d' /root/user-data)"
-            key_pub="$(sed 's/SSH_HOST_ED25519_KEY_PUB://; t; d' /root/user-data)"
+            key="$(sed 's/|/\n/g; s/SSH_HOST_ED25519_KEY://; t; d' $userData)"
+            key_pub="$(sed 's/SSH_HOST_ED25519_KEY_PUB://; t; d' $userData)"
             if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_ed25519_key ]; then
                 (umask 077; echo "$key" > /etc/ssh/ssh_host_ed25519_key)
                 echo "$key_pub" > /etc/ssh/ssh_host_ed25519_key.pub
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 82b58aa67a3d7..7dfbc38efee6a 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -110,6 +110,7 @@ let
 
   # Generate a hard disk image containing a /boot partition and GRUB
   # in the MBR.  Used when the `useBootLoader' option is set.
+  # FIXME: use nixos/lib/make-disk-image.nix.
   bootDisk =
     pkgs.vmTools.runInLinuxVM (
       pkgs.runCommand "nixos-boot-disk"
@@ -427,38 +428,38 @@ in
         ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} =
           { device = "store";
             fsType = "9p";
-            options = "trans=virtio,version=9p2000.L,cache=loose";
+            options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
             neededForBoot = true;
           };
         "/tmp/xchg" =
           { device = "xchg";
             fsType = "9p";
-            options = "trans=virtio,version=9p2000.L,cache=loose";
+            options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
             neededForBoot = true;
           };
         "/tmp/shared" =
           { device = "shared";
             fsType = "9p";
-            options = "trans=virtio,version=9p2000.L";
+            options = [ "trans=virtio" "version=9p2000.L" ];
             neededForBoot = true;
           };
       } // optionalAttrs cfg.writableStore
       { "/nix/store" =
           { fsType = "unionfs-fuse";
             device = "unionfs";
-            options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro";
+            options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ];
           };
       } // optionalAttrs (cfg.writableStore && cfg.writableStoreUseTmpfs)
       { "/nix/.rw-store" =
           { fsType = "tmpfs";
-            options = "mode=0755";
+            options = [ "mode=0755" ];
             neededForBoot = true;
           };
       } // optionalAttrs cfg.useBootLoader
       { "/boot" =
           { device = "/dev/vdb2";
             fsType = "vfat";
-            options = "ro";
+            options = [ "ro" ];
             noCheck = true; # fsck fails on a r/o filesystem
           };
       });
diff --git a/nixos/release.nix b/nixos/release.nix
index 9c15b1ea0746f..d9f3e46b27c05 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -248,6 +248,7 @@ in rec {
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
   tests.kde4 = callTest tests/kde4.nix {};
+  tests.initrdNetwork = callTest tests/initrd-network.nix {};
   tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
   tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
   #tests.lightdm = callTest tests/lightdm.nix {};
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 1d1e12d0ee395..6c61087760ddb 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -2,8 +2,8 @@ import ./make-test.nix (
 { pkgs
 , channelMap ? {
     stable = pkgs.chromium;
-    beta   = pkgs.chromiumBeta;
-    dev    = pkgs.chromiumDev;
+    #beta   = pkgs.chromiumBeta;
+    #dev    = pkgs.chromiumDev;
   }
 , ...
 }: rec {
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index 1925ab37419aa..0a95d6cfeff4b 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -10,9 +10,10 @@ let
       inherit system;
       modules = [
         ../maintainers/scripts/ec2/amazon-image.nix
-        ../../nixos/modules/testing/test-instrumentation.nix
-        { boot.initrd.kernelModules = [ "virtio" "virtio_blk" "virtio_pci" "virtio_ring" ];
-          ec2.hvm = true;
+        ../modules/testing/test-instrumentation.nix
+        ../modules/profiles/minimal.nix
+        ../modules/profiles/qemu-guest.nix
+        { ec2.hvm = true;
 
           # Hack to make the partition resizing work in QEMU.
           boot.initrd.postDeviceCommands = mkBefore
@@ -33,6 +34,7 @@ let
           ln -s ${pkgs.writeText "userData" userData} $out/2011-01-01/user-data
           mkdir -p $out/1.0/meta-data
           echo "${hostname}" > $out/1.0/meta-data/hostname
+          echo "(unknown)" > $out/1.0/meta-data/ami-manifest-path
         '' + optionalString (sshPublicKey != null) ''
           mkdir -p $out/1.0/meta-data/public-keys/0
           ln -s ${pkgs.writeText "sshPublicKey" sshPublicKey} $out/1.0/meta-data/public-keys/0/openssh-key
@@ -56,7 +58,7 @@ let
           # again when it deletes link-local addresses.) Ideally we'd
           # turn off the DHCP server, but qemu does not have an option
           # to do that.
-          my $startCommand = "qemu-kvm -m 768 -net nic -net 'user,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'";
+          my $startCommand = "qemu-kvm -m 768 -net nic,vlan=0,model=virtio -net 'user,vlan=0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'";
           $startCommand .= " -drive file=$diskImage,if=virtio,werror=report";
           $startCommand .= " \$QEMU_OPTS";
 
@@ -92,6 +94,8 @@ in {
       $machine->waitForFile("/root/user-data");
       $machine->waitForUnit("sshd.service");
 
+      $machine->succeed("grep unknown /etc/ec2-metadata/ami-manifest-path");
+
       # We have no keys configured on the client side yet, so this should fail
       $machine->fail("ssh -o BatchMode=yes localhost exit");
 
diff --git a/nixos/tests/haka.nix b/nixos/tests/haka.nix
new file mode 100644
index 0000000000000..40548f34690f6
--- /dev/null
+++ b/nixos/tests/haka.nix
@@ -0,0 +1,24 @@
+# This test runs haka and probes it with hakactl
+
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "haka";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ tvestelind ];
+  };
+
+  nodes = {
+    haka =
+      { config, pkgs, ... }:
+        {
+          services.haka.enable = true;
+        };
+    };
+
+  testScript = ''
+    startAll;
+
+    $haka->waitForUnit("haka.service");
+    $haka->succeed("hakactl status");
+    $haka->succeed("hakactl stop");
+  '';
+})
diff --git a/nixos/tests/initrd-network.nix b/nixos/tests/initrd-network.nix
new file mode 100644
index 0000000000000..db9f572d3c2f6
--- /dev/null
+++ b/nixos/tests/initrd-network.nix
@@ -0,0 +1,22 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "initrd-network";
+
+  meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ];
+
+  machine = { config, pkgs, ... }: {
+    imports = [ ../modules/profiles/minimal.nix ];
+    boot.initrd.network.enable = true;
+    boot.initrd.network.postCommands =
+      ''
+        ip addr | grep 10.0.2.15 || exit 1
+        ping -c1 10.0.2.2 || exit 1
+      '';
+  };
+
+  testScript =
+    ''
+      startAll;
+      $machine->waitForUnit("multi-user.target");
+      $machine->succeed("ip link >&2");
+    '';
+})
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 6297452df95ea..73af0cfad21f4 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ];
       fileSystems = mkVMOverride { "/tmp2" =
         { fsType = "tmpfs";
-          options = "mode=1777,noauto";
+          options = [ "mode=1777" "noauto" ];
         };
       };
       systemd.automounts = singleton
diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix
index 24f6e0f2ed95d..36cd6a3957791 100644
--- a/nixos/tests/nfs.nix
+++ b/nixos/tests/nfs.nix
@@ -8,7 +8,7 @@ let
         [ { mountPoint = "/data";
             device = "server:/data";
             fsType = "nfs";
-            options = "vers=${toString version}";
+            options = [ "vers=${toString version}" ];
           }
         ];
       networking.firewall.enable = false; # FIXME: only open statd
diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix
index 287712be316da..04d624adcfe97 100644
--- a/nixos/tests/simple.nix
+++ b/nixos/tests/simple.nix
@@ -4,7 +4,9 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ eelco ];
   };
 
-  machine = { config, pkgs, ... }: { };
+  machine = { config, pkgs, ... }: {
+    imports = [ ../modules/profiles/minimal.nix ];
+  };
 
   testScript =
     ''
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index 2c02baf991847..cfce61c8752e8 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbis-tools, id3v2, eyeD3
+{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3
 , lame, flac, eject, mkcue
 , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
@@ -50,7 +50,7 @@ in
          --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
 
       wrapProgram "$out/bin/abcde" --prefix PATH ":" \
-        "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbis-tools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin"
+        "$out/bin:${which}/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbis-tools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin:${flac}/bin"
 
       wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
         "${wget}/bin"
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 2663f5592f789..1a2b4b7cc8796 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -12,6 +12,7 @@
 , midiSupport ? false, wildmidi ? null
 , wavpackSupport ? false, wavpack ? null
 , ffmpegSupport ? false, ffmpeg ? null
+, apeSupport ? true, yasm ? null
 # misc plugins
 , zipSupport ? true, libzip ? null
 , artworkSupport ? true, imlib2 ? null
@@ -38,6 +39,7 @@ assert cdaSupport -> (libcdio != null && libcddb != null);
 assert aacSupport -> faad2 != null;
 assert zipSupport -> libzip != null;
 assert ffmpegSupport -> ffmpeg != null;
+assert apeSupport -> yasm != null;
 assert artworkSupport -> imlib2 != null;
 assert hotkeysSupport -> libX11 != null;
 assert osdSupport -> dbus != null;
@@ -68,6 +70,7 @@ stdenv.mkDerivation rec {
     ++ optional aacSupport faad2
     ++ optional zipSupport libzip
     ++ optional ffmpegSupport ffmpeg
+    ++ optional apeSupport yasm
     ++ optional artworkSupport imlib2
     ++ optional hotkeysSupport libX11
     ++ optional osdSupport dbus
diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index 722c762b7b448..4e03b26c036c3 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -1,6 +1,6 @@
 { stdenv
 , coreutils
-, fetchgit
+, fetchurl
 , makeWrapper
 , pkgconfig
 }:
@@ -9,12 +9,11 @@ with stdenv.lib.strings;
 
 let
 
-  version = "8-1-2015";
+  version = "0.9.73";
 
-  src = fetchgit {
-    url = git://git.code.sf.net/p/faudiostream/code;
-    rev = "4db76fdc02b6aec8d15a5af77fcd5283abe963ce";
-    sha256 = "f1ac92092ee173e4bcf6b2cb1ac385a7c390fb362a578a403b2b6edd5dc7d5d0";
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.tgz";
+    sha256 = "0x2scxkwvvjx7b7smj5xb8kr269qakf49z3fxpasd9g7025q44k5";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/faust/default.nix b/pkgs/applications/audio/faust/faust2.nix
index 91e9fb66659e4..91e9fb66659e4 100644
--- a/pkgs/applications/audio/faust/default.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix
index c333492fd13e6..2038f898e3ecc 100644
--- a/pkgs/applications/audio/ladspa-sdk/default.nix
+++ b/pkgs/applications/audio/ladspa-sdk/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
   name = "ladspa-sdk-${version}";
   version = "1.13";
   src = fetchurl {
-    url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
+    url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz";
     sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm";
   };
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "The SDK for the LADSPA audio plugin standard";
     longDescription = ''
       The LADSPA SDK, including the ladspa.h API header file,
-      ten example LADSPA plugins and 
+      ten example LADSPA plugins and
       three example programs (applyplugin, analyseplugin and listplugins).
     '';
     homepage = http://www.ladspa.org/ladspa_sdk/overview.html;
diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
index 8c4d8a8c1ed57..aa0a191bdd1a7 100644
--- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
@@ -1,17 +1,26 @@
-{ runCommand, fetchurl }:
-
-let
-
+{ stdenv, fetchurl }:
+stdenv.mkDerivation rec {
+  name = "ladspa.h-${version}";
+  version = "1.13";
   src = fetchurl {
-    url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt;
-    sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
+    url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz";
+    sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm";
   };
 
-in
-
-runCommand "ladspa.h"
-  { meta.description = "LADSPA format audio plugins"; }
-  ''
+  installPhase = ''
     mkdir -p $out/include
-    cp ${src} $out/include/ladspa.h
-  ''
+    cp src/ladspa.h $out/include/ladspa.h
+  '';
+
+  meta = {
+    description = "LADSPA format audio plugins header file";
+    longDescription = ''
+      The ladspa.h API header file from the LADSPA SDK.
+      For the full SDK, use the ladspa-sdk package.
+    '';
+    homepage = http://www.ladspa.org/ladspa_sdk/overview.html;
+    license = stdenv.lib.licenses.lgpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 84fcd50adc054..5a54c94f1f97c 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -4,12 +4,12 @@ ladspaH, liblrdf, liblo, libsigcxx
 
 stdenv.mkDerivation rec {
   name = "non-${version}";
-  version = "2015-12-16";
+  version = "2016-02-07";
   src = fetchFromGitHub {
     owner = "original-male";
     repo = "non";
-    rev = "5d274f430c867f73ed1dcb306b49be0371d28128";
-    sha256 = "1yckac3r1hqn5p450j4lf4349v4knjj7n9s5p3wdcvxhs0pjv2sy";
+    rev = "1ef382fbbea598fdb56b25244a703c64ecaf8446";
+    sha256 = "1mi3nm0nrrqlk36920irvqf5080lbnj1qc8vnxspgwkjjqgdc22g";
   };
 
     buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile
diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix
new file mode 100644
index 0000000000000..e7108ebe48716
--- /dev/null
+++ b/pkgs/applications/audio/qtscrobbler/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "qtscrobbler-${version}";
+  version = "0.11";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/qtscrob/qtscrob/${version}/qtscrob-${version}.tar.bz2";
+    sha256 = "01c8e48f616ed09504833d27d92fd62f455bd645ea2d1cc2a5f4c287d641daba";
+  };
+
+  nativeBuildInputs = lib.optionals withMtp [ pkgconfig which ];
+  buildInputs = [ qt4 ] ++ lib.optional withMtp libmtp;
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    cd src
+    sed -i "s,/usr/local,$out," common.pri
+  '';
+
+  configurePhase = "qmake";
+
+  meta = with lib; {
+    description = "Qt based last.fm scrobbler";
+    longDescription = ''
+      QTScrobbler is a tool to upload information about the tracks you have played from your Digital Audio Player (DAP) to your last.fm account.
+      It is able to gather this information from Apple iPods or DAPs running the Rockbox replacement firmware.
+    '';
+
+    homepage = http://qtscrob.sourceforge.net;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vanzef ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
new file mode 100644
index 0000000000000..74ce6a2c15f0f
--- /dev/null
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -0,0 +1,73 @@
+{ pkgs, stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook,
+  python, buildPythonPackage, isPy3k,
+  gnome3, gtk3, gobjectIntrospection,
+  dbus, pygobject3, mpd2 }:
+
+with pkgs.lib;
+
+buildPythonPackage rec {
+  name = "sonata-${version}";
+  version = "1.7b1";
+  namePrefix = "";
+
+  src = fetchFromGitHub {
+    owner = "multani";
+    repo = "sonata";
+    rev = "v${version}";
+    sha256 = "1npbxlrg6k154qybfd250nq2p96kxdsdkj9wwnp93gljnii3g8wh";
+  };
+
+  disabled = !isPy3k;
+
+  buildInputs = [
+    pkgconfig intltool wrapGAppsHook
+    gnome3.gnome_themes_standard gnome3.defaultIconTheme
+    gnome3.gsettings_desktop_schemas
+  ];
+
+  postPatch = ''
+    # Remove "Local MPD" tab which is not suitable for NixOS.
+    sed -i '/localmpd/d' sonata/consts.py
+  '';
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  propagatedBuildInputs = [
+    gobjectIntrospection gtk3 pygobject3
+  ];
+
+  # The optional tagpy dependency (for editing metadata) is not yet
+  # included because it's difficult to build.
+  pythonPath = [ dbus pygobject3 mpd2 ];
+
+  meta = {
+    description = "An elegant client for the Music Player Daemon";
+    longDescription = ''
+      Sonata is an elegant client for the Music Player Daemon.
+
+      Written in Python and using the GTK+ 3 widget set, its features
+      include:
+
+       - Expanded and collapsed views
+       - Automatic remote and local album art
+       - Library browsing by folders, or by genre/artist/album
+       - User-configurable columns
+       - Automatic fetching of lyrics
+       - Playlist and stream support
+       - Support for editing song tags (not in NixOS version)
+       - Drag and drop to copy files
+       - Popup notification
+       - Library and playlist searching, filter as you type
+       - Audioscrobbler (last.fm) 1.2 support
+       - Multiple MPD profiles
+       - Keyboard friendly
+       - Support for multimedia keys
+       - Commandline control
+       - Available in 24 languages
+    '';
+    homepage = "http://www.nongnu.org/sonata/";
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.rvl ];
+  };
+}
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 70dc832225be7..3956ed0fbba56 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -87,7 +87,14 @@ stdenv.mkDerivation {
       # Desktop file
       mkdir -p "$out/share/applications/"
       cp "$out/share/spotify/spotify.desktop" "$out/share/applications/"
-      sed -i "s|Icon=.*|Icon=$out/share/spotify/Icons/spotify-linux-512.png|" "$out/share/applications/spotify.desktop"
+
+      # Icons
+      for i in 16 22 24 32 48 64 128 256 512; do
+        ixi="$i"x"$i"
+        mkdir -p "$out/share/icons/hicolor/$ixi/apps"
+        ln -s "$out/share/spotify/icons/spotify-linux-$i.png" \
+          "$out/share/icons/hicolor/$ixi/apps/spotify-client.png"
+      done
     '';
 
   dontStrip = true;
diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix
new file mode 100644
index 0000000000000..55e95c0fc1566
--- /dev/null
+++ b/pkgs/applications/audio/timemachine/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, gtk2
+, libjack2, libsndfile
+}:
+
+stdenv.mkDerivation rec {
+  name = "timemachine-${version}";
+  version = "0.3.1";
+  src = fetchFromGitHub {
+    owner = "swh";
+    repo = "timemachine";
+    rev = "1966d8524d4e4c47c525473bab3b010a168adc98";
+    sha256 = "0w5alysixnvlkfl79wf7vs5wsw2vgxl3gqxxcm0zbmhjdpmjpcal";
+  };
+
+    buildInputs = [ autoconf automake pkgconfig gtk2 libjack2
+      libsndfile
+    ];
+
+  preConfigure = "./autogen.sh";
+
+  meta = {
+    description = "JACK audio recorder";
+    homepage = http://plugin.org.uk/timemachine/;
+    license = stdenv.lib.licenses.lgpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.nico202 ];
+  };
+}
+
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index f3147ca5187c0..62b1a9c2f696c 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -18,13 +18,17 @@ stdenv.mkDerivation rec {
       # slim's broken PAM session handling (see
       # http://developer.berlios.de/bugs/?func=detailbug&bug_id=19102&group_id=2663).
       ./run-once.patch
+
+      # Ensure that sessions appear in sort order, rather than in
+      # directory order.
+      ./sort-sessions.patch
     ];
 
   preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib";
 
   cmakeFlags = [ "-DUSE_PAM=1" ];
 
-  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype";
+  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype -std=c++11";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/display-managers/slim/sort-sessions.patch b/pkgs/applications/display-managers/slim/sort-sessions.patch
new file mode 100644
index 0000000000000..cab5610f44fb6
--- /dev/null
+++ b/pkgs/applications/display-managers/slim/sort-sessions.patch
@@ -0,0 +1,40 @@
+diff -ru -x '*~' slim-1.3.6-orig/cfg.cpp slim-1.3.6/cfg.cpp
+--- slim-1.3.6-orig/cfg.cpp	2013-10-02 00:38:05.000000000 +0200
++++ slim-1.3.6/cfg.cpp	2016-01-30 10:35:51.108766802 +0100
+@@ -14,6 +14,7 @@
+ #include <iostream>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <algorithm>
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -293,6 +294,8 @@
+ 
+ 	sessions.clear();
+ 
++        typedef pair<string,string> session_t;
++
+ 	if( !strSessionDir.empty() ) {
+ 		DIR *pDir = opendir(strSessionDir.c_str());
+ 
+@@ -325,7 +328,7 @@
+                                      }
+                              }
+                              desktop_file.close();
+-                             pair<string,string> session(session_name,session_exec);
++                             session_t session(session_name,session_exec);
+                              sessions.push_back(session);
+                              cout << session_exec << " - " << session_name << endl;
+                         }
+@@ -341,6 +344,10 @@
+         pair<string,string> session("","");
+         sessions.push_back(session);
+ 	}
++
++        std::sort(sessions.begin(), sessions.end(), [](session_t& a, session_t& b) -> bool{
++                return a.first < b.first;
++        });
+ }
+ 
+ pair<string,string> Cfg::nextSession() {
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 7120b8f43ee99..87a36a36f90a6 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -16,11 +16,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.4.0";
+  version = "1.4.3";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0dipww58p0sm99jn1ariisha9wsnhl7rnd8achpxqkf4b3vwi5iz";
+    sha256 = "15ix5ww3ny5ylgmmxpkc32li6af2vc4a2p6aymx9c472fra0c41x";
     name = "${name}.deb";
   };
 
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index f692d40fb1211..526559e32e63b 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -12,7 +12,7 @@ rec {
 
   buildEclipse = import ./build-eclipse.nix args;
 
-  eclipse_sdk_35 = buildEclipse {
+  eclipse-sdk-35 = buildEclipse {
     name = "eclipse-sdk-3.5.2";
     description = "Eclipse Classic";
     src =
@@ -27,10 +27,9 @@ rec {
           md5 = "bde55a2354dc224cf5f26e5320e72dac";
         };
   };
+  eclipse_sdk_35 = eclipse-sdk-35; # backward compatibility, added 2016-01-30
 
-  # !!! Use mirror://eclipse/.
-
-  eclipse_sdk_36 = buildEclipse {
+  eclipse-sdk-36 = buildEclipse {
     name = "eclipse-sdk-3.6.2";
     description = "Eclipse Classic";
     src =
@@ -45,9 +44,10 @@ rec {
           sha256 = "1bh8ykliqr8wbciv13vpiy50rvm7yszk7y8dslr796dbwhi5b1cj";
         };
   };
+  eclipse_sdk_36 = eclipse-sdk-36; # backward compatibility, added 2016-01-30
 
-  eclipse_scala_sdk_40 = buildEclipse {
-    name = "eclipse-scala_sdk-4.0.0";
+  eclipse-scala-sdk-40 = buildEclipse {
+    name = "eclipse-scala-sdk-4.0.0";
     description = "Eclipse IDE for Scala Developers";
     src =
       if stdenv.system == "x86_64-linux" then
@@ -61,8 +61,9 @@ rec {
           sha256 = "f422aea5903c97d212264a5a43c6ebc638aecbd4ce5e6078d92618725bc5d31e";
         };
   };
+  eclipse_scala_sdk_40 = eclipse-scala-sdk-40; # backward compatibility, added 2016-01-30
 
-  eclipse_cpp_36 = buildEclipse {
+  eclipse-cpp-36 = buildEclipse {
     name = "eclipse-cpp-3.6.2";
     description = "Eclipse IDE for C/C++ Developers";
     src =
@@ -77,8 +78,9 @@ rec {
           sha1 = "1156e4bc0253ae3a3a4e54839e4944dc64d3108f";
         };
   };
+  eclipse_cpp_36 = eclipse-cpp-36; # backward compatibility, added 2016-01-30
 
-  eclipse_modeling_36 = buildEclipse {
+  eclipse-modeling-36 = buildEclipse {
     name = "eclipse-modeling-3.6.2";
     description = "Eclipse Modeling Tools (includes Incubating components)";
     src =
@@ -93,8 +95,9 @@ rec {
           sha1 = "696377895bb26445de39d82a916b7e69edb1d939";
         };
   };
+  eclipse_modeling_36 = eclipse-modeling-36; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_37 = buildEclipse {
+  eclipse-sdk-37 = buildEclipse {
     name = "eclipse-sdk-3.7";
     description = "Eclipse Classic";
     sources = {
@@ -108,8 +111,9 @@ rec {
         };
     };
   };
+  eclipse_sdk_37 = eclipse-sdk-37; # backward compatibility, added 2016-01-30
 
-  eclipse_cpp_37 = buildEclipse {
+  eclipse-cpp-37 = buildEclipse {
     name = "eclipse-cpp-3.7";
     description = "Eclipse IDE for C/C++ Developers";
     src =
@@ -124,8 +128,9 @@ rec {
           sha256 = "1cvg1vgyazrkinwzlvlf0dpl197p4784752srqybqylyj5psdi3b";
         };
   };
+  eclipse_cpp_37 = eclipse-cpp-37; # backward compatibility, added 2016-01-30
 
-  eclipse_cpp_42 = buildEclipse {
+  eclipse-cpp-42 = buildEclipse {
     name = "eclipse-cpp-4.2";
     description = "Eclipse IDE for C/C++ Developers";
     src =
@@ -140,8 +145,9 @@ rec {
           sha256 = "1a4s9qlhfpfpdhvffyglnfdr3dq5r2ywcxqywhqi95yhq5nmsgyk";
         };
   };
+  eclipse_cpp_42 = eclipse-cpp-42; # backward compatibility, added 2016-01-30
 
-  eclipse_cpp_43 = buildEclipse {
+  eclipse-cpp-43 = buildEclipse {
     name = "eclipse-cpp-4.3.2";
     description = "Eclipse IDE for C/C++ Developers";
     src =
@@ -156,41 +162,44 @@ rec {
           sha256 = "0d6jlj7hwz8blx6csrlyi2h2prql0wckbh7ihwjmgclwpcpj84g6";
         };
   };
+  eclipse_cpp_43 = eclipse-cpp-43; # backward compatibility, added 2016-01-30
   
-   eclipse_cpp_44 = buildEclipse {
-    name = "eclipse-cpp-4.4";
+  eclipse-cpp-44 = buildEclipse {
+    name = "eclipse-cpp-4.4.2";
     description = "Eclipse IDE for C/C++ Developers";
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk-x86_64.tar.gz;
-          md5 = "b0a6ee33e8108a7ff4682ab911271b04";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/SR2/eclipse-cpp-luna-SR2-linux-gtk-x86_64.tar.gz;
+          sha256 = "1vxwj7yihgipvrb3gksmddqkarzazpwk3mh1mjnw0i5xz2y32ba4";
         }
       else
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk.tar.gz;
-          md5 = "5000f93cecf6ef9af112f0df6e8c87f3";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/SR2/eclipse-cpp-luna-SR2-linux-gtk.tar.gz;
+          sha256 = "1yn7yzzx8izc199c8w4f7vrc0b08idyq0dn113i8123b0mxw5lkp";
         };
   };
+  eclipse_cpp_44 = eclipse-cpp-44; # backward compatibility, added 2016-01-30
 
-  eclipse_cpp_45 = buildEclipse {
-    name = "eclipse-cpp-4.5";
+  eclipse-cpp-45 = buildEclipse {
+    name = "eclipse-cpp-4.5.1";
     description = "Eclipse IDE for C/C++ Developers, Mars release";
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/R/eclipse-cpp-mars-R-linux-gtk-x86_64.tar.gz;
-          sha1 = "11f9583e23ae68eb675107e6c9acc48e0a2520ae";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/1/eclipse-cpp-mars-1-linux-gtk-x86_64.tar.gz;
+          sha256 = "1j6rsgr44kya2v7y34ifscajqk7lnq1w9m9fx4i0qgby84sy4xj7";
         }
       else if stdenv.system == "i686-linux" then
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/R/eclipse-cpp-mars-R-linux-gtk.tar.gz;
-          sha1 = "45dddb8c8f2ec79b7e25cc13d93785863ffe4791";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/1/eclipse-cpp-mars-1-linux-gtk.tar.gz;
+          sha256 = "0qsbvjkq0ssxbnafh4gs8pfclynqis3nf7xlxx4w3k20jcjx7sr2";
         }
       else throw "Unsupported system: ${stdenv.system}";
   };
+  eclipse_cpp_45 = eclipse-cpp-45; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_421 = buildEclipse {
+  eclipse-sdk-421 = buildEclipse {
     name = "eclipse-sdk-4.2.1";
     description = "Eclipse Classic";
     src =
@@ -205,8 +214,9 @@ rec {
           sha256 = "1av6qm9wkbyk123qqf38f0jq4jv2bj9wp6fmpnl55zg6qr463c1w";
         };
     };
+  eclipse_sdk_421 = eclipse-sdk-421; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_422 = buildEclipse {
+  eclipse-sdk-422 = buildEclipse {
     name = "eclipse-sdk-4.2.2";
     description = "Eclipse Classic";
     sources = {
@@ -220,8 +230,9 @@ rec {
         };
     };
   };
+  eclipse_sdk_422 = eclipse-sdk-422; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_431 = buildEclipse {
+  eclipse-sdk-431 = buildEclipse {
     name = "eclipse-sdk-4.3.1";
     description = "Eclipse Classic";
     sources = {
@@ -235,8 +246,9 @@ rec {
         };
     };
   };
+  eclipse_sdk_431 = eclipse-sdk-431; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_44 = buildEclipse {
+  eclipse-sdk-44 = buildEclipse {
     name = "eclipse-sdk-4.4";
     description = "Eclipse Classic";
     sources = {
@@ -250,8 +262,9 @@ rec {
         };
     };
   };
+  eclipse_sdk_44 = eclipse-sdk-44; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_442 = buildEclipse {
+  eclipse-sdk-442 = buildEclipse {
     name = "eclipse-sdk-4.4.2";
     description = "Eclipse Classic";
     sources = {
@@ -265,8 +278,9 @@ rec {
         };
     };
   };
+  eclipse_sdk_442 = eclipse-sdk-442; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_45 = buildEclipse {
+  eclipse-sdk-45 = buildEclipse {
     name = "eclipse-sdk-4.5";
     description = "Eclipse Mars Classic";
     sources = {
@@ -280,8 +294,9 @@ rec {
         };
     };
   };
+  eclipse_sdk_45 = eclipse-sdk-45; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_451 = buildEclipse {
+  eclipse-sdk-451 = buildEclipse {
     name = "eclipse-sdk-4.5.1";
     description = "Eclipse Mars Classic";
     sources = {
@@ -295,6 +310,7 @@ rec {
         };
     };
   };
+  eclipse_sdk_451 = eclipse-sdk-451; # backward compatibility, added 2016-01-30
 
   eclipse-platform = eclipse-platform-451;
 
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index c8da869f0f32e..40aa6b8385ec3 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -171,12 +171,12 @@ rec {
 
   checkstyle = buildEclipseUpdateSite rec {
     name = "checkstyle-${version}";
-    version = "6.11.1.201510102004";
+    version = "6.14.0.201601142217";
 
     src = fetchzip {
       stripRoot = false;
-      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.11.1/net.sf.eclipsecs-updatesite_${version}-bin.zip";
-      sha256 = "0l9nfx7a3qdx1pvjgc6ck4rxh7yrvqsskr190yrxxwmpnyj9cjs4";
+      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.14.0/net.sf.eclipsecs-updatesite_${version}-bin.zip";
+      sha256 = "0ysxir1fv0mb9xnidc9hv6llnk48lkav0sryjbx7pw7vy1f8nd4c";
     };
 
     meta = with stdenv.lib; {
@@ -318,12 +318,12 @@ rec {
 
   gnuarmeclipse = buildEclipseUpdateSite rec {
     name = "gnuarmeclipse-${version}";
-    version = "2.8.1-201504061754";
+    version = "2.11.1-201512141335";
 
     src = fetchzip {
       stripRoot = false;
-      url = "mirror://sourceforge/project/gnuarmeclipse/Current%20Releases/2.x/ilg.gnuarmeclipse.repository-${version}.zip";
-      sha256 = "08jsnyis1ry62cidr9sl11ylyxbkwh834nlhx6qp31gh1l439px9";
+      url = "https://github.com/gnuarmeclipse/plug-ins/releases/download/v${version}/ilg.gnuarmeclipse.repository-${version}.zip";
+      sha256 = "1ijvnahfw2wc860la7kj8b52z2sfm8k1yk62bl0d4lq60y3aycg9";
     };
 
     meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
index 9a0f6855567cb..ef006439a555a 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Precision colors for machines and people";
     homepage = http://ethanschoonover.com/solarized;
-    maintainer = "Samuel Rivas <samuelrivas@gmail.com>";
+    maintainers = "Samuel Rivas <samuelrivas@gmail.com>";
     license = stdenv.lib.licenses.mit;
 
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 409e05748fa34..a9737e744ed6c 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -28,10 +28,10 @@
     ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }:
     elpaBuild {
         pname = "ada-mode";
-        version = "5.1.8";
+        version = "5.1.9";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ada-mode-5.1.8.tar";
-          sha256 = "015lmliwk4qa2sbs9spxik6dnwsf1a34py6anklf92qnmzhjicy6";
+          url = "http://elpa.gnu.org/packages/ada-mode-5.1.9.tar";
+          sha256 = "04hwy9py22c4vpbk24idbyavjdjpm1akvnfigdzx35zljdrvk3l7";
         };
         packageRequires = [ cl-lib emacs wisi ];
         meta = {
@@ -148,10 +148,10 @@
       }) {};
     auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "auctex";
-        version = "11.89";
+        version = "11.89.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/auctex-11.89.tar";
-          sha256 = "0ggk2q17wq4y9yw5b9mykk153ihphazjdj1fl4lv0zblgnrxz5l5";
+          url = "http://elpa.gnu.org/packages/auctex-11.89.1.tar";
+          sha256 = "0nqp12l5x2h0hxl8p3l6aiz4mvdf79zz84z1wl3q2prliac3xz17";
         };
         packageRequires = [];
         meta = {
@@ -188,10 +188,10 @@
     avy = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "avy";
-        version = "0.3.0";
+        version = "0.4.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/avy-0.3.0.tar";
-          sha256 = "1ycfqabx949s7dgp9vhyb9phpxw83gjw4cc7914gr84bqlkj0458";
+          url = "http://elpa.gnu.org/packages/avy-0.4.0.tar";
+          sha256 = "1vbp37ndv5930x120n0isxxxfs8d5wqlrbnxvp6h3ahbbv0zdcsn";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -417,10 +417,10 @@
       }) {};
     debbugs = callPackage ({ async, elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "debbugs";
-        version = "0.8";
+        version = "0.9";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/debbugs-0.8.tar";
-          sha256 = "1wp5wa2a0rwvpfdzd2b78k6vd26qbyqwl4p2c2s5l7zkqy258in5";
+          url = "http://elpa.gnu.org/packages/debbugs-0.9.tar";
+          sha256 = "1wc6kw7hihqqdx8qyl01akygycnan44x400hwrcf54m3hb4isa0k";
         };
         packageRequires = [ async ];
         meta = {
@@ -445,10 +445,10 @@
     diff-hl = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "diff-hl";
-        version = "1.8.2";
+        version = "1.8.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/diff-hl-1.8.2.tar";
-          sha256 = "1y0v5fiizkmhzafiscrcqjzxpwjcag5rx79lq3iplh58vxlmb65w";
+          url = "http://elpa.gnu.org/packages/diff-hl-1.8.3.tar";
+          sha256 = "1i3ngx5gmjl1a15y6d0xmcgdimn7ghrqkbzqisz4ra3dgwbbb3f9";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -684,6 +684,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "gnome-c-style";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/gnome-c-style-0.1.tar";
+          sha256 = "09w68jbpzyyhcaqw335qpr840j7xx0j81zxxkxq4ahqv6ck27v4x";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/gnome-c-style.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "gnorb";
@@ -923,6 +936,20 @@
           license = lib.licenses.free;
         };
       }) {};
+    loccur = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "loccur";
+        version = "1.2.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/loccur-1.2.2.el";
+          sha256 = "0ij5wzxysaikiccw7mjbw1sfylvih0n6b6yyp55vn8w1z2dba0xk";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/loccur.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     markchars = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "markchars";
         version = "0.2.0";
@@ -1017,10 +1044,10 @@
       }) {};
     multishell = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "multishell";
-        version = "1.0.4";
+        version = "1.1.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/multishell-1.0.4.el";
-          sha256 = "11nx9h1c039h7md7pr1xlc3kla8n0vq6pa54i25wakf5n30019f4";
+          url = "http://elpa.gnu.org/packages/multishell-1.1.2.tar";
+          sha256 = "1y0b6ri0kgxj0jw1cyb796lsy3ipzb7syvmj7pqpx9myzpvd3hz3";
         };
         packageRequires = [];
         meta = {
@@ -1175,10 +1202,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20160118";
+        version = "20160201";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/org-20160118.tar";
-          sha256 = "107jzpykg5fgd4wzppn2ayvrg2l6z7mnlq8v7r52x15400k9xnxr";
+          url = "http://elpa.gnu.org/packages/org-20160201.tar";
+          sha256 = "1lyvfpksl88c9d7k2w4k3iswgjah51k9f8fdi3jbfwivd814m9nb";
         };
         packageRequires = [];
         meta = {
@@ -1332,6 +1359,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "rnc-mode";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/rnc-mode-0.1.el";
+          sha256 = "18hm9g05ld8i1apr28dmd9ccq6dc0w6rdqhi0k7ka95jxxdr9m6d";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/rnc-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     rudel = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "rudel";
         version = "0.3";
@@ -1663,10 +1703,10 @@
       }) {};
     wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "wcheck-mode";
-        version = "2016.1.5";
+        version = "2016.1.30";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/wcheck-mode-2016.1.5.el";
-          sha256 = "0axd32sw1papxz4yscjg85a2li8a8m8z5fn2jzb3620700j86jb3";
+          url = "http://elpa.gnu.org/packages/wcheck-mode-2016.1.30.el";
+          sha256 = "0hzrxnslfl04h083njy7wp4hhgrqpyz0cnm73v348kr1i4wx9xjq";
         };
         packageRequires = [];
         meta = {
@@ -1729,10 +1769,10 @@
     wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "wisi";
-        version = "1.1.1";
+        version = "1.1.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/wisi-1.1.1.tar";
-          sha256 = "14bpir7kng8b4m1yna4iahhp2z0saagc2i8z53apd39msbplay3r";
+          url = "http://elpa.gnu.org/packages/wisi-1.1.2.tar";
+          sha256 = "04gryfpgbviviwbnvv3sh280pzasr59cp5xz1s0yf0n4d3rv2df3";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1806,14 +1846,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    ztree = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
         pname = "ztree";
-        version = "1.0.2";
+        version = "1.0.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ztree-1.0.2.tar";
-          sha256 = "0rm9b7cw5md9zbgbq89kh8wb5jdjrqy9g43psdws19z6j532g665";
+          url = "http://elpa.gnu.org/packages/ztree-1.0.3.tar";
+          sha256 = "1mwzk48sah4w5jmlmzqxnwhnlnc2mf25ayhgymv24sv8c6hdllsw";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://elpa.gnu.org/packages/ztree.html";
           license = lib.licenses.free;
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index e146b9cb41061..b8128ddfe8a63 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -10,7 +10,7 @@
           sha256 = "1xigpz2aswlmpcsc1f7gfakyw7041pbyl9zfd8nz38iq036n5b96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/0blayout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/0blayout";
           sha256 = "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92";
           name = "_0blayout";
         };
@@ -30,7 +30,7 @@
           sha256 = "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/2048-game";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/2048-game";
           sha256 = "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0";
           name = "_2048-game";
         };
@@ -51,7 +51,7 @@
           sha256 = "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/4clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/4clojure";
           sha256 = "1w9zxy6jwiln28cmdgkbbdfk3pdscqlfahrqi6lbgpjvkw9z44mb";
           name = "_4clojure";
         };
@@ -72,7 +72,7 @@
           sha256 = "1h4gwp2gyd4jhbkb8ai1zbzhhmlhmihbwzr0wsxg5yq074n72ifs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/abc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/abc-mode";
           sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
           name = "abc-mode";
         };
@@ -85,15 +85,15 @@
     abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "abl-mode";
-        version = "20151125.335";
+        version = "20160129.431";
         src = fetchFromGitHub {
           owner = "afroisalreadyinu";
           repo = "abl-mode";
-          rev = "5a2a65cc5eb1dc2ee80c8b64a7ea352a444abfdb";
-          sha256 = "081rz6q46wdpnlzd3ddcw425434vz54q7xw29z2nnaxsqckmim8f";
+          rev = "e17fb93cf85423ca202b61ae226492da70a27f6c";
+          sha256 = "09hy7rj27h7xbvasd87146di4vhpg5cmqc9f39fy0ihmv9gy56za";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/abl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/abl-mode";
           sha256 = "0h25lc87pa8irgxflnmnmkr9dcv4kz841nfc45fcz4awrn75kkzb";
           name = "abl-mode";
         };
@@ -106,15 +106,15 @@
     abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "abyss-theme";
-        version = "20151007.608";
+        version = "20160130.425";
         src = fetchFromGitHub {
           owner = "mgrbyte";
           repo = "emacs-abyss-theme";
-          rev = "7971da041f5fb608e32cdac9259b53c87013c04f";
-          sha256 = "12cgjc01k3ivy02381py2g87n2wzwnv153favw2raw4gwl2sfwhs";
+          rev = "953bab8dd567c9a49a74f7c9d6ac52504405d517";
+          sha256 = "1zifkqkxb0wzddfcapm71g3k52fn36ink779imyncg72plg216g0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/abyss-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/abyss-theme";
           sha256 = "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c";
           name = "abyss-theme";
         };
@@ -135,7 +135,7 @@
           sha256 = "19msfx3f3px1maj41bzh139s6sv2pjk9vm3bphn7758fqhzyin0f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-alchemist";
           sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
           name = "ac-alchemist";
         };
@@ -156,7 +156,7 @@
           sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-anaconda";
           sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
           name = "ac-anaconda";
         };
@@ -177,7 +177,7 @@
           sha256 = "1z6rj15p5gjv0jwnnck8789n9csf1pwxfvsz37graihgfy2khj0y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-c-headers";
           sha256 = "1cq5rz2w79bj185va7y13x7bciihrpsvyxwk6msmcxb4g86s9phv";
           name = "ac-c-headers";
         };
@@ -198,7 +198,7 @@
           sha256 = "1llpnb9vy612sg214i76rxnzcl3qx8pqnixczc5pik9kd3fdaz5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cake";
           sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl";
           name = "ac-cake";
         };
@@ -219,7 +219,7 @@
           sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cake2";
           sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy";
           name = "ac-cake2";
         };
@@ -240,7 +240,7 @@
           sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-capf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-capf";
           sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
           name = "ac-capf";
         };
@@ -261,7 +261,7 @@
           sha256 = "1k4zk27zvxmcffwwg0zx19rcy2ysd65nnrifwspdw699glpwx2l5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cider";
           sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
           name = "ac-cider";
         };
@@ -282,7 +282,7 @@
           sha256 = "0n9zagwh3rz7b76irj4ya8wskffns9v1c1pivsdqgpd76spvl7n5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-clang";
           sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
           name = "ac-clang";
         };
@@ -300,7 +300,7 @@
           sha256 = "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-dabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-dabbrev";
           sha256 = "03lndw7y55bzz4rckl80j0kh66qa82xxxhfakzs1dh1h9f1f0azh";
           name = "ac-dabbrev";
         };
@@ -321,7 +321,7 @@
           sha256 = "1dydjkilvyzxl7wwy3afmn1cjf8jv0385im4nhn8c3xr8iiil7yv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-dcd";
           sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
           name = "ac-dcd";
         };
@@ -342,7 +342,7 @@
           sha256 = "1lkhqmfkjga7qi4r1m7mjax3pyf9m6minsn57cbzm2z2kvkhq22g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-emmet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-emmet";
           sha256 = "09ycjllfpdgqaf5iis5bkkhal1vxvl3qkxrn2759p67s97c49f3x";
           name = "ac-emmet";
         };
@@ -363,7 +363,7 @@
           sha256 = "19981mzxnqqdb8dsdizy2i8byb8sx9138x3nrvi6ap2qbcsabjmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-emoji";
           sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
           name = "ac-emoji";
         };
@@ -384,7 +384,7 @@
           sha256 = "140i02b2ipyfmki945l1xd1nsqdpganhmi3bmwj1h9w8cg078bd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-etags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-etags";
           sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
           name = "ac-etags";
         };
@@ -405,7 +405,7 @@
           sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-geiser";
           sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
           name = "ac-geiser";
         };
@@ -426,7 +426,7 @@
           sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-haskell-process";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-haskell-process";
           sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
           name = "ac-haskell-process";
         };
@@ -447,7 +447,7 @@
           sha256 = "1ycchpiiavxw8n08gra0bsp9pxp6ln8cgjrkz9jjq7i6ixi8f9d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-helm";
           sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
           name = "ac-helm";
         };
@@ -468,7 +468,7 @@
           sha256 = "1sip87j4wvlf9pfnpr0zyyhys1dd9smh6hy3zs08ihbdh98krgs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html";
           sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
           name = "ac-html";
         };
@@ -489,7 +489,7 @@
           sha256 = "1v3ia439h4n2i204n0sazzbwwm0l5k6j31gq58iv2rqrq2ysikny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-angular";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-angular";
           sha256 = "05rbxf5kbr4jlskrhvfvhf82qvb55zl5cb6z1ymfh9l3h9j9xk3s";
           name = "ac-html-angular";
         };
@@ -510,7 +510,7 @@
           sha256 = "0v33p6lnsq1nwyxfbgs6vg6fidfyqwxd5wls2yza95yxzl30m9r7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-bootstrap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-bootstrap";
           sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
           name = "ac-html-bootstrap";
         };
@@ -531,7 +531,7 @@
           sha256 = "0swbw62zh5rjjf73pvmp8brrrmk6bp061k793z4z83v7ic0cicrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-csswatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-csswatcher";
           sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
           name = "ac-html-csswatcher";
         };
@@ -552,7 +552,7 @@
           sha256 = "0xdqk0qr1mmm5q3049ldwlmrcfgz6rzk4yxc8qgz6kll27kciia0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-inf-ruby";
           sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
           name = "ac-inf-ruby";
         };
@@ -573,7 +573,7 @@
           sha256 = "1cq73bdv3lkn8v3nx6aznygqaac9s5i7pvirl8wz9ib31hsgwpbk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-ispell";
           sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
           name = "ac-ispell";
         };
@@ -594,7 +594,7 @@
           sha256 = "0yn9333rjs2pzb1wk1japclsqagdcl28j0yjl3q5b70g5gi5vx7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-js2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-js2";
           sha256 = "0gcr0xdi89nj3854v2z3nndfgazmcdzmd6wdndl0i4s7pdfl96fa";
           name = "ac-js2";
         };
@@ -615,7 +615,7 @@
           sha256 = "0p5cdaw9v8jgnmjqpb95bxy4khwbdgg19wzg8jkr2j2p55dpfbd6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-math";
           sha256 = "1gx35m0wv60cfgm87y2c7vrpwdsqjzk9bz4pp9dbs8dhxvji0ay4";
           name = "ac-math";
         };
@@ -636,7 +636,7 @@
           sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-mozc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-mozc";
           sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
           name = "ac-mozc";
         };
@@ -657,7 +657,7 @@
           sha256 = "16bg2zg08223x7q54rmfjziaccgm64h9vc8z59sjljkw1bgx9m7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-octave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-octave";
           sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
           name = "ac-octave";
         };
@@ -670,15 +670,15 @@
     ac-php = callPackage ({ auto-complete, company, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "20160117.48";
+        version = "20160203.2053";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "3147e2f10a3959c0f54fcc71f87a0a2ef64043d0";
-          sha256 = "11v45azd544fs4v5ndxxc2d6rbqh9r6mqx8gk1487jw7j290j6v8";
+          rev = "bf5e3b82ac81b420613edc9e67a35bd4650605f2";
+          sha256 = "013j8iv62jiq3pbammh3ia6dcf9dm28w938nkh7hljh1c26hg4hp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-php";
           sha256 = "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk";
           name = "ac-php";
         };
@@ -710,7 +710,7 @@
           sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
           name = "ac-racer";
         };
@@ -731,7 +731,7 @@
           sha256 = "1nvz0jfz4x99xc5ywspl8fdpyqns5zd0j7i4bwzlwplmy3qakjwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-skk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-skk";
           sha256 = "0iycyfgv8v15ygngvyx66m3w3sv8p9h6q6j1hbpzwd8azl8fzj5z";
           name = "ac-skk";
         };
@@ -752,7 +752,7 @@
           sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-slime";
           sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
           name = "ac-slime";
         };
@@ -773,7 +773,7 @@
           sha256 = "0mif35chyj4ai1bj4gq8qi38dyfsp72yi1xchhzy9zi2plpvqa7a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-sly";
           sha256 = "1ng81b5f8w2s9mm9s7h5kwyx8fdwndnlsbzx50slmqyaz2ad15mx";
           name = "ac-sly";
         };
@@ -794,7 +794,7 @@
           sha256 = "1msj0dbzfan0jax5wh5rmv4l7cp5zhrp5wy5k1n9s7xdgz2dprzj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-flyspell";
           sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
           name = "ace-flyspell";
         };
@@ -815,7 +815,7 @@
           sha256 = "02i3gxk7kfv3a0pcc82z69hgvjw8bvn40y8h7d59chg8bixcwbyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
           name = "ace-isearch";
         };
@@ -836,7 +836,7 @@
           sha256 = "11c9jfrh9mzi0qwbvgcjia6s1gkwb76ssiraka3f4k7rc8dli11y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-buffer";
           sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
           name = "ace-jump-buffer";
         };
@@ -857,7 +857,7 @@
           sha256 = "0yfhny921krpl9j8x7xflj8jzbrj8fkabc8373b8q5hyz20d332k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-helm-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-helm-line";
           sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
           name = "ace-jump-helm-line";
         };
@@ -878,7 +878,7 @@
           sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-mode";
           sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
           name = "ace-jump-mode";
         };
@@ -899,7 +899,7 @@
           sha256 = "0z0rblr41r94l4b2gh9fcw50nk82ifxrr3ilxqzbb8wmvil54gh4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-zap";
           sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
           name = "ace-jump-zap";
         };
@@ -920,7 +920,7 @@
           sha256 = "1vs5rwd3gwpydr2fyszjxdkvpzl0vrr48g8f0180fz5b3phh1h1i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-link";
           sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
           name = "ace-link";
         };
@@ -933,15 +933,15 @@
     ace-pinyin = callPackage ({ ace-jump-mode, avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-pinyin";
-        version = "20151126.1517";
+        version = "20160131.1556";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "ace-pinyin";
-          rev = "d7c8fed8ab6f6fbbbcb95bcd74516c30d05dcdfa";
-          sha256 = "00pcdf2nz27f7zbpyrgqr9nh8pd4nhxvsz885b6mq263s0qyykzx";
+          rev = "1e4d4be64fb3db294b498b8eec531e8fb1101b7f";
+          sha256 = "1zx94dysd817i4xgapzm6fb8fcqb90sqym212b57qlqimyi3f59m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-pinyin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-pinyin";
           sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
           name = "ace-pinyin";
         };
@@ -951,22 +951,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-popup-menu = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-popup-menu";
-        version = "20150910.727";
+        version = "20160126.631";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ace-popup-menu";
-          rev = "92cac2f656b5000d2f267ffaa92a275f40a2719d";
-          sha256 = "0ffkdq94slfy8w73bznc7bcy4amylhsh2nk2vvdwwqmxmviirlnq";
+          rev = "3e771b470b0c633d7633dceec054fc05beac81f0";
+          sha256 = "1qiiivkwa95bhyym8ly7fnwwglc9dcifkyr314bsq8m4rp1mgry4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-popup-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-popup-menu";
           sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
           name = "ace-popup-menu";
         };
-        packageRequires = [ avy cl-lib emacs ];
+        packageRequires = [ avy-menu emacs ];
         meta = {
           homepage = "http://melpa.org/#/ace-popup-menu";
           license = lib.licenses.free;
@@ -983,7 +983,7 @@
           sha256 = "053074jyinr3a2zkr1jfgmizdbhk5s37vrvf490x2hwf19dzis4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-window";
           sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
           name = "ace-window";
         };
@@ -1003,7 +1003,7 @@
           sha256 = "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/achievements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/achievements";
           sha256 = "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr";
           name = "achievements";
         };
@@ -1024,7 +1024,7 @@
           sha256 = "02ba4d8qkvgy52g0zcbyfvsnhr9685gq569nkwa2as30xdcq3khm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ack-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ack-menu";
           sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
           name = "ack-menu";
         };
@@ -1045,7 +1045,7 @@
           sha256 = "1rxx2j7kkzjdsk06zgisiydg8dc18vqll4wl6q9mfhrg2y12lq94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/actionscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/actionscript-mode";
           sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
           name = "actionscript-mode";
         };
@@ -1066,7 +1066,7 @@
           sha256 = "1ag8zs8bkazblvgxm0q4lnpvdlnzswx1jb4jjbrs2bmq7qmmwvns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/addressbook-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/addressbook-bookmark";
           sha256 = "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r";
           name = "addressbook-bookmark";
         };
@@ -1087,7 +1087,7 @@
           sha256 = "01fn73vyhdcy84s60r2jjy9a0xm3zwagpzi6b4qlankbvswypask";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/adoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/adoc-mode";
           sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
           name = "adoc-mode";
         };
@@ -1100,15 +1100,15 @@
     aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aes";
-        version = "20151211.1603";
+        version = "20160121.1437";
         src = fetchFromGitHub {
           owner = "Sauermann";
           repo = "emacs-aes";
-          rev = "61d0da553ad980e5b9079444aed8214a28b409d9";
-          sha256 = "0jlqk3kn2920b0dfmwy511x83hkmclb646qws3im0p75qcnyr4s1";
+          rev = "1b9918036b16ee30ada71703a9283c67f2ad9999";
+          sha256 = "1p90yv2xl1hhpjm0mmhdjyf1jagf79610hkzhw8nycy2p1y4gvl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aes";
           sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
           name = "aes";
         };
@@ -1129,7 +1129,7 @@
           sha256 = "19d5d6qs5nwmpf26rsb86ranb5p4236qp7p2b4i88cimcmzspylb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/afternoon-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/afternoon-theme";
           sha256 = "13xgdw8px58sxpl7nyhkcdxwqdpp13i8wghvlb3l4471plw3vqgj";
           name = "afternoon-theme";
         };
@@ -1142,15 +1142,15 @@
     ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ag";
-        version = "20151226.1805";
+        version = "20160126.1335";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ag.el";
-          rev = "4894b38feffc4c044f8cbaabf3033f49084dba2c";
-          sha256 = "03157dyw4in7hazw2glc9dz9509097s76x8g79w9cr9cyjwax42p";
+          rev = "b4b0e39b7fb706fc3208e238c2a7e517ebdb999c";
+          sha256 = "1ra5nrc4nvp41rcdc4nkjs9lk7131zd54v63c6lyi3zkg3dyl7im";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ag";
           sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
           name = "ag";
         };
@@ -1171,7 +1171,7 @@
           sha256 = "18zlxgwcvqhlw9y7zn6fywmy04f7rs71fd5ihcx28j4rx9ay929c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aggressive-fill-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aggressive-fill-paragraph";
           sha256 = "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja";
           name = "aggressive-fill-paragraph";
         };
@@ -1192,7 +1192,7 @@
           sha256 = "1mymlsm469nl4jaxkjgn26ij37mdf4rjv7kswjwf626bxq9s3136";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aggressive-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aggressive-indent";
           sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
           name = "aggressive-indent";
         };
@@ -1211,7 +1211,7 @@
           sha256 = "0fnn52b2prai8dlsj4759mbcgbbbvhr2lbqs3f0k5d2q8vvqrch1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ahg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ahg";
           sha256 = "0kw138lfzwp54fmly3jzzml11y7fhcjp3w0irmwdzr68lc206lr4";
           name = "ahg";
         };
@@ -1232,7 +1232,7 @@
           sha256 = "122as0ssc6xzmxb5hlvhx6dlx6gq2f70xisz0z8pxgm3bpf9h6mx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ahk-mode";
           sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
           name = "ahk-mode";
         };
@@ -1253,7 +1253,7 @@
           sha256 = "0dlk53zij907413fl6wh02i8nwzrbbrm22nn3i9h5sc8x9dhzazg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ahungry-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ahungry-theme";
           sha256 = "0fhim0qscpqx9siprp3ax1azxzmqkzvrjx517d9bnd68z7xxbpqy";
           name = "ahungry-theme";
         };
@@ -1266,15 +1266,15 @@
     airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "airline-themes";
-        version = "20160112.1415";
+        version = "20160203.1710";
         src = fetchFromGitHub {
           owner = "AnthonyDiGirolamo";
           repo = "airline-themes";
-          rev = "0bf80e3f5a6acee18455c8d3f3fe7072d13add70";
-          sha256 = "1wgqnafvb9h09lcqkj1kasps1ikngcfwfvlny1ipia0k2l2qivz9";
+          rev = "3c5f127daf1cf8a74e3c9956e11e56eedf5f3e76";
+          sha256 = "0blrpqn8wy9pwzikgzb0v6x4hk7axv93j4byfci62fh1905zfkkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/airline-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/airline-themes";
           sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
           name = "airline-themes";
         };
@@ -1295,7 +1295,7 @@
           sha256 = "1lxpfswp1bjrz192px79f155dycf2kazpr7dfrcr1gyshlgxkpf7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/airplay";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/airplay";
           sha256 = "095nibgs197iplphk6csvkgsrgh1fcfyy33py860v6qmihvk538f";
           name = "airplay";
         };
@@ -1308,15 +1308,15 @@
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "alchemist";
-        version = "20160112.140";
+        version = "20160125.107";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "5d579873da06a1a0fccde1decaf9f7d7e1d09d76";
-          sha256 = "1g5wdcmr6qpscnjk7fzzna4jplcyfl49fq20l7nmr6bq5phsilz6";
+          rev = "f7d442107910b16a7e5727c4435463be1307b6a4";
+          sha256 = "0z87n537g2l99s9sgqdaagappfr3fm9p7yyh0946cnh80m8c71la";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alchemist";
           sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
           name = "alchemist";
         };
@@ -1337,7 +1337,7 @@
           sha256 = "0hvf7ydd2p3dfk5hqjqcbaajhgihkyvlwvqcr97a8jknznk7hfzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alect-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alect-themes";
           sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
           name = "alect-themes";
         };
@@ -1358,7 +1358,7 @@
           sha256 = "0z7yfjg14bzndpm9ski1a1mdixvrykg7d08cd86dc82bghb3px2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alert";
           sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
           name = "alert";
         };
@@ -1379,7 +1379,7 @@
           sha256 = "0l2rgs0rd4nmv4v7m10zhf2znzfvdifv1vlhpa3zbppg0fj8zph1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/align-cljlet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/align-cljlet";
           sha256 = "0pnhhv33rvlmb3823xpy9v5h6q99fa7fn38djbwry4rymi4jmlih";
           name = "align-cljlet";
         };
@@ -1397,7 +1397,7 @@
           sha256 = "10j70bwa28xpmqwigvls76jg6vz0iky88lmkq4pk35bg3rz09r4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/all-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/all-ext";
           sha256 = "1zi266cm5hpfhnnnzbsm4s1w0lsy4sj5z8d020y0cg57yn2v62dv";
           name = "all-ext";
         };
@@ -1410,15 +1410,15 @@
     amd-mode = callPackage ({ dash, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s }:
     melpaBuild {
         pname = "amd-mode";
-        version = "20151214.318";
+        version = "20160202.953";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "amd-mode.el";
-          rev = "17eefc009e26769fa0e81936bcbea9d9ea42954f";
-          sha256 = "12vjjdyxmm6ky8d7xbsg0pmfam12vzghzzr3j6klji01i8lxmh74";
+          rev = "e552bdd3a0d24e9c471fd21c4a2ae17cb20c7594";
+          sha256 = "1b7w8zrcliibwxlrrzmi2r684f59jzd892c556svh3qad048mriv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/amd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/amd-mode";
           sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
           name = "amd-mode";
         };
@@ -1439,7 +1439,7 @@
           sha256 = "18cicz11i19cpabrq6khnl9ks1khn6gw5a4ckaq4y65r40x0cr6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ample-regexps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ample-regexps";
           sha256 = "00y07pd438v7ldkn5f1w84cpxa1mvcnzjkj6sf5l5pm97xqiz7j2";
           name = "ample-regexps";
         };
@@ -1460,7 +1460,7 @@
           sha256 = "0x72czw5rmz89w5fa27z54bz8qirrr882g0r37pb8li04j1hk7kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ample-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ample-theme";
           sha256 = "055c6jy2q761za4cl1vlqdskcd3mc1j58k8b4418q7h2lv2zc0ry";
           name = "ample-theme";
         };
@@ -1481,7 +1481,7 @@
           sha256 = "18z9jl5d19a132k6g1dvwqfbbdh5cx66b2qxlcjsfiqxlxglc2sa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ample-zen-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ample-zen-theme";
           sha256 = "0xygk80mh05qssrbfj4h6k50pg557dyj6kzc2pdlmnr5r4gnzdn3";
           name = "ample-zen-theme";
         };
@@ -1502,7 +1502,7 @@
           sha256 = "01a9l785chmcf6d7fsyc72gapapb4gddgqmpps705zpkhjm8f6wj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anaconda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anaconda-mode";
           sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
           name = "anaconda-mode";
         };
@@ -1523,7 +1523,7 @@
           sha256 = "1ym43y0wqifkzpkm7ayf8cq2wz8pc2wgg9zvdyi0cn9lr9mwpbav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anaphora";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anaphora";
           sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
           name = "anaphora";
         };
@@ -1542,7 +1542,7 @@
           sha256 = "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anchored-transpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anchored-transpose";
           sha256 = "19dgj1605qxc2znvzj0cj6x29zyrh00qnzk2rlwpn9hvzypg9v7w";
           name = "anchored-transpose";
         };
@@ -1563,7 +1563,7 @@
           sha256 = "1ms338qq17nwivpq8c1xsnld5k532rfhgvfxx1zg3l8wrjh235d2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/android-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/android-mode";
           sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
           name = "android-mode";
         };
@@ -1584,7 +1584,7 @@
           sha256 = "1m0c7ns7aiycg86cgglir8bkw730fslyg1n15m9ki0da4cnmm97a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angry-police-captain";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angry-police-captain";
           sha256 = "1cshhd4bkgbkg0n6m8gz53z47z4nq0hcriz2qh3v7m4cqgkw1m9r";
           name = "angry-police-captain";
         };
@@ -1605,7 +1605,7 @@
           sha256 = "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angular-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angular-mode";
           sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
           name = "angular-mode";
         };
@@ -1626,7 +1626,7 @@
           sha256 = "0hdm1a323mzxjfdply8ri3addk146f21d8cmpd18r7dw3j3cdfrn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angular-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angular-snippets";
           sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
           name = "angular-snippets";
         };
@@ -1647,7 +1647,7 @@
           sha256 = "08gs96r9mbdg0s5l504yp6i5nmi9qr4nwxq3xprsbx9bdzv5l2dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/annotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/annotate";
           sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
           name = "annotate";
         };
@@ -1668,7 +1668,7 @@
           sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/annoying-arrows-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/annoying-arrows-mode";
           sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
           name = "annoying-arrows-mode";
         };
@@ -1689,7 +1689,7 @@
           sha256 = "19k71dj83kvc8mks6zhl45vsrsb61via53dqxjv9bny1ybh2av85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansi";
           sha256 = "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1";
           name = "ansi";
         };
@@ -1710,7 +1710,7 @@
           sha256 = "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansible";
           sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
           name = "ansible";
         };
@@ -1731,7 +1731,7 @@
           sha256 = "1h3rqrjrl8wx7xvvd631jkbbczq3srd4mgz7y9wh3cvz1njdpy62";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansible-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansible-doc";
           sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
           name = "ansible-doc";
         };
@@ -1752,7 +1752,7 @@
           sha256 = "1g4ah0iwqrvvzcxr0ss6il5kign73gzcz1dbc22wdgprlfa4hah7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ant";
           sha256 = "03rxn2dh0xj89kl24jd19q7kmrn1hnr2cdl3519bpng298kxwni6";
           name = "ant";
         };
@@ -1765,15 +1765,15 @@
     anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anti-zenburn-theme";
-        version = "20160113.1944";
+        version = "20160119.1705";
         src = fetchFromGitHub {
           owner = "m00natic";
           repo = "anti-zenburn-theme";
-          rev = "dd495097cc06e27c30694c2eb4f1f406349b812b";
-          sha256 = "1qx4m12m0drdd553ma0hg6s5hw9njy9v94xav09lx578c7bdfmf8";
+          rev = "72906fbf1f47035ad97e39c0dea1a6b46b091a64";
+          sha256 = "0h3zl56n27r331xrbx4sa6vhqbhrhkji1idqlmba0z16dlzfp1pw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anti-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anti-zenburn-theme";
           sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
           name = "anti-zenburn-theme";
         };
@@ -1794,7 +1794,7 @@
           sha256 = "0fzxzar8m9qznfxv3wr7vfj9y2110wf6mm5cj55k3sd5djdjhmf1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anx-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anx-api";
           sha256 = "1vzg3wsqyfb9rsfxrpz8k2gazjlz2nwnf4gnn1dypsjspjnzcb8r";
           name = "anx-api";
         };
@@ -1815,7 +1815,7 @@
           sha256 = "0qy5q4rq68nb21k7w3xpil8k8k5awcpjrjlxjwnhcklwb83w3dhf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anybar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anybar";
           sha256 = "0prnr8wjhishpf2zmn4b7054vfahk10w05nzsg2p6whaxywcachm";
           name = "anybar";
         };
@@ -1836,7 +1836,7 @@
           sha256 = "05lq0bllgn44zs85mgnfdcyjasm6j8m70jdcxksf798i0qdqnk7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anyins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anyins";
           sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
           name = "anyins";
         };
@@ -1856,7 +1856,7 @@
           sha256 = "e90ded84609e59a4cef22bfd9d9a543ec6b677b78ab44fb4eb6cbae9eb248669";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything";
           sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj";
           name = "anything";
         };
@@ -1877,7 +1877,7 @@
           sha256 = "0dbf510gcd0m191samih0r4lx6d7sgk0ls0sx2jrdkyacy82ridy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-exuberant-ctags";
           sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk";
           name = "anything-exuberant-ctags";
         };
@@ -1898,7 +1898,7 @@
           sha256 = "0gj0p7420wx5c186kdccjb9icn656sg5b0zwnwy3fjvhsbbvrb2r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-git-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-git-files";
           sha256 = "13giasg8lh5968plva449ki9nc3478a63700f8c0yghnwjb77asw";
           name = "anything-git-files";
         };
@@ -1919,7 +1919,7 @@
           sha256 = "06fyvk7cjz1aag6fj52qraqmr23b0fqwml41yyid8gjxl4ygmkpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-git-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-git-grep";
           sha256 = "1kw88fvxil9l80w8zn16az7avqplyf2m0l7kp431wb5b1b1508jl";
           name = "anything-git-grep";
         };
@@ -1940,7 +1940,7 @@
           sha256 = "1jw6gqwcl3fx1m7w0a15w2pnzzlqyr1fbg0m81ay358s4w3jn6v7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-milkode";
           sha256 = "1apc865a01jyx602ldzj32rrjk6xmgnxdccpjpcfgh24h2aqpdan";
           name = "anything-milkode";
         };
@@ -1961,7 +1961,7 @@
           sha256 = "16a7i01q8qqkgph1s3jnwdr2arjq3cm3jpv5bk5sqs29c003q0pp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-project";
           sha256 = "10crwm34igb4kjh97alni15xzhsb2s0d4ghva86f2gpjidka9fhr";
           name = "anything-project";
         };
@@ -1982,7 +1982,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-prosjekt";
           sha256 = "15kgn0wrnbh666kchijdlssf2gp7spgbymr2nwgv6k730cb4mfa8";
           name = "anything-prosjekt";
         };
@@ -2003,7 +2003,7 @@
           sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-replace-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-replace-string";
           sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71";
           name = "anything-replace-string";
         };
@@ -2024,7 +2024,7 @@
           sha256 = "08xr6fkk1r4r5jqh349d4dfal9nbs2a8y2fp8zn3zlrj2cd0g80k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-sage";
           sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3";
           name = "anything-sage";
         };
@@ -2037,15 +2037,15 @@
     anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anzu";
-        version = "20160116.38";
+        version = "20160130.2055";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-anzu";
-          rev = "ff54963946b12b3fe94b0deed4c6e695ef9be4dd";
-          sha256 = "0qyycm8bp2yw0h6dr9jkfjxpkl7if8gy6c64km54hc9agg1pbfgp";
+          rev = "dde4d83cfa4887db7deaf74232c9e051afb33050";
+          sha256 = "1dxaf68przg0hh0p1zhxsq2dysp3ln178yxhbqalxw67bjy8ikny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anzu";
           sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
           name = "anzu";
         };
@@ -2063,7 +2063,7 @@
           sha256 = "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aok";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aok";
           sha256 = "1nkkbfwqp5r44wjwl902gm0xc8p3d2qj5mk1cchilr2rib52zd46";
           name = "aok";
         };
@@ -2084,7 +2084,7 @@
           sha256 = "0528z3axjmplg2fdbv4jxgy1p39vr4rnsm4a3ps2fanf8bwsyx3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aozora-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aozora-view";
           sha256 = "0pd2574a6dkhrfr0jf5gvv34ganp6ddylyb6cfpg2d4znwbc2r2w";
           name = "aozora-view";
         };
@@ -2102,7 +2102,7 @@
           sha256 = "1jndhcjvj6s1clmyyphl5ss5267c7b5a58fz8gbp1ffk1d9ylfik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apache-mode";
           sha256 = "1a1pj3bk0gplfx217yd6qdn7qrhfbkx2bhkk33k0gq5sia6rzs44";
           name = "apache-mode";
         };
@@ -2123,7 +2123,7 @@
           sha256 = "0sdxnf4b8rqs1cbjxh23wvxmj7ll3zddv8yfdgif6zmgyy8xhc9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apel";
           sha256 = "0zhlm8lfri3zkhj62cycvdhkkgrn72lqb0dalh8qgr049bdv816y";
           name = "apel";
         };
@@ -2144,7 +2144,7 @@
           sha256 = "0br0jl6xnajdx37s5cvs13srn9lldg58y9587a11s3s651xjdq0z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apples-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apples-mode";
           sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
           name = "apples-mode";
         };
@@ -2164,7 +2164,7 @@
           sha256 = "0n3y0314ajqhn5hzih09gl72110ifw4vzcgdxm8n6npjbx7irbml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/applescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/applescript-mode";
           sha256 = "1ya0dh7gz7qfflhn6dq43rapb2zg7djvxwn7p4jajyjnwbxmk611";
           name = "applescript-mode";
         };
@@ -2185,7 +2185,7 @@
           sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aproject";
           sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
           name = "aproject";
         };
@@ -2204,7 +2204,7 @@
           sha256 = "0wc9zg30a48cj2ssfj9wc7ga0ip9igcxcdbn1wr0qmndzxxa7x5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apropos-fn+var";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apropos-fn+var";
           sha256 = "1s5gnsipsj7dhc8ca806grg32i6vlwm78hcxhrbs830vx9k84g5x";
           name = "apropos-fn-plus-var";
         };
@@ -2217,15 +2217,15 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20151224.956";
+        version = "20160124.118";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "fdd70f890c2fd25882de011c1327ddab143937ce";
-          sha256 = "1jw6am5c8szrrlff1qfh0hpyi5p5nqnhs8kywl5s4bpj1gxgq8dh";
+          rev = "c35c9799556194298e67dd0f03a7dcfa72040a54";
+          sha256 = "0gipjdjg6ds04wlg6kf6qjanl24jfzzhkjw8ngjqwla98vly7qcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apropospriate-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apropospriate-theme";
           sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9";
           name = "apropospriate-theme";
         };
@@ -2243,7 +2243,7 @@
           sha256 = "1xbvky0mspmbi8ghqhqhgbjn70acipwf0qwn6s5zdarwch10nljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apu";
           sha256 = "0399rmjwcs7fykj10s9m0lm2wb1cr2bzw2bkgm5rp4n3va0rzaa2";
           name = "apu";
         };
@@ -2261,7 +2261,7 @@
           sha256 = "1mhj6x0n2ya3xd7gykmkcf70ji5g8qd8xawz764ykdlcribpsq52";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/archive-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/archive-region";
           sha256 = "03x2fqhx4w0c7xd8x8zlnyzdwyay6r2yxf4jzgkcg87q7rqjk9nd";
           name = "archive-region";
         };
@@ -2282,7 +2282,7 @@
           sha256 = "1yvaqjc9hadbnnay5fprnh890xsp53kidad1zpb4a5z4a5z61n3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/arduino-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/arduino-mode";
           sha256 = "1lpsjpc7par12zsmg9sf4r1h039kxa4n68anjr3mhpp3d6rapjcx";
           name = "arduino-mode";
         };
@@ -2302,7 +2302,7 @@
           sha256 = "2713755e56b03e28a5a6e10c85865c1ace0247e71caeb8b89ec65d5618addafc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aria2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aria2";
           sha256 = "10x2k99m3kl6y0k0mw590gq1ac162nmdwk58i8i7a4mb72zmsmhc";
           name = "aria2";
         };
@@ -2323,7 +2323,7 @@
           sha256 = "0vh9wfc3657sd12ybjcrxpg6f757x2ghkcl1lw01szmyy5vmj27h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ariadne";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ariadne";
           sha256 = "0lfhving19wcfr40gjb2gnginiz8cncixiyyxhwx08lm84qb3a7p";
           name = "ariadne";
         };
@@ -2344,7 +2344,7 @@
           sha256 = "1i6y3kv2vii6f8gpd845vv6h832hqx0vxb3fmb1x80kwx3gda682";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/arjen-grey-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/arjen-grey-theme";
           sha256 = "18q66f7hhys2ab9ljsdp9013mp7d6v6d1lrb0d1bb035r1b4pfj7";
           name = "arjen-grey-theme";
         };
@@ -2365,7 +2365,7 @@
           sha256 = "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/artbollocks-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/artbollocks-mode";
           sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
           name = "artbollocks-mode";
         };
@@ -2383,7 +2383,7 @@
           sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ascii";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ascii";
           sha256 = "0jb63f7qwhfbz0n4yrvnvx03cjqly3mqsc3rq9mgf4svy2zw702r";
           name = "ascii";
         };
@@ -2404,7 +2404,7 @@
           sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/asilea";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/asilea";
           sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
           name = "asilea";
         };
@@ -2425,7 +2425,7 @@
           sha256 = "0h18x9nh152dnyqjv5b1zjksl8wb75s8zmx3v8vvmwqyy6ql8gcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/asn1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/asn1-mode";
           sha256 = "0iswisb08dqz7jc5ra4wcdhbmglildgyrb547dm5362xmvm9ifmy";
           name = "asn1-mode";
         };
@@ -2446,7 +2446,7 @@
           sha256 = "074wdciq62jfc41f829590p4y52dnkn3nxicj9lcabgxwz7cahjp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/async";
           sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
           name = "async";
         };
@@ -2467,7 +2467,7 @@
           sha256 = "0rnnvr8x1czphbinby2z2dga7ikwgd13d7zhgmp3ggamzyaz6nf1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/@";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/@";
           sha256 = "0w91qx955z67w2yh8kf86b58bb3b6s6490mmbky8467knf2q83qz";
           name = "at";
         };
@@ -2488,7 +2488,7 @@
           sha256 = "0jfpzv8dmvl4nr6kvq5aii830s5h632bq2q3jbnfc4zdql7id464";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/atom-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/atom-dark-theme";
           sha256 = "1ci61blm7wc83wm2iyax017ai4jljyag5j1mvw86rimmmjzr0v8f";
           name = "atom-dark-theme";
         };
@@ -2509,7 +2509,7 @@
           sha256 = "027j027w2nbplg1gi28hg9iyiirigydj5n4npf7y9a6g626snxz0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/atom-one-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/atom-one-dark-theme";
           sha256 = "0wwnkhq7vyysqiqcxc1jsn98155ri4mf4w03k7inl1f8ffpwahvw";
           name = "atom-one-dark-theme";
         };
@@ -2530,7 +2530,7 @@
           sha256 = "1h0044zfzklc9sy0a02vcdr75ly6wlhjx3n5bvq7yiicqd012316";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auctex-latexmk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auctex-latexmk";
           sha256 = "1rdlgkiwlgm06i1gjxcfciz6wgdskfhln8qhixyfxk7pnz0ax327";
           name = "auctex-latexmk";
         };
@@ -2551,7 +2551,7 @@
           sha256 = "0lgfgvnaln5rhhwgcrzwrhbj0gz8sgaf6xxdl7njf3sa6bfgngsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auctex-lua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auctex-lua";
           sha256 = "0v999jvinljkvhbn205p36a6jfzppn0xvflvzr8mid1hnqlrpjhf";
           name = "auctex-lua";
         };
@@ -2572,7 +2572,7 @@
           sha256 = "0q79kblcbz5vlzj0f49vpc1902767ydmvkmwwjs60x3w2f3aq3cm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/audio-notes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/audio-notes-mode";
           sha256 = "0q88xmi7jbrx47nvbbmwggbm6i7agzpnv5y7cpdh73lg165xsz2h";
           name = "audio-notes-mode";
         };
@@ -2593,7 +2593,7 @@
           sha256 = "0z0wq79ks8251fflk2iwrhd885h5qbki2m19f0jy4a8c00ydmxyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurel";
           sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
           name = "aurel";
         };
@@ -2614,7 +2614,7 @@
           sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurora-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurora-config-mode";
           sha256 = "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm";
           name = "aurora-config-mode";
         };
@@ -2635,7 +2635,7 @@
           sha256 = "1z2n6gd63mgj2wj45n6g1gmfrk0iwzlrzb6g1rdd9r9a03c03qi6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurora-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurora-theme";
           sha256 = "1fhlng30v25ycr502vfvajl70vimscqkipva6ghr670j35ac5vz5";
           name = "aurora-theme";
         };
@@ -2656,7 +2656,7 @@
           sha256 = "0gi65n1np63zi2ylc4y1licwvk97jl92s1v98fv5y61kppi1d8sq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auth-password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auth-password-store";
           sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
           name = "auth-password-store";
         };
@@ -2675,7 +2675,7 @@
           sha256 = "1c8nm4sz9a67q8w0b1jahg5ldy185zws7nilj9yv3miklg07zq17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-async-byte-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-async-byte-compile";
           sha256 = "108jhrdx67chbdd4h824072i2wrn90zdh2hw5vqd4a5svhhf28jj";
           name = "auto-async-byte-compile";
         };
@@ -2696,7 +2696,7 @@
           sha256 = "1whbvqylwnxg8d8gn55kcky39rgyc49rakyxlbkplh813lk6lxb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-auto-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-auto-indent";
           sha256 = "08s73pnyrmklb660jl5rshncpq31z3m9fl55v7453ch8syp7gzh7";
           name = "auto-auto-indent";
         };
@@ -2714,7 +2714,7 @@
           sha256 = "1lk9zwng7wkjvb8hprlgyrab1s56n8a61xjva931h0bgypwl1dfi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-capitalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-capitalize";
           sha256 = "18fygc71n9bc0vrpymz2f7sw9hzkpqxzfglh53shmbm1zns3wkw0";
           name = "auto-capitalize";
         };
@@ -2735,7 +2735,7 @@
           sha256 = "07vnk8az4lcxncqn01jvks38b4hpdmg43nbby2b39zy50agqnwsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-compile";
           sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
           name = "auto-compile";
         };
@@ -2756,7 +2756,7 @@
           sha256 = "07ib2pd3apm97v7kalavpc6fyk00cjky8kfwahn37zmw2j2fdhpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete";
           sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
           name = "auto-complete";
         };
@@ -2777,7 +2777,7 @@
           sha256 = "1wri8q5llpy1q1h4ac4kjnnkgj6fby8i9vrpr6mrb13d4gnk4gr2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-auctex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-auctex";
           sha256 = "00npvryds5wd3d5a13r9prlvw6vvjlag8d32x5xf9bfmmvs0fgqh";
           name = "auto-complete-auctex";
         };
@@ -2798,7 +2798,7 @@
           sha256 = "12mzi6bwg702sp0f0wd1ag555blbpk252rr9rqs03bn8pkw89h4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-c-headers";
           sha256 = "02pkrxvzrpyjrr2fkxnl1qw06aspzv8jlp2c1piln6zcjd92l3j7";
           name = "auto-complete-c-headers";
         };
@@ -2819,7 +2819,7 @@
           sha256 = "1zhbpxpl443ghpkl9i68jcjfcw1vnf8ky06pf5qjjmqbxlcyd9li";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-chunk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-chunk";
           sha256 = "1937j1xm20vfcqm9ig4nvciqfkz7rpw0nsfhlg69gkmv0nqszdr3";
           name = "auto-complete-chunk";
         };
@@ -2840,7 +2840,7 @@
           sha256 = "12y6f47xbjl4gy14j2f5wlisy5vl6rhx74n27w61pjv38m0a7mi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-clang";
           sha256 = "1rnmphl7ml5ryjl5ka2l58hddir8b34iz1rm905wdwh164piljva";
           name = "auto-complete-clang";
         };
@@ -2861,7 +2861,7 @@
           sha256 = "1sw0wxrjcjqk0w1llfj376g6axa5bnk2lq2vv66746bkz14h0s8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-clang-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-clang-async";
           sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
           name = "auto-complete-clang-async";
         };
@@ -2882,7 +2882,7 @@
           sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-exuberant-ctags";
           sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
           name = "auto-complete-exuberant-ctags";
         };
@@ -2903,7 +2903,7 @@
           sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-nxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-nxml";
           sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
           name = "auto-complete-nxml";
         };
@@ -2924,7 +2924,7 @@
           sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-pcmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-pcmp";
           sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
           name = "auto-complete-pcmp";
         };
@@ -2945,7 +2945,7 @@
           sha256 = "107svb82cgfns9kcrmy3hh56cab81782jkbz5i9959ms81xizfb8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-rst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-rst";
           sha256 = "0dazkpnzzr0imb2a01qq8l60jxhhlknzjx7wccnbm7d2rk3338m6";
           name = "auto-complete-rst";
         };
@@ -2966,7 +2966,7 @@
           sha256 = "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-sage";
           sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
           name = "auto-complete-sage";
         };
@@ -2987,7 +2987,7 @@
           sha256 = "0rfjx0x2an28821shgb4v5djza4kwn5nnrsl2cvh3px4wrvw3izp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-dictionary";
           sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
           name = "auto-dictionary";
         };
@@ -3000,15 +3000,15 @@
     auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auto-dim-other-buffers";
-        version = "20140619.1102";
+        version = "20160128.1146";
         src = fetchFromGitHub {
           owner = "mina86";
           repo = "auto-dim-other-buffers.el";
-          rev = "8b909cb210a9e4482bcc43858cf8d15da4ecd1d2";
-          sha256 = "1j3ygbask2vsrh6ia6y86348lg6vl68gsraryxn25mr0c2b41811";
+          rev = "e9c886fac5cf482029e3e8998e2f1ef881e9db09";
+          sha256 = "0lqfnv8wqnbb5ddwmh9svphc3bgmwdpwx40qw9sgqdzpj3xh7v8g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-dim-other-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-dim-other-buffers";
           sha256 = "0n9d23sfcmkjfqlm80vrgf856wy08ak4n4rk0z7vadq07yj46zxh";
           name = "auto-dim-other-buffers";
         };
@@ -3029,7 +3029,7 @@
           sha256 = "0jfiax1qqnyznhlnqkjsr9nnv7fpjywvfhj9jq59460j0nbrgs5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-highlight-symbol";
           sha256 = "02mkji4sxym07jf5ww5kgv1c18x0xdfn8cmvgns5h4gij64lnr66";
           name = "auto-highlight-symbol";
         };
@@ -3050,7 +3050,7 @@
           sha256 = "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-indent-mode";
           sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
           name = "auto-indent-mode";
         };
@@ -3068,7 +3068,7 @@
           sha256 = "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-install";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-install";
           sha256 = "1gaxc2ya4r903k0jf3319wg7wg5kzq7k8rfy8ac9b0wfzv247ixk";
           name = "auto-install";
         };
@@ -3089,7 +3089,7 @@
           sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-package-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-package-update";
           sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
           name = "auto-package-update";
         };
@@ -3110,7 +3110,7 @@
           sha256 = "10aw3bpvawkqj1l8brvzq057wx3mkzpxs4zc3yhppkhq2cpvx7i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-save-buffers-enhanced";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-save-buffers-enhanced";
           sha256 = "123vf6nnvdhrrfjn8n8h8a11mkqmy2zm3w3yn99np0zj31x8z7bb";
           name = "auto-save-buffers-enhanced";
         };
@@ -3131,7 +3131,7 @@
           sha256 = "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-shell-command";
           sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
           name = "auto-shell-command";
         };
@@ -3152,7 +3152,7 @@
           sha256 = "14qr8c4i4644vwqvlh5d3xhw1dzmqz3v74hqlp7g8991yaka72va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-yasnippet";
           sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
           name = "auto-yasnippet";
         };
@@ -3173,7 +3173,7 @@
           sha256 = "01q3k8i8vrs7pcr507kh48np0bc6smanh0ald1hv9h4dylkq89k7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autobookmarks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autobookmarks";
           sha256 = "11zhg3y9fb5mq67fwsnjrql9mnwkp3hwib7fpllb3yyf2yywc8zp";
           name = "autobookmarks";
         };
@@ -3194,7 +3194,7 @@
           sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autodisass-java-bytecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autodisass-java-bytecode";
           sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
           name = "autodisass-java-bytecode";
         };
@@ -3215,7 +3215,7 @@
           sha256 = "1fq4h5fmamyh7z8nq6pigx74p5v8k3qfm64k66vwsm8bl5jdkw17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autodisass-llvm-bitcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autodisass-llvm-bitcode";
           sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
           name = "autodisass-llvm-bitcode";
         };
@@ -3234,7 +3234,7 @@
           sha256 = "1af45z1w69dkdk4mzjphwn420m9rrkc3djv5kpp6lzbxxnmswbqw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autofit-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autofit-frame";
           sha256 = "0p24qqnfa1vfn5pgnpvbxwi11zjkd6f3cv5igwg6h0pr5s7spnvw";
           name = "autofit-frame";
         };
@@ -3255,7 +3255,7 @@
           sha256 = "02nnyncfh6g0xizy7wa8721ahpnwk451kngd6n0y0249f50p3962";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/automargin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/automargin";
           sha256 = "0llqz01wmacc0f8j3h7r0j57vkmzksl9vj1h0igfxzpm347mm9q8";
           name = "automargin";
         };
@@ -3276,7 +3276,7 @@
           sha256 = "1z3hd2jkibwz2ijvyh066ki5g30pdqgh2vj2r35prpp12bqabw4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autopair";
           sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
           name = "autopair";
         };
@@ -3297,7 +3297,7 @@
           sha256 = "109il2s5ynfam510yli4xmi5zgw7xhr5gv096li24idqdp0gpf9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autotest";
           sha256 = "0f46m5pc40i531dzfnhkcn192dcs1q20y083c1c0wg2zhjcdr5iy";
           name = "autotest";
         };
@@ -3318,7 +3318,7 @@
           sha256 = "162zay36mmkkpbfvp0lagv2js4cr1z75dc1z5l2505814m5sx3az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autotetris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autotetris-mode";
           sha256 = "0k4yq4pvrs1zaf9aqxmlb6l2v4k774zbxj4zcx49w3l1h8gwxpbb";
           name = "autotetris-mode";
         };
@@ -3339,7 +3339,7 @@
           sha256 = "1lip7282g41ghn64dvx2ab437s83cj9l8ps1rd8rbhqyz4bx5wb9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autumn-light-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autumn-light-theme";
           sha256 = "0g3wqv1yw3jycq30mcj3w4sn9nj6i6gyd2ljzimf547ggcai536a";
           name = "autumn-light-theme";
         };
@@ -3352,15 +3352,15 @@
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
-        version = "20160106.923";
+        version = "20160203.157";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "15d0679385fdf3f1d20904ff68ebcb522c4a87d4";
-          sha256 = "171mjcv0hc7gybjsdfqayxid2dbxmd03zsp16i8fhq624277m9m8";
+          rev = "730581ae8720c255dd000ca6f0d44e1845de3f45";
+          sha256 = "0awxmd2lf5rzkw9zdlsxm614asqrl324x2qv9lgakc1f663q72sl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy";
           sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
           name = "avy";
         };
@@ -3370,6 +3370,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "avy-menu";
+        version = "20160126.625";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "avy-menu";
+          rev = "ccc835abbb02b6846d9b01423190c6ea3b9bcba0";
+          sha256 = "1a6h44a6id4ash8kp0a59f34658p7czcl2d3i1880k8hckhy445j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-menu";
+          sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw";
+          name = "avy-menu";
+        };
+        packageRequires = [ avy emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/avy-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
@@ -3381,7 +3402,7 @@
           sha256 = "0d8s16f8y9kypl083hgz5rbv47fkb3hvimgw57czf6hlcaaldy75";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-migemo";
           sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
           name = "avy-migemo";
         };
@@ -3402,7 +3423,7 @@
           sha256 = "0s7lhls6gs055kw0893nkb9myv7m2q2p251lq9wh2r3bmia9d6pg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-zap";
           sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
           name = "avy-zap";
         };
@@ -3420,7 +3441,7 @@
           sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/awk-it";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/awk-it";
           sha256 = "1rnrm9jf9wvfrwyylhj0bfrz9140945lc87lrh21caf7q88fpvkw";
           name = "awk-it";
         };
@@ -3433,14 +3454,14 @@
     axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "axiom-environment";
-        version = "20151126.1509";
+        version = "20160123.1226";
         src = fetchhg {
           url = "https://bitbucket.com/pdo/axiom-environment";
-          rev = "d7ea57a27527";
-          sha256 = "1vk7jjbf8wp183c4nagkgxvzcyrdlr53avzsxl111rm5rsxbvdli";
+          rev = "f7b3a13f54ea";
+          sha256 = "1qq0b92mf73fnx2viwzlsxr6672wkskf0vjimymyhv9aq3gw165w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/axiom-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/axiom-environment";
           sha256 = "1d3h1fn5zfbh7kpm2i02kza3bq9s6if4yd2vvfjdhgrykvl86h66";
           name = "axiom-environment";
         };
@@ -3461,7 +3482,7 @@
           sha256 = "140lbpqq4qz45ykycdn8nvcn8pv0xqfwpapgprvyg8z5fjkyc4sg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/babel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/babel";
           sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
           name = "babel";
         };
@@ -3482,7 +3503,7 @@
           sha256 = "1wfssdv6ag36ww6v7al2x04mbpaajlx92wfm8rbq8rp8887724s5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/babel-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/babel-repl";
           sha256 = "0h11i8w8s4ia1x0lm5n7bnc3db4bv0a7f7hzl27qrg38m3c7dl6x";
           name = "babel-repl";
         };
@@ -3503,7 +3524,7 @@
           sha256 = "0rj6a8rdwa0h2ckz7h4d91hnxqcin98l4ikbfyak2whfb47z909l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/back-button";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/back-button";
           sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
           name = "back-button";
         };
@@ -3528,7 +3549,7 @@
           sha256 = "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/backup-each-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/backup-each-save";
           sha256 = "1fv9sf6vkjyv93vil4l9hjm2fg73zlxbnif0xfm3kpmva9xin337";
           name = "backup-each-save";
         };
@@ -3549,7 +3570,7 @@
           sha256 = "0z4d8x9lkad50720lgvr8f85p1ligv07865i30lgr9ck0q04w68v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/backup-walker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/backup-walker";
           sha256 = "0hfr27yiiblrd0p3zhpapbj4vijfdk7wqh406xnlwf2yvnfsqycd";
           name = "backup-walker";
         };
@@ -3570,7 +3591,7 @@
           sha256 = "0g8smx6pi2wqv78mhxfgwg51mx5msqsgcc55xcz29aq0q3naw4z1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/badger-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/badger-theme";
           sha256 = "01h5bsqllgn6gs0wpl0y2h041007mn3ldjswkz6f3mayrgl4c6yf";
           name = "badger-theme";
         };
@@ -3583,15 +3604,15 @@
     badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "badwolf-theme";
-        version = "20160108.1629";
+        version = "20160120.1138";
         src = fetchFromGitHub {
           owner = "bkruczyk";
           repo = "badwolf-emacs";
-          rev = "a0b4e1bd6014800eacd2c90bdaa9478d955642f7";
-          sha256 = "0bwai3b5g3ksxg8i9fdby5zkca56qpsc7fyj2hl6arcfwnc68nhc";
+          rev = "c75fad427851c65c2a7f11aeb95401acb951038e";
+          sha256 = "1jknanz09li3shlkdc6afg9qajz79bkinp5va3mymrmilj82wp1v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/badwolf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/badwolf-theme";
           sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
           name = "badwolf-theme";
         };
@@ -3612,7 +3633,7 @@
           sha256 = "00skx1aywzvnqqsm41n2mwry5i6ifib8kzq5klymbrc7qfnbb55f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/baidu-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/baidu-life";
           sha256 = "0rib50hja33qk8dmw5i62gaxhx7mscj2y0n25jmnds7k88ms8z19";
           name = "baidu-life";
         };
@@ -3633,7 +3654,7 @@
           sha256 = "16240dj0hvxkljas9973wjdgkbx213sqws77j167yr5xf761dlsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/base16-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/base16-theme";
           sha256 = "1zxbvfj6gvz1ynhj6i9q9y65hq7aq41qx4vnx738cjizcq0rc8bs";
           name = "base16-theme";
         };
@@ -3654,7 +3675,7 @@
           sha256 = "06c42531dy5ngscwfvg8rksg6jcsakfn7104hmlg1jp4kvfiy1kg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bash-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bash-completion";
           sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
           name = "bash-completion";
         };
@@ -3675,7 +3696,7 @@
           sha256 = "1pbnw6ccphxynbhnc4g687jfcg33p1sa7a0mfxc2ai0i3z59gn78";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/basic-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/basic-theme";
           sha256 = "16rgff1d0s65alh328lr93zc06zmgbzgwx1rf3k3l4d10ki4cc27";
           name = "basic-theme";
         };
@@ -3693,7 +3714,7 @@
           sha256 = "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/batch-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/batch-mode";
           sha256 = "1p0rh5r8w00jag64sbjy8xb9g6lqhm2fz476v201kbrj9ggp643x";
           name = "batch-mode";
         };
@@ -3714,7 +3735,7 @@
           sha256 = "1fy9qnwsxvb8qnyk13bnjjbnlhdads5qf1byg5agg6lq5np3w5jf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bats-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bats-mode";
           sha256 = "1l5winy30w8fs3f5cylc3a3j3mfkvchwanlgsin7q76jivn87h7w";
           name = "bats-mode";
         };
@@ -3735,7 +3756,7 @@
           sha256 = "17ip24fk13aj9zldn2qsr4naa8anqhm484m1an5l5i9m9awfiyn7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbcode-mode";
           sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
           name = "bbcode-mode";
         };
@@ -3754,7 +3775,7 @@
           sha256 = "e20dfe8085782948c1411685d45bad0cb7ff088bc2d1d2c1654c276356382b26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb";
           sha256 = "0zhs4psa9b9yf9hxm19q5znsny11cdp23pya3rrlmj39j4jfn73j";
           name = "bbdb";
         };
@@ -3775,7 +3796,7 @@
           sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-";
           sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
           name = "bbdb-";
         };
@@ -3796,7 +3817,7 @@
           sha256 = "0m80k87dahzdpfa4snbl4p9zm5d5anc8s91535mwzsnfbr98qmhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-android";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-android";
           sha256 = "0v3njygqkcrwjkf7jrqmza6bwk2jp3956cx1qvf9ph7dfxsq7rn3";
           name = "bbdb-android";
         };
@@ -3817,7 +3838,7 @@
           sha256 = "07plwm5nh58qya03l8z0iaqh8bmyhywx7qiffkf803n8wwjb3kdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-china";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-china";
           sha256 = "111lf256zxlnylfmwis0pngbpj73p59s520v8abbm7pn82k2m72b";
           name = "bbdb-china";
         };
@@ -3838,7 +3859,7 @@
           sha256 = "1h9vi9wb3dzzjrw5zfypk60afzzshxa3qmnbc24ypby5dr7qy91l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-csv-import";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-csv-import";
           sha256 = "0r7pc2ypd1ydqrnvcqmsg69rm047by7k0zhm563538ra82597wnm";
           name = "bbdb-csv-import";
         };
@@ -3859,7 +3880,7 @@
           sha256 = "1ydf89mmp3zjfqdymnrwg18wclyf7psarz9f2k82pl58h0khh71g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-ext";
           sha256 = "0fnxcvzdyh0602rdfz3lz3vmvza4s0syz1vn2fgsn2lg3afqq7li";
           name = "bbdb-ext";
         };
@@ -3880,7 +3901,7 @@
           sha256 = "04yxky7qxh0s4y4addry85qd1074l97frhp0hw77xd1bc7n5zzg0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-handy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-handy";
           sha256 = "0qv1lw4fv9w9c1ypzpbnvkm6ypqrzqpwyw5gpi7n9almxpd8d68z";
           name = "bbdb-handy";
         };
@@ -3901,7 +3922,7 @@
           sha256 = "1zlf9xhpirln72xr7v6kgndkg5wyz5ipsl4gpq9lbmp92jlgbwlj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-vcard";
           sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
           name = "bbdb-vcard";
         };
@@ -3922,7 +3943,7 @@
           sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb2erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb2erc";
           sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
           name = "bbdb2erc";
         };
@@ -3943,7 +3964,7 @@
           sha256 = "1cdm4d6fjf3m495phynq0dzvv0wc0gfsw6fdq4d47iyxs0p4q2dl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbyac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbyac";
           sha256 = "19s9fqcdyqz22m981vr0p8jwghbs267yrlxsv9xkfzd7fccnx170";
           name = "bbyac";
         };
@@ -3964,7 +3985,7 @@
           sha256 = "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bdo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bdo";
           sha256 = "0vp8am2x11abxganw90025w9qxnqjdkj015592glbbzpa6338nfl";
           name = "bdo";
         };
@@ -3977,15 +3998,15 @@
     beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "beacon";
-        version = "20160116.1019";
+        version = "20160125.547";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "beacon";
-          rev = "d4a9dad594473c511f975017d792efc8a8339671";
-          sha256 = "12nhpn79ahqm1pg2wxmv7y0d22yxb67apm1rlk0zm92nz0y2jip6";
+          rev = "7104ad532419689513d8f72dc61badd4e0272558";
+          sha256 = "016c8lmcwlivxr1snh9dk57ssl0vj8v4nazddxchqxc2bibd3csl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beacon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beacon";
           sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq";
           name = "beacon";
         };
@@ -4006,7 +4027,7 @@
           sha256 = "1ckbl8z59p81jsq8xsgcwqqrpzv1apzjr594w3dyp9bzqb7h2acm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beeminder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beeminder";
           sha256 = "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx";
           name = "beeminder";
         };
@@ -4027,7 +4048,7 @@
           sha256 = "1hyiz7iwnzbg1616q0w7fndllbnx4m98kakgxn04bsqib5fqk78p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beginend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beginend";
           sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
           name = "beginend";
         };
@@ -4048,7 +4069,7 @@
           sha256 = "058mic9jkwiqvmp3k9sfd6gb70ysdphnb1iynlszhixbrz5w7zs2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/benchmark-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/benchmark-init";
           sha256 = "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal";
           name = "benchmark-init";
         };
@@ -4069,7 +4090,7 @@
           sha256 = "06izbc0ksyhgh4gsjiifhj11v0gx9x5xjx9aqci5mc4kc6mg05sf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bert";
           sha256 = "1zhz1dcy1nf84p244x6lc4ajancv5fgmqmbrm080yhb2ral1z8x7";
           name = "bert";
         };
@@ -4082,15 +4103,15 @@
     better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "better-defaults";
-        version = "20150404.423";
+        version = "20160128.118";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "better-defaults";
-          rev = "b7888289ed702aff1616cbff832c97d4e5fc2463";
-          sha256 = "0j3wpw43q262wnq5214r20r15sy2hihbiak5j7ag23lq9jx2jvva";
+          rev = "90df5752a0a0602feb47aadfd3542aa7fc841bd8";
+          sha256 = "1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/better-defaults";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/better-defaults";
           sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
           name = "better-defaults";
         };
@@ -4108,7 +4129,7 @@
           sha256 = "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/better-registers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/better-registers";
           sha256 = "01i0qjrwsc5way2h9z3pmsgccsbdifsq1dh6zhka4h6qfgrmn3bx";
           name = "better-registers";
         };
@@ -4129,7 +4150,7 @@
           sha256 = "02b2m0cq04ynjcmr4j8gpdzjv9mpf1fysn736xv724xgaymj396n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bf-mode";
           sha256 = "0b1yf9bx1ldkzry7v5qvcnl059rq62a50dvpa10i2f5v0y96n1q9";
           name = "bf-mode";
         };
@@ -4150,7 +4171,7 @@
           sha256 = "1y9fxs1nbf0xsn8mw45m9ghmji3h64wdbfnyr1npmf5fb27rmd17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bfbuilder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bfbuilder";
           sha256 = "16ckybqd0a8l75ascm3k4cdzp969lzq7m050aymdyjhwif6ld2r7";
           name = "bfbuilder";
         };
@@ -4171,7 +4192,7 @@
           sha256 = "0rwy4k06nd9a31hpyqs0fxp45dpddbvbhwcw1gzx4f73qmgawq9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bibretrieve";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bibretrieve";
           sha256 = "1mf884c6adx7rq5c2z5wrnjpb6znljy30mscxskwqiyfs8c62mii";
           name = "bibretrieve";
         };
@@ -4192,7 +4213,7 @@
           sha256 = "077shjz9sd0k0akvxzzgjd8a626ck650xxlhp2ws4gs7rjd7a823";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bibslurp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bibslurp";
           sha256 = "178nhng87bdi8s0r2bdh2gk31w9mmjkyi6ncnddk3v7p8fsh4jjp";
           name = "bibslurp";
         };
@@ -4213,7 +4234,7 @@
           sha256 = "1qf45s53vcbd90v2d2brynv3xmp8sy9w9jp611cf0dzfl1k7x8p8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bibtex-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bibtex-utils";
           sha256 = "13llsyyvy0xc9s51cqqc1rz13m3qdqh8jw07gwywfbixlma59z8l";
           name = "bibtex-utils";
         };
@@ -4234,7 +4255,7 @@
           sha256 = "05lhxbrgwbyz0nkb19yln9a46jh91ic685943hd58cn91lxsw3al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bind-chord";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bind-chord";
           sha256 = "01a3c298kq8cfsxsscpic0shkjm77adiamgbgk8laqkbrlsrrcsb";
           name = "bind-chord";
         };
@@ -4251,11 +4272,11 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "2a50241538b8ead3d620be33bd8e0087f98f42c5";
-          sha256 = "0wiv5xh2hik76x0i4a6amq5648akm5kvr4llnkh190riibnwkwx6";
+          rev = "a29e0328c0076cc927e5fd3d8db1878c0f978ace";
+          sha256 = "0s4qmqgym12gk8kiz90ck5yi7icz8dydyks0psfam1nza89cbfys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bind-key";
           sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
           name = "bind-key";
         };
@@ -4268,15 +4289,15 @@
     bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-map";
-        version = "20160117.2028";
+        version = "20160201.656";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-bind-map";
-          rev = "cc1db8958c8fe913f562a59bd7a1a58dac33444b";
-          sha256 = "0ch7dpd96skbhnfm8an3gpqk2bccyrvl6plinfgrhp37jpkrsa5a";
+          rev = "00b7778826f683e56ccfa3044b6312a1fcfdeb13";
+          sha256 = "1kk2hig6ag07iihkhr880n332789r5p2zz26a25dwqkr27jgs7x8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bind-map";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bind-map";
           sha256 = "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358";
           name = "bind-map";
         };
@@ -4297,7 +4318,7 @@
           sha256 = "0pmpg54faq0l886f2cmnmwm28d2yfg8adk7gp7623gx0ifggn332";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bing-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bing-dict";
           sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
           name = "bing-dict";
         };
@@ -4318,7 +4339,7 @@
           sha256 = "1n5icy29ks5rxrxp7v4sf0523z7wxn0fh9lx4y6jb7ppdjnff12s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/birds-of-paradise-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/birds-of-paradise-plus-theme";
           sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
           name = "birds-of-paradise-plus-theme";
         };
@@ -4339,7 +4360,7 @@
           sha256 = "0iccafawm9ah62f7qq1k77kjpafhcpjcaiqh5xjig1wxnpc43ck7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bison-mode";
           sha256 = "097gimlzmyrsfnl76cbzyyi9dm0d2y3f9107672h56ncri35mh66";
           name = "bison-mode";
         };
@@ -4360,7 +4381,7 @@
           sha256 = "14dsjbw4ss3i6ydynm121v5j3idvy85sk1vqbr5r871d32179xan";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bitbake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bitbake";
           sha256 = "1k2n1i8g0jc78sp1icm64rlhi1q0vqar2a889nldp134a1l7bfah";
           name = "bitbake";
         };
@@ -4381,7 +4402,7 @@
           sha256 = "1cnx5kr0hah4h4b6arp7hb2i556vpx1dwmziny2csil39hkcjgbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bitlbee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bitlbee";
           sha256 = "15xb0vjamnfwi25yqd37zwfm6xb6p71if88hk2ymxikza4i47x0f";
           name = "bitlbee";
         };
@@ -4402,7 +4423,7 @@
           sha256 = "09blh9cbcbqr3pdaiwm9fmh5kzqm1v9mffy623z3jn87g5wadrmb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bitly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bitly";
           sha256 = "032s7ax8qp3qzcj1njbyyxiyadjirphswqdlr45zj6hzajfsr247";
           name = "bitly";
         };
@@ -4420,7 +4441,7 @@
           sha256 = "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/blank-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/blank-mode";
           sha256 = "1pyx5xwflnni9my5aqpgf8xz4q4rvmj67pwb4zxx1lghrca97z87";
           name = "blank-mode";
         };
@@ -4441,7 +4462,7 @@
           sha256 = "1pslwyaq18d1z7fay2ih3n27i6b49ss62drqqb095l1jxk42xxm0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/blgrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/blgrep";
           sha256 = "0w7453vh9c73hdfgr06693kwvhznn9xr1hqa65izlsx2fjhqc9gm";
           name = "blgrep";
         };
@@ -4462,7 +4483,7 @@
           sha256 = "0dn0i3nxrqd82b9d17p1v0ddlpxnlfclkc8sqzrwq6cf19wcrmdr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bliss-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bliss-theme";
           sha256 = "1kzvi6zymfgirr41l8r2kazfz1y4xkigbp5qa1fafcdmw81anmdh";
           name = "bliss-theme";
         };
@@ -4472,6 +4493,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    blog-admin = callPackage ({ ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, org, s }:
+    melpaBuild {
+        pname = "blog-admin";
+        version = "20160202.803";
+        src = fetchFromGitHub {
+          owner = "codefalling";
+          repo = "blog-admin";
+          rev = "0935b0c5e7ed6c7a26a7ff16cd38a168a8fb93a3";
+          sha256 = "0zhcjg68nzqdrlnbm7akzgn4px3prrqjjym2qzfirmdbq6dxifgg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/blog-admin";
+          sha256 = "0l2si3fyi7kz4px3m8m0i71xvlsrx0y81247j1kcl7iax53zkl8c";
+          name = "blog-admin";
+        };
+        packageRequires = [ ctable f names org s ];
+        meta = {
+          homepage = "http://melpa.org/#/blog-admin";
+          license = lib.licenses.free;
+        };
+      }) {};
     bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bm";
@@ -4483,7 +4525,7 @@
           sha256 = "1ggqg0lgvxg2adq91damvh55m36qsa23n3z6zyf5z6855ilzaa4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bm";
           sha256 = "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g";
           name = "bm";
         };
@@ -4496,15 +4538,15 @@
     bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bog";
-        version = "20160117.1615";
+        version = "20160124.1737";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "bog";
-          rev = "a13b6305f0b6a73373809fb71595194aa284696c";
-          sha256 = "1j2ar9sinbrraqvymqmjray48xbr1arhpigzgkgnhkc2zzqv8dwb";
+          rev = "0ba8df3f2d31d24f86deadc4369b7330efbac8c3";
+          sha256 = "0fy2jwpgvqlff5bn0l971xxb76krm3idjqjl61qgim6a45kip057";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bog";
           sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
           name = "bog";
         };
@@ -4525,7 +4567,7 @@
           sha256 = "0ghjfrwc2i04rxg3nqc5fg2kgfyjlhk8n2qcz53p9i7ncc3zgpha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bongo";
           sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
           name = "bongo";
         };
@@ -4546,7 +4588,7 @@
           sha256 = "06cpbjbv8ysz81szwgglgy5r1aay8rrzw5k86wyqg9jdzwpmilpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bonjourmadame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bonjourmadame";
           sha256 = "0d36yradh37359fjk59s54hxkbh4qcc17sblj2ylcdyw7181iwfn";
           name = "bonjourmadame";
         };
@@ -4567,7 +4609,7 @@
           sha256 = "11m0w8i2nq0nqrpg6m7vnn9sd3v1ln5b3rka7m9fnasadf77nmpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boogie-friends";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boogie-friends";
           sha256 = "0cfs7gvjxsx2027dbzh4yypz500nmk503ikiiprbww8jyvc8grk7";
           name = "boogie-friends";
         };
@@ -4585,7 +4627,7 @@
           sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bookmark+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bookmark+";
           sha256 = "0121xx7dp2pakk9g7sg6par4mkxd9ky746yk4wh2wrhprc9dqzni";
           name = "bookmark-plus";
         };
@@ -4598,15 +4640,15 @@
     boon = callPackage ({ emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20151229.1340";
+        version = "20160202.1455";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "9604996c148f2bacf6e95502c33a3f154d6ab7f9";
-          sha256 = "1khl5798a9vp4f89x3f5mvh6m1yk3p07kqz7x8c2kvq58w32a6yj";
+          rev = "f6edf01a9f300d6e160f0c2c17619d3f6d1fa785";
+          sha256 = "149slx8cqh28hzb5cfa1ink99c18dh548jg2w54hvkzvqhhwhn7v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boon";
           sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
           name = "boon";
         };
@@ -4627,7 +4669,7 @@
           sha256 = "0yzfxxv2bw4x320268bixfc7yf97851804bz3829vbdhnr4kp6y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/borland-blue-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/borland-blue-theme";
           sha256 = "1sc8qngm40bwdym8k1dgbahg48i73c00zxd99kqqwm9fnd6nm7qx";
           name = "borland-blue-theme";
         };
@@ -4648,7 +4690,7 @@
           sha256 = "1gys5ri56s2s525wdji3m72sxzswmb8cmhmw5iha84v7hlqkrahb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boron-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boron-theme";
           sha256 = "1rrqlq08jnh9ihb99ji1vvmamj742assnm4a7xqz6gp7f248nb81";
           name = "boron-theme";
         };
@@ -4669,7 +4711,7 @@
           sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boxquote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
           name = "boxquote";
         };
@@ -4690,7 +4732,7 @@
           sha256 = "0chmarbpqingdma54d6chbr6v6jg8lapbw56cpvcpbl04fz980r0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bpe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bpe";
           sha256 = "08zfqcgs7i2ram2qpy8vrzksx5722aahr66vdi4d9bcxm03s19fm";
           name = "bpe";
         };
@@ -4703,15 +4745,15 @@
     bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bpr";
-        version = "20151206.1415";
+        version = "20160127.1102";
         src = fetchFromGitHub {
           owner = "ilya-babanov";
           repo = "emacs-bpr";
-          rev = "1c8ffe083df2bb1e8a9aa44c9ed450f631081ae4";
-          sha256 = "01bh371c0ln0qw1wixw28gdyjk4v8griw464d671r26wsxjdiwqy";
+          rev = "b6241418747578539f9e19ff72fb228aa195315a";
+          sha256 = "05x9fmxlybas3gcv3qf1vcfh5k265hjwh73232fyg2v562if748z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bpr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bpr";
           sha256 = "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2";
           name = "bpr";
         };
@@ -4732,7 +4774,7 @@
           sha256 = "00463z740xrkr4yz46g9zxz23zy878jgvba81pnwvg4l6hd3kc8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bracketed-paste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bracketed-paste";
           sha256 = "1v7zwi29as0218vy6ch21iqqcxfhyh373m3dbcdzm2pb8bpcg58j";
           name = "bracketed-paste";
         };
@@ -4753,7 +4795,7 @@
           sha256 = "1nzgjgzidyrplfs4jl8nikd5wwvb4rmrnm51qxmw9y2if0hpq0jd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/brainfuck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/brainfuck-mode";
           sha256 = "08jzx329mrr3c2pifs3hb4i79dsw606b0iviagaaja8s808m40cd";
           name = "brainfuck-mode";
         };
@@ -4774,7 +4816,7 @@
           sha256 = "0w6b9rxdciy1365kgf6fh3vgrjr8xd5ar6xcn0g4h56f2zg9hdmj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/broadcast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/broadcast";
           sha256 = "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib";
           name = "broadcast";
         };
@@ -4795,7 +4837,7 @@
           sha256 = "0q71ah62q6acivhxzsw9j1ky54i9hhlnj97sjn8bxrxx7nw01gf7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-at-remote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-at-remote";
           sha256 = "1d40b9j3pc6iy3l25062k7f52aq0vk9sizdwd7wii3v5nciczv6w";
           name = "browse-at-remote";
         };
@@ -4808,15 +4850,15 @@
     browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "browse-kill-ring";
-        version = "20150829.832";
+        version = "20160125.209";
         src = fetchFromGitHub {
           owner = "browse-kill-ring";
           repo = "browse-kill-ring";
-          rev = "66b5a0872b4278b49a815fc759c3eb48aebe10bf";
-          sha256 = "06mdrjc4jq7pj8vmg91dair138kmhvaa9gi5icc56120jmfb6kn2";
+          rev = "c7df6c8f5fe1e82d17b23da6d43a038784721d10";
+          sha256 = "0sndzhza9k4vcf70fzxsyzrfryaz92lm1y7bbb0dx10m65qljpbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-kill-ring";
           sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
           name = "browse-kill-ring";
         };
@@ -4835,7 +4877,7 @@
           sha256 = "1z6pix1ml3s97jh34fwjj008ihlrz4hkipdh5yzcvc6nhrimjw2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-kill-ring+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-kill-ring+";
           sha256 = "1flw7vmqgsjjvr2zlgz2909gvpq9mhz8qkg6hvsrzwg95f4l548w";
           name = "browse-kill-ring-plus";
         };
@@ -4856,7 +4898,7 @@
           sha256 = "1rcihwdxrzhgcz573rh1yp3770ihkwqjqvd39yhic1d3sgwxz2hy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-url-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-url-dwim";
           sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
           name = "browse-url-dwim";
         };
@@ -4874,7 +4916,7 @@
           sha256 = "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bs-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bs-ext";
           sha256 = "0dddligqr71qdakgfkx0r45k9py85qlym7y5f204bxppyw5jmwb6";
           name = "bs-ext";
         };
@@ -4895,7 +4937,7 @@
           sha256 = "022j0gw5qkxjz8f70vqjxysifv2mz6cigf9n5z03zmpvwwvxmx2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/btc-ticker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/btc-ticker";
           sha256 = "1vfnx114bvnly1k3fmcpkqq4m9558wqr5c9k9yj8f046dgfh8dp1";
           name = "btc-ticker";
         };
@@ -4916,7 +4958,7 @@
           sha256 = "1qgasaqhqm0birjmb6k6isd2f5pn58hva8db8qfhva9g5kg1f38w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bts";
           sha256 = "1i1lbjracrgdxr52agxhxxgkra4w291dmz85s195lcx38rva7ib3";
           name = "bts";
         };
@@ -4937,7 +4979,7 @@
           sha256 = "1sfr3j11jz4k9jnfa9i05bp4v5vkil38iyrgsp3kxf15797b9dg9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bts-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bts-github";
           sha256 = "03lz12bbkjqbs82alc97k6s1pmk721qip3h9cifq8a5ww5cbq9ln";
           name = "bts-github";
         };
@@ -4958,7 +5000,7 @@
           sha256 = "1aha8rzilv4k300rr4l9qjfygydfwllkbw17lhm8jz0kh9w6bd28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bubbleberry-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bubbleberry-theme";
           sha256 = "056pcr9ynsl34wqa2pw6sh4bdl5kpp1r0pl1vvw15p4866l9bdz3";
           name = "bubbleberry-theme";
         };
@@ -4979,7 +5021,7 @@
           sha256 = "1p5a29bpjqr1gs6sb6rr7y0j06nlva23wxkwfskap25zvjpgwbvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-buttons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-buttons";
           sha256 = "1p0ydbrff9197sann3s0d7hpav7r9g461w4llncafmy31w7m1dn6";
           name = "buffer-buttons";
         };
@@ -5000,7 +5042,7 @@
           sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-flip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-flip";
           sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
           name = "buffer-flip";
         };
@@ -5021,7 +5063,7 @@
           sha256 = "1yzga2zs9flbarsh704hh7k4l3w09g4li9a7r3fsvl4kll80x393";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-move";
           sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
           name = "buffer-move";
         };
@@ -5039,7 +5081,7 @@
           sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-stack";
           sha256 = "00vxfd4ki5pqf9n9vbmn1441vn2y14bdr1v05h46hswf13b4hzrn";
           name = "buffer-stack";
         };
@@ -5060,7 +5102,7 @@
           sha256 = "1mnf0dgr6g58k0jyia7985jsinrla04vm5sjl2iajwphbhadjk8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-utils";
           sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
           name = "buffer-utils";
         };
@@ -5081,7 +5123,7 @@
           sha256 = "1plh77xzpbhgmjdagm5rhqx6nkhc0g39ir0b6s5yh003wmx6r1hh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bufshow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bufshow";
           sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
           name = "bufshow";
         };
@@ -5102,7 +5144,7 @@
           sha256 = "0zr1raf0q5wi3vr66kglxcfxswlm8g2l501adm8c27clvqizpnrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bug-reference-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bug-reference-github";
           sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
           name = "bug-reference-github";
         };
@@ -5115,15 +5157,15 @@
     bundler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "bundler";
-        version = "20151111.912";
+        version = "20160121.524";
         src = fetchFromGitHub {
           owner = "tobiassvn";
           repo = "bundler.el";
-          rev = "9be0c4601a4d1a35de22f818637ce029830272d3";
-          sha256 = "0cldbyc7qsyxszzfbdcw8n8a15hvj343acsjir29n6d9nnpmvjgp";
+          rev = "b9b1acd074263cb23d05a0718e02f164687f0625";
+          sha256 = "0gr4v6fmg0im17f6i3pw6h8l401n5l5lzxz0hgi8lrisvx73iqa5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bundler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bundler";
           sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
           name = "bundler";
         };
@@ -5144,7 +5186,7 @@
           sha256 = "1bzilpjibyyj97z5j7zz89jx0kfqr842lrjlnq1qki8r5kj18p4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bury-successful-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bury-successful-compilation";
           sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
           name = "bury-successful-compilation";
         };
@@ -5165,7 +5207,7 @@
           sha256 = "1viq7cb41r8klr8i38c5zjrhdnww31gh4j51xdgy4v2lc3z321zi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buster-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buster-mode";
           sha256 = "1qndhchc8y27x49znhnc4rny1ynfcplr64rczrlbj53qmkxn5am7";
           name = "buster-mode";
         };
@@ -5186,7 +5228,7 @@
           sha256 = "11djqlw4qf3qs2rwiz7dn5q2zw5i8sykwdf4hg4awsgv8g0bbxn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buster-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buster-snippets";
           sha256 = "0k36c2k7wwix10rgmjxipc77fkn9jahjyvl191af6w41wla47x4x";
           name = "buster-snippets";
         };
@@ -5207,7 +5249,7 @@
           sha256 = "11z987frzswnsym8g3l0s9wwdly1zn5inl2l558m6kcvfy7g59cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/busybee-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/busybee-theme";
           sha256 = "0w0z5x2fbnalv404av3mapfkqbfgyk81a1mzvngll8x0pirbyi10";
           name = "busybee-theme";
         };
@@ -5228,7 +5270,7 @@
           sha256 = "0pp604r2gzzdpfajw920607pklwflk842difdyl4hy9w87fgc0jg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/butler";
           sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
           name = "butler";
         };
@@ -5241,15 +5283,15 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20160109.213";
+        version = "20160110.122";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "d00c1642a664f57d4a7d257a9f0edf6ba7e84b2c";
-          sha256 = "12ay9qimw569x9jcch4sirjyak90w6rf5hlsiadffw3bl445sqv7";
+          rev = "e1f71acdef3de3033d24be1cb41933eefc75029f";
+          sha256 = "0lpfx7q0qrclxii4ffrrjffb678bsx908za91nsy7mc2g0cxcapb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buttercup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buttercup";
           sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
           name = "buttercup";
         };
@@ -5270,7 +5312,7 @@
           sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/button-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/button-lock";
           sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
           name = "button-lock";
         };
@@ -5291,7 +5333,7 @@
           sha256 = "040mcq2cwzbrf96f9mghb4314cd8xwp7ki2ix9fxpmbwiy323ld5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/c-c-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/c-c-combo";
           sha256 = "09rvh6n2hqls7qki5dc34s2hmcmlvdsbgzcxgglhcmrhwx5w4vxn";
           name = "c-c-combo";
         };
@@ -5312,7 +5354,7 @@
           sha256 = "0mlm5f66541namqn04vx6csf14mxhsiknbm36yqdnp1lxb7knv7a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/c-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/c-eldoc";
           sha256 = "13grkww14w39y2x6mrbfa9nzljsnl5l7il8dnj6sjdyv0hz9x8vm";
           name = "c-eldoc";
         };
@@ -5333,7 +5375,7 @@
           sha256 = "10k90r4ckkkdjn9pqcbfyp6ynvrd5k0ngqcn5d0v1qvkn6jifxjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/c0-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/c0-mode";
           sha256 = "0s3h4b3lpz4jsk222yyfdxh780dvykhaqgyv6r3ambz95vrmmpl4";
           name = "c0-mode";
         };
@@ -5354,7 +5396,7 @@
           sha256 = "1hp6dk84vvgkmj5lzghvqlpq3axwzgx9c7gly2yx6497fgf9jlby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cache";
           sha256 = "0lzj0h23g6alqcmd20ack53p72g9i09dp9x0bp3rdw5izcfkvhh3";
           name = "cache";
         };
@@ -5375,7 +5417,7 @@
           sha256 = "07kzhyqr8ycjvkknijqhsfr26zd5jc8wxm9sl8bp6pzn4jbs1dmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cacoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cacoo";
           sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
           name = "cacoo";
         };
@@ -5396,7 +5438,7 @@
           sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake";
           sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr";
           name = "cake";
         };
@@ -5417,7 +5459,7 @@
           sha256 = "0xq10jkbk3crdhbh4lab39xhfw6vvcqz3if5q3yy4gzhx7zp94i4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake-inflector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake-inflector";
           sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
           name = "cake-inflector";
         };
@@ -5438,7 +5480,7 @@
           sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake2";
           sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x";
           name = "cake2";
         };
@@ -5459,7 +5501,7 @@
           sha256 = "03hi0ggq81nm1kd0mcf8fwnya4axzd80vfdjdbhgpxbkvnxldzpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cal-china-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cal-china-x";
           sha256 = "06mh2p14m2axci8vy1hr7jpy53jj215z0djyn8h7zpr0k62ajhka";
           name = "cal-china-x";
         };
@@ -5480,7 +5522,7 @@
           sha256 = "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/calfw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/calfw";
           sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
           name = "calfw";
         };
@@ -5501,7 +5543,7 @@
           sha256 = "14n5rci4bkbl7037xvkd69gfxnjlgvd2j1xzciqcgz92f06ir3xi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/calfw-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/calfw-gcal";
           sha256 = "182p56wiycrm2cjzmlqabksyshpk7nga68jf80vjjmaavp5xqsq8";
           name = "calfw-gcal";
         };
@@ -5522,7 +5564,7 @@
           sha256 = "0n6y4z3qg04qnlsrjysf8ldxl2f2bk7n8crijydwabyy672qxd9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/calmer-forest-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/calmer-forest-theme";
           sha256 = "0riz5n8fzvxdnzgg650xqc2zwc4xvhwjlrrzls5h0pl5adaxz96p";
           name = "calmer-forest-theme";
         };
@@ -5543,7 +5585,7 @@
           sha256 = "1fxmk9ykvxkd0ldmldqnwdn5grzzzigla7zsw1yqqmlfwd48ggf8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/camcorder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/camcorder";
           sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
           name = "camcorder";
         };
@@ -5562,7 +5604,7 @@
           sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caml";
           sha256 = "0kxrn9s1h2l05akcdcj6fd3g6x5wbi511mf14g9glcn8azyfs698";
           name = "caml";
         };
@@ -5583,7 +5625,7 @@
           sha256 = "08cp45snhyir5w8gyp6xws1q7c54pz06q099l0m3zmwn9277g68z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/capture";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/capture";
           sha256 = "1hxrvyq8my5886q7wj5w3mhyja7d6cf19gyclap492ci7kmrkdk2";
           name = "capture";
         };
@@ -5596,15 +5638,15 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "20160109.627";
+        version = "20160126.1538";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "e6a02346fc033d6342183a76a49156d4091ef402";
-          sha256 = "152d5ym4bqnlnp6rafgy8fafx8246n78ymlcx9k2nyfar4c0lir2";
+          rev = "dafbecb43e540d6dcd5e410becaedcf6eaf61a5d";
+          sha256 = "07szswvfzvyd9sx1r4x8hyyc3984k4qqj8m24ybnjgmiax57hgkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cargo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cargo";
           sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
           name = "cargo";
         };
@@ -5625,7 +5667,7 @@
           sha256 = "14ijcb9qp1gv8ianqm7cdvwjkgpwdaw3lz34j29c3rmg5ir26bjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caroline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caroline-theme";
           sha256 = "07flxggnf0lb1fnvprac1daplgx4bi5fnnkgfc58wnw805s12k32";
           name = "caroline-theme";
         };
@@ -5646,7 +5688,7 @@
           sha256 = "1nibzay3nb1n7z36w55m6kjqsj5yqj89way81f647jgbjggr6bih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caseformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caseformat";
           sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
           name = "caseformat";
         };
@@ -5667,7 +5709,7 @@
           sha256 = "0zky8d9kdrcfh4vh8v6wbzs80nixr1xnnyjgg1zdingyklrxl79y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cask";
           sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
           name = "cask";
         };
@@ -5688,7 +5730,7 @@
           sha256 = "1m40s9q00l06fz525m3zrvwd6s60lggdqls5k5njkn671aa3h71s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cask-package-toolset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cask-package-toolset";
           sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
           name = "cask-package-toolset";
         };
@@ -5709,7 +5751,7 @@
           sha256 = "15sq5vrkhb7c5j6ny6wy4bkyl5pggch4l7zw46an29rzni3pffr3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caskxy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caskxy";
           sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
           name = "caskxy";
         };
@@ -5719,22 +5761,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    cbm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cbm";
-        version = "20150715.1404";
+        version = "20160131.1106";
         src = fetchFromGitHub {
           owner = "akermu";
           repo = "cbm.el";
-          rev = "40ae4f6ed075889346b4ba7cf991f5ad6dd6d1b7";
-          sha256 = "1b3cjb27z0nypn9nsmi93b61j7a252fb7sclh1mrsnanhvbwl0zx";
+          rev = "2f319b3ea6d434f9f9f9ace53a0ca968f3787a4c";
+          sha256 = "125d5i7ycdn2hgffc1l3jqcfzvk70m1ciywj4h53qakkl15r9m38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cbm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cbm";
           sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn";
           name = "cbm";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/cbm";
           license = lib.licenses.free;
@@ -5747,11 +5789,11 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "337b29c3c2cac8920f7066ec457aeb5f62644297";
-          sha256 = "1a42bwarhciccl0yhh9i24bc9f3n5c0wlnwqfcwkb7wzqy9gd55q";
+          rev = "64ad0ea6d03c0d46030cc5aaa3715b5cf3a82d3c";
+          sha256 = "02bsiq0kxm9cbbr6hr20ac4888mcyk0i8p9hrrdvaijq4fhkk76b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ccc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ccc";
           sha256 = "0fckhmz4svcg059v4acbn13yf3ijs09fxmq1axc1b9bm3xxig2cq";
           name = "ccc";
         };
@@ -5772,7 +5814,7 @@
           sha256 = "1a93cim1w96aaj81clhjv25r7v9bwqm9a818mn8lk4aj1bmhgc4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cd-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cd-compile";
           sha256 = "1a24rv1jbb883vwhjkw6qxv3h3qy039iqkhkx3jkq1ydidr9f0hv";
           name = "cd-compile";
         };
@@ -5789,11 +5831,11 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "337b29c3c2cac8920f7066ec457aeb5f62644297";
-          sha256 = "1a42bwarhciccl0yhh9i24bc9f3n5c0wlnwqfcwkb7wzqy9gd55q";
+          rev = "64ad0ea6d03c0d46030cc5aaa3715b5cf3a82d3c";
+          sha256 = "02bsiq0kxm9cbbr6hr20ac4888mcyk0i8p9hrrdvaijq4fhkk76b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cdb";
           sha256 = "1gx34062h25gqsl3j1fjlklha19snvmfaw068q6bv6x9r92niqnf";
           name = "cdb";
         };
@@ -5814,7 +5856,7 @@
           sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cdlatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cdlatex";
           sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
           name = "cdlatex";
         };
@@ -5835,7 +5877,7 @@
           sha256 = "0aspci0zg8waa3l234l0f8fjfzm67z2gydfdwwpxksz49sm2s1jk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cdnjs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cdnjs";
           sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7";
           name = "cdnjs";
         };
@@ -5856,7 +5898,7 @@
           sha256 = "1f8gdj3p54q3410c66716y3l7i7nnkmq6hqz0dg1a1sc6jwdij3v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cedit";
           sha256 = "169sy7a1bgczwfxkkzjiggb7vdjxhrx7i3a39g6zv9f1zs6byk6m";
           name = "cedit";
         };
@@ -5877,7 +5919,7 @@
           sha256 = "0974bxy85rcxia6dkfryas2g46nanjdf8fv90adbc7kyj07xsf7c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/celery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/celery";
           sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
           name = "celery";
         };
@@ -5896,7 +5938,7 @@
           sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/centered-cursor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/centered-cursor-mode";
           sha256 = "0a5mymnkwjvpra8iffxjwa5fq3kq4vc8fw7pr7gmrwq8ml7il5zl";
           name = "centered-cursor-mode";
         };
@@ -5909,15 +5951,15 @@
     centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "centered-window-mode";
-        version = "20140730.447";
+        version = "20160121.526";
         src = fetchFromGitHub {
           owner = "ikame";
           repo = "centered-window-mode";
-          rev = "3107c8942d06e9fea180d9340828ee58ad5cb2fd";
-          sha256 = "09jrcyc1dk2cdfi7ajk8xh2c9jw0f712j6gyvpaklvijakhvgsg7";
+          rev = "cfb1bdb851de13a588dc90cac864d38d10792763";
+          sha256 = "0dcfhx9rlcqglcyg78jkgdxm625q2czw849z0c03wb75nblkcsdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/centered-window-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/centered-window-mode";
           sha256 = "0f5qwv4f8gn5nxsqn57bbb3y0w5whjvhv3pls88d5n68lkd1k4si";
           name = "centered-window-mode";
         };
@@ -5938,7 +5980,7 @@
           sha256 = "0zqrpaq9c3lm12jxnvysh8f3m3193k22zaj0ycscdqd1jpq4wcgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/centimacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/centimacro";
           sha256 = "1qbyfi6s4hdp5sv394w3sib8g2kx06i06q8gh6hdv5pis5kq9fx6";
           name = "centimacro";
         };
@@ -5959,7 +6001,7 @@
           sha256 = "17jg5d5afh9zpnjx8wkys8bjllxq99j0yhz8j3fvkskisvhkz1im";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cerbere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cerbere";
           sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
           name = "cerbere";
         };
@@ -5976,11 +6018,11 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "f1e78372d5a513a8ef8730942db05873f7132ebc";
-          sha256 = "1pgq17zp0qar587nrxhybddbv33dw3a2x4agqxpgv4wmci4w50s6";
+          rev = "5bfd7f68f17f94452716659a04f534653aa42795";
+          sha256 = "1ycps7amnxgxr9y8hnhlrfj6phs9ky2nx7yszl2260q64g0jyhvm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cfengine-code-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cfengine-code-style";
           sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
           name = "cfengine-code-style";
         };
@@ -6001,7 +6043,7 @@
           sha256 = "019vqjmq6hb2f5lddqy0ya5q0fd47xix29cashlchz0r034rc32r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cff";
           sha256 = "04b2ck1jkhsrka6dbyn6rpsmmc2bn13kpyhzibd781hj73d93jgc";
           name = "cff";
         };
@@ -6016,11 +6058,11 @@
         version = "20150819.604";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11220";
+          rev = "11323";
           sha256 = "1v8wgm3cvz4xx2jlx95ipd9340mxfxgk5hqialp76y74x03vfzq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cg";
           sha256 = "0ra6mxf8l9fjn1vszjj71fs6f6l08hwypka8zsb3si96fzb6sgjh";
           name = "cg";
         };
@@ -6041,7 +6083,7 @@
           sha256 = "1m9sq93bwajbld3lnlzkjbsby5zlm9sxjzqynryyvsb9zr1d0a9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/change-inner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/change-inner";
           sha256 = "0r693056wykg4bs7inbfzfniyawmb91igk6kjjpq3njk0v84y1sj";
           name = "change-inner";
         };
@@ -6051,6 +6093,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    chapel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chapel-mode";
+        version = "20160126.228";
+        src = fetchFromGitHub {
+          owner = "russel";
+          repo = "Emacs-Chapel-Mode";
+          rev = "e3c5fd718d00b7d33babec728990c802852b95ba";
+          sha256 = "0d2zac02zqf3al4x412cnz3hr57j3xpc34i30z1q6g429v4krkam";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chapel-mode";
+          sha256 = "0hmnsv8xf85fc4jqkaqz5j3sf56hgib4jp530vvyc2dl2sps6vzz";
+          name = "chapel-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/chapel-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "char-menu";
+        version = "20160204.15";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "char-menu";
+          rev = "e1b43238db53b5cb509175a8a9a5a5e3382f7bdc";
+          sha256 = "0jq5xicf0y7z1v68cgsg9vniw6pa793izz350a4wgdq8f5fcm24f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/char-menu";
+          sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l";
+          name = "char-menu";
+        };
+        packageRequires = [ avy-menu emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/char-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
     character-fold-plus = callPackage ({ fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "character-fold-plus";
@@ -6060,7 +6144,7 @@
           sha256 = "00b0jv58wkvhahfnqwbfawz1z3nbm6d8s8cq0nn631w4m509kgq0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/character-fold+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/character-fold+";
           sha256 = "01ibdwd7vap9m64w0bhyknxa3iank3wfss49gsgg4xbbxibyrjh3";
           name = "character-fold-plus";
         };
@@ -6073,15 +6157,15 @@
     charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "charmap";
-        version = "20131019.2358";
+        version = "20160124.722";
         src = fetchFromGitHub {
           owner = "lateau";
           repo = "charmap";
-          rev = "165193d91ef96f563ae8366ed4c1a2df5a4eaed2";
-          sha256 = "0crnd64cnsnaj5mcy55q0sc1rnamxa1xbpwpmirhyhxz780klww6";
+          rev = "3302ee8a94a04fa9b14dbe7163b0d62f31de69a2";
+          sha256 = "0zf9i7ajjm639hw34iqwjvni6gn0smzi79582d5l36jvr0z4gnkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/charmap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/charmap";
           sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
           name = "charmap";
         };
@@ -6102,7 +6186,7 @@
           sha256 = "1r2s3fszblk5wa6v3hnbzsri550gi5qsmp2w1spvmf1726n900cb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chatwork";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chatwork";
           sha256 = "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p";
           name = "chatwork";
         };
@@ -6119,11 +6203,11 @@
         src = fetchFromGitHub {
           owner = "darksmile";
           repo = "cheatsheet";
-          rev = "80e58c1783571e2907dfe25a32ae46ad3da1bcf1";
-          sha256 = "1v2r7b6dbnxfhacg8cbb0wkymsnxnr2qgxsdbzqb4lh7r282vxxn";
+          rev = "c4d9af19bf563977dd74863bb70d1aa783952f1c";
+          sha256 = "15kam5hf2f4nwp29nvxqm5bs8nyhqf5m44fdb21qljgbmjdlh38y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cheatsheet";
           sha256 = "11z3svlzvmhdy0pkxbx9qz9bnq056cgkbfyw9z34aq1yxazi2cpq";
           name = "cheatsheet";
         };
@@ -6144,7 +6228,7 @@
           sha256 = "0660ix17ksxy5a5v8yqy7adr9d4bs6p1mnkc6lpyw96k4pn62h45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/checkbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/checkbox";
           sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
           name = "checkbox";
         };
@@ -6165,7 +6249,7 @@
           sha256 = "1mnskri5r1lyzzcag60x7amn00613jyl7by7hd4sqm2a7zd4r5aa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chef-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chef-mode";
           sha256 = "1pz82s82d4z3vkm8mpmwdxb9pd11kq09g23mg461lzqxjjw734rr";
           name = "chef-mode";
         };
@@ -6186,7 +6270,7 @@
           sha256 = "0m97xr6lddy2jdmd4bl4kbp2568p4n110yfa9k7fqc20ihq8jkyd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cherry-blossom-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cherry-blossom-theme";
           sha256 = "1i3kafj3m7iij5mr0vhg45zdnkl9pg9ndrq0b0i3k3mw7d5siq7w";
           name = "cherry-blossom-theme";
         };
@@ -6207,7 +6291,7 @@
           sha256 = "0j61lvr99viaharg4553whcppp7lxhimkk5lps0izz9mnd8y2wm5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chicken-scheme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chicken-scheme";
           sha256 = "0ns49p7nsifpi7wrzr02ljrr0p6hxanrg54zaixakvjkxwcgfabr";
           name = "chicken-scheme";
         };
@@ -6228,7 +6312,7 @@
           sha256 = "08ln66kx73019klzw0rsvlz3cs4ch8wxjfljmkyswjjd179h882c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-fonts-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-fonts-setup";
           sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5";
           name = "chinese-fonts-setup";
         };
@@ -6241,15 +6325,15 @@
     chinese-pyim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20160118.50";
+        version = "20160204.440";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "d6dad5aad01e2be007609a6b3aaa8b0a9e017a7a";
-          sha256 = "1did95bkrzq3dr4y8jxw1pc3cv9ryhpc1ch5wqymh88h9cazy6hc";
+          rev = "9e4479b602d20c31df41108e657ad1d7277eab5a";
+          sha256 = "0v3iq865hrcqzg6rm3jmrxb41zq9faj5jnjcmwi6kpxmj06brn1g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-pyim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-pyim";
           sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l";
           name = "chinese-pyim";
         };
@@ -6270,7 +6354,7 @@
           sha256 = "06k13wk659qw40aczq3i9gj0nyz6vb9z1nwsz7c1bgjbl2lh6hcv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-remote-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-remote-input";
           sha256 = "0nnccm6w9i0qsgiif22hi1asr0xqdivk8fgg76mp26a2fv8d3dag";
           name = "chinese-remote-input";
         };
@@ -6291,7 +6375,7 @@
           sha256 = "0cx1g6drkr8gyqqdxjf7j4wprxcbq30gam2racgnvdicgij0apwg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-wbim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-wbim";
           sha256 = "1pax3kpmvg170mpvfrjbpj9czq0xykmfbany2f7vbn96jb5xfmsb";
           name = "chinese-wbim";
         };
@@ -6312,7 +6396,7 @@
           sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-word-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-word-at-point";
           sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
           name = "chinese-word-at-point";
         };
@@ -6333,7 +6417,7 @@
           sha256 = "14yzmyzkf846yjrwnqrbzmvyhfav39qa5fr8jnb7lyz8rm7y9pnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-yasdcv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-yasdcv";
           sha256 = "1y2qywldf8b8b0km1lcf74p0w6rd8gr86qcj7ikwhhbvd19dfglm";
           name = "chinese-yasdcv";
         };
@@ -6351,7 +6435,7 @@
           sha256 = "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chm-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chm-view";
           sha256 = "1acz0fvl3inn7g4himq680yf64bgm7n61hsv2zpm1k6smrdl78nz";
           name = "chm-view";
         };
@@ -6372,7 +6456,7 @@
           sha256 = "1mqdz3rvx0jm80fgzw3s3lqn448kqrlrifdwcg36cqq4qmkpalq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chronos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chronos";
           sha256 = "1fwpll0mk6pc37qagbq3b3z32d2qwz993nxp9pjw4qbmlnq6sy9d";
           name = "chronos";
         };
@@ -6393,7 +6477,7 @@
           sha256 = "0gx0bd7j71rlniq64vw8k59yzl070mdia05ry18br8kpsbk3bhrl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chruby";
           sha256 = "0pk6vdvmifiq52n452lbrkklxa69c40bfyzra9qhrghxr2q5v3mk";
           name = "chruby";
         };
@@ -6406,15 +6490,15 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20160117.142";
+        version = "20160204.1208";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "5ad457b5acd7cce3f8b7d8242eab9bdbc17954a5";
-          sha256 = "1chj5j8p1shw1cqrcnf97m6d5zjixawg1pf9wi6lsl9v6i42nssd";
+          rev = "17b88cce0cdf856e1150973d271223b83b2cf165";
+          sha256 = "12rdrd8qfy2bgvhrx0m6yv6cd0k9s68rr7fxk96ac6lzyq5rh8aj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider";
           sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
           name = "cider";
         };
@@ -6435,7 +6519,7 @@
           sha256 = "1w4y65s3m2irga4iqfqqkcmvl6ss24zmaxqzbfib8jmi84r4lpac";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-decompile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-decompile";
           sha256 = "0jhsm31zcfwkbpsdh1lvmjm1fv2m7y849930sjvf5nxv3ffhx3b4";
           name = "cider-decompile";
         };
@@ -6456,7 +6540,7 @@
           sha256 = "1gpklkrw6iishfb3yilnqysh6zij67l1sl3ixq1bi3f6r237v1pg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-eval-sexp-fu";
           sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
           name = "cider-eval-sexp-fu";
         };
@@ -6477,7 +6561,7 @@
           sha256 = "0lgq4p7rs4prqfqd83v1l36xxacrd65jsfzbp7q62b2pjqikpgk0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-profile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-profile";
           sha256 = "14jc98h4r9rb7pxfb60ps4ss8p0bm66wdl6n8z1357hk93h9kmfs";
           name = "cider-profile";
         };
@@ -6498,7 +6582,7 @@
           sha256 = "1hvvfp58x269yapnayxwyclgqy52azf76rb703mlfqivj1gzd7p3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-spy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-spy";
           sha256 = "0478jlg76h0mrjwk2b1kdj16s1q1b03b7ygacai45jh89bc025fh";
           name = "cider-spy";
         };
@@ -6519,7 +6603,7 @@
           sha256 = "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cil-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cil-mode";
           sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
           name = "cil-mode";
         };
@@ -6540,7 +6624,7 @@
           sha256 = "190n4kdcqdwglhnawnj9mqjarmcaqylxipc07whmrii0jv279kjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cinspect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cinspect";
           sha256 = "0djh61mrfgcm3767ll1l5apw6646j4fdcaripksrmvn5aqfn8rjj";
           name = "cinspect";
         };
@@ -6553,15 +6637,15 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20151207.344";
+        version = "20160201.641";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "c9862e432d2dad7cd568d79dbe49849245333fb1";
-          sha256 = "1l6lm3i02r0b8ng0n3rckgk0q38wjng41dqbx148bjxfq44cpghz";
+          rev = "35618a1e890dfff7bc3c879e4f0e23868d00bf85";
+          sha256 = "1qw8ax3a1v1053qh9i41ci93hc4034ghlcwq8hldr3amsz344fhj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/circe";
           sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
           name = "circe";
         };
@@ -6582,7 +6666,7 @@
           sha256 = "1mc8kayw8fmvpl0z09v6i68s2lharlwpzff0cvcsfn0an2imj2d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cl-lib-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cl-lib-highlight";
           sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
           name = "cl-lib-highlight";
         };
@@ -6598,11 +6682,11 @@
         version = "20151116.638";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "258069";
-          sha256 = "1rzax55darnj4h8i3qyrm2rqdwcvqggsz7kv6gi2i174fbdkbzfr";
+          rev = "259829";
+          sha256 = "180s33f8ngcc432x7639vxwchgvd5nwy4irby8ldzckdf5a4gd4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clang-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clang-format";
           sha256 = "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah";
           name = "clang-format";
         };
@@ -6623,7 +6707,7 @@
           sha256 = "1h6k6kzim1zb87y1kzpqjzk3ip9bmfxyg54kdh2sfp4xy0g5h3p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clean-aindent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clean-aindent-mode";
           sha256 = "1whzbs2gg2ar24kw29ffv94dgvrlfy2v4zdn0g7ksjjmmdr8ahh4";
           name = "clean-aindent-mode";
         };
@@ -6644,7 +6728,7 @@
           sha256 = "03dbxg51zs4wbfwjv1qxlm5w06j89mvniisnyyahjkvpiqrp96yd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clean-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clean-buffers";
           sha256 = "025sxrqxm24yg1wpfncrjw1nm91h0h7jy2xd5g20xqlinqqvdihj";
           name = "clean-buffers";
         };
@@ -6665,7 +6749,7 @@
           sha256 = "19q6zbnl9fg4cwgi56d7p4qp6y3g0fdyihinpakby49xv2n2k8dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clevercss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clevercss";
           sha256 = "189f2l4za1j9ds0bhxrzyp7da9p6svh5dx2vnzf4vql7qhjk3gf0";
           name = "clevercss";
         };
@@ -6686,7 +6770,7 @@
           sha256 = "11c0zpk8gg70d4xiiyjc7v13knwb2ihbrxnlaxzh3rdg2c12676q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cliphist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cliphist";
           sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
           name = "cliphist";
         };
@@ -6699,15 +6783,15 @@
     clipmon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clipmon";
-        version = "20151224.1147";
+        version = "20160128.1204";
         src = fetchFromGitHub {
           owner = "bburns";
           repo = "clipmon";
-          rev = "a531c3e5d3cf760b00d3f00726a4e60e226aae99";
-          sha256 = "1xqszj16yim89pln9aw17lji5knxm3pklaihydagd7a1f99hr51w";
+          rev = "90e24ba9dd53cb7c6f147d2d716816410117cd8b";
+          sha256 = "07a55q97j2vsqpha0akri2kq90v1l97mc1mgr97pq39gc1bbc5d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clipmon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clipmon";
           sha256 = "1gvy1722px4fh88jyb8xx7k1dgyjgq7zjadr5fghdir42l0byw7i";
           name = "clipmon";
         };
@@ -6728,7 +6812,7 @@
           sha256 = "0msmigzip7hpjxwkz0khhlc2lj9wgb2919i4k0kv8ppi9j2f9hjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clippy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clippy";
           sha256 = "0nqmc8f2qrsp25vzc66xw6b232n7fyw6g06mwn2cdpm3d2pgb7rg";
           name = "clippy";
         };
@@ -6749,7 +6833,7 @@
           sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clips-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clips-mode";
           sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
           name = "clips-mode";
         };
@@ -6762,15 +6846,15 @@
     clj-refactor = callPackage ({ cider, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "20160118.646";
+        version = "20160128.1121";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "7cfef55fa0c0c9246ad437f30b1542e288176075";
-          sha256 = "1nplb95aiwxy9flqjyjqfdpr0vzykckr05n7zahv1ig2rnra2vcs";
+          rev = "85d29af959b8d2b581f68f06f6d220bd26e58690";
+          sha256 = "0h8x2ikggry16nd11l489523ldxg1cxbk10scpbxn9jhb11wgzd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clj-refactor";
           sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
           name = "clj-refactor";
         };
@@ -6802,7 +6886,7 @@
           sha256 = "0ydv2prnw1j3m5nk23fqn4iv202kjswr8z0ip4zacdm8bl0q25ln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cljr-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
           name = "cljr-helm";
         };
@@ -6823,7 +6907,7 @@
           sha256 = "1cdim8fancrsrm9avzv4m2v384i7n4632nibyfnxkhq03bj00j1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cljsbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cljsbuild-mode";
           sha256 = "0qvb990dgq4v75lwnd661wxszbdbhlgxpsyv4zaj6h10gp1vi214";
           name = "cljsbuild-mode";
         };
@@ -6844,7 +6928,7 @@
           sha256 = "0za8j7pwcmvjm2ls62z9f8sjryzzsmms4slikzixc0rxyiqnqyd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clmemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clmemo";
           sha256 = "03qa79ip0gqinj1kk898lcvixk98hf6gknz0yc2fnqcrm642k2vs";
           name = "clmemo";
         };
@@ -6865,7 +6949,7 @@
           sha256 = "1rflc00yrbb7xzfh8c54ajf4qnhsp3mq07gkr257gjyrwsdw762v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cloc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cloc";
           sha256 = "1ny5wixa9x4fq5jvhs01jmyvwkfvwwi9aamrcqsl42s9sx6ygz7a";
           name = "cloc";
         };
@@ -6878,15 +6962,15 @@
     clocker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "clocker";
-        version = "20150505.1043";
+        version = "20160125.1705";
         src = fetchFromGitHub {
           owner = "roman";
           repo = "clocker.el";
-          rev = "9cb1440ca1fa4f82597f8b053c7f8e44f4682229";
-          sha256 = "0hw6i92k651p71am578p02lqp1dj9pic880n6x4z0ydz4xyjhmfw";
+          rev = "4a4831ed4e42e18976edd16b844cb16cb78f3c17";
+          sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clocker";
           sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
           name = "clocker";
         };
@@ -6907,7 +6991,7 @@
           sha256 = "1r189c0xm6vh05k0y715i5ldj1pxzvwkxqbq0n85m489mjnf2wv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojars";
           sha256 = "1skvd29347hwapgdqznbzwfcp2nf077qkdzknxc8ylmqa32yf5w1";
           name = "clojars";
         };
@@ -6928,7 +7012,7 @@
           sha256 = "1ljb0g4yvrqgjqgmz8qz0c0swbx1m6gldmcdqnmxd72bs3w9p0k8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-cheatsheet";
           sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
           name = "clojure-cheatsheet";
         };
@@ -6941,15 +7025,15 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20160117.650";
+        version = "20160204.1143";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "1c5f3fb88ca216674eeeb9def773627deeea01df";
-          sha256 = "0xm2hplzid14ymrbgnypl1qsb22ird1bbilpq23nrgvwg0jyd9hj";
+          rev = "3a701b1f495d0eaa22387b45e6309c2d987c62fa";
+          sha256 = "1ka2km49ar08wp0m7czfap5dvh2ql1d3cv7lyfbxicylqw1354hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-mode";
           sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
           name = "clojure-mode";
         };
@@ -6966,11 +7050,11 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "1c5f3fb88ca216674eeeb9def773627deeea01df";
-          sha256 = "0xm2hplzid14ymrbgnypl1qsb22ird1bbilpq23nrgvwg0jyd9hj";
+          rev = "3a701b1f495d0eaa22387b45e6309c2d987c62fa";
+          sha256 = "1ka2km49ar08wp0m7czfap5dvh2ql1d3cv7lyfbxicylqw1354hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-mode-extra-font-locking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-mode-extra-font-locking";
           sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
           name = "clojure-mode-extra-font-locking";
         };
@@ -6991,7 +7075,7 @@
           sha256 = "1vgahik2q2sn6vqm9wg5b9jc74mkbc1md8pl69apz4cg397kjkzr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-quick-repls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-quick-repls";
           sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
           name = "clojure-quick-repls";
         };
@@ -7012,7 +7096,7 @@
           sha256 = "1w8izhrj23b8kqcsqalgrzxqnq18nvdxl48305p8cnwll646xjl2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-snippets";
           sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
           name = "clojure-snippets";
         };
@@ -7033,7 +7117,7 @@
           sha256 = "0v0wdq0b5jz4x0d7dl3ilgf3aqp2hk375db366ij6gxwd0b9i3na";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/closure-lint-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/closure-lint-mode";
           sha256 = "1xmi1gjgayd5xbm3xx721xv57ns3x56r8ps94zpwyf2znpdchqfy";
           name = "closure-lint-mode";
         };
@@ -7054,7 +7138,7 @@
           sha256 = "07kvnb6p35swkyj92c4wymsqq4r2885wdpqhv7nhicvi6n658kpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cloud-to-butt-erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cloud-to-butt-erc";
           sha256 = "061mmw39dq8sqzi2589lf7svy15n2iyiwbfiram48r2yhma5dd0f";
           name = "cloud-to-butt-erc";
         };
@@ -7075,7 +7159,7 @@
           sha256 = "0fnl3b62clg9llcs2l511sxp4yishan4pqk45sqp8ih4rdzvy7ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clues-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clues-theme";
           sha256 = "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy";
           name = "clues-theme";
         };
@@ -7096,7 +7180,7 @@
           sha256 = "0m94692gkq299sf56m4c637j5xp78dvgv0ad1hv4ys1hzp1qw1l5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cm-mode";
           sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
           name = "cm-mode";
         };
@@ -7117,7 +7201,7 @@
           sha256 = "030kg3m546gcm6cf1k928ld51znsfrzhlpm005dvqap3gkcrg4sf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-font-lock";
           sha256 = "0ws4kd94m8fh55d7whsf3rj9qrxjp1wsgxh0valsjxyp2ck9zrz0";
           name = "cmake-font-lock";
         };
@@ -7130,15 +7214,15 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20160114.1000";
+        version = "20160127.1859";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "6ce362f3fbea23e1c8e1831b73bc085ea2eabfd5";
-          sha256 = "0i4d99r3mwrfz1zjrh0wajgjyr5kskxn4s9k0rwk5l37an4130ml";
+          rev = "9107eecfc726f89b65f33dd103f06c07d3d5788c";
+          sha256 = "0kc85ripwjhjvjhwvx5cc2ks99xhaqmlb0inpd4d59f3x68pk69m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-ide";
           sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
           name = "cmake-ide";
         };
@@ -7155,11 +7239,11 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "03c0303d2e4bc07b9c5df1ecdbf89da6e36259d9";
-          sha256 = "198lvzy9zjdyrys5hcbhb1c5hnj01sh52xvjq0k6n8yvnnd3gmbr";
+          rev = "7b1fbcc4b035c591491c5033cbfbfc0aabd80fde";
+          sha256 = "0rb6wn635ylm58cpr7jq7821g0iw1mzb4b1h9mwrl57m6gcb5v98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-mode";
           sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
           name = "cmake-mode";
         };
@@ -7180,7 +7264,7 @@
           sha256 = "0fyzi8xac80wnhnwwm1j6yxpvpg1n4diq2lcl3qkj8klvk5gpxr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-project";
           sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
           name = "cmake-project";
         };
@@ -7198,7 +7282,7 @@
           sha256 = "13r8pjxknsfd6ywzlgcy4bm7fvr768ba34k6b7y365y3c1asz6y3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmds-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmds-menu";
           sha256 = "12s75y9d75cxqgg3hj0s4w0d10zy8y230b5gy09685ab5lcajfks";
           name = "cmds-menu";
         };
@@ -7219,7 +7303,7 @@
           sha256 = "0xdcw329d2gssx86iajwrgpr7yv69b9nflmzjgb4jvg4pskj4pgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmm-mode";
           sha256 = "184b8x19cnvx8z4dr9alv62wchzc7vr7crzz8jiyqw9d544zs50h";
           name = "cmm-mode";
         };
@@ -7240,7 +7324,7 @@
           sha256 = "1635k51ppivq6v2702fihq8dvi33445smds9zhqm0drnpv9rv5cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cn-outline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cn-outline";
           sha256 = "0cw1rr56hdngvhmx59j76hvkfzgybasn0fwhd6vwm709jqiiiwiz";
           name = "cn-outline";
         };
@@ -7261,7 +7345,7 @@
           sha256 = "1sx8grp3j7zcma3nb7zj6kijkdqx166vw1qgmm29hvx48bys6vlp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cobra-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cobra-mode";
           sha256 = "11jscpbclxlq2xqy2nsfa4y575bp8h0kpkp8cfjqb05lm5ybcp89";
           name = "cobra-mode";
         };
@@ -7282,7 +7366,7 @@
           sha256 = "0mcf0xyh4p6pk2hf1f554vy4amd0qcimspgnncff2a0qc2bsg5sy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/code-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/code-library";
           sha256 = "0gi8lz2q0vis4nyziykq15jp3m3vykfwycbk6amhf1ybkn9k3ywj";
           name = "code-library";
         };
@@ -7303,7 +7387,7 @@
           sha256 = "11v671c4338bsizbmm7ypp4x9s5hiwyddsg2ig6h157gfv2597pp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/codebug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/codebug";
           sha256 = "1cb2wvawp3wqslhgbmbw9xwcqgwfscqg0jfgqzi3nr42mjp9zgqj";
           name = "codebug";
         };
@@ -7324,7 +7408,7 @@
           sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/codesearch";
           sha256 = "0z7zvain9n0rm6bvrh3j7z275l32fmp46p4b33mizqd1y86w89nx";
           name = "codesearch";
         };
@@ -7345,7 +7429,7 @@
           sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/codic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/codic";
           sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
           name = "codic";
         };
@@ -7366,7 +7450,7 @@
           sha256 = "010v886ak0rbbhqwxwj6m0mkgh19s232igy7wwbv07l2pdqszf3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/coffee-fof";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/coffee-fof";
           sha256 = "02cqza46qp8y69jd33cg4nmcgvrpwz23vyxqnmzwwvlmnbky96yc";
           name = "coffee-fof";
         };
@@ -7387,7 +7471,7 @@
           sha256 = "0r0615q30awj77dwhvgz2cjmnfmvff9clg3krzr9zpskdkhdib8h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/coffee-mode";
           sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
           name = "coffee-mode";
         };
@@ -7406,7 +7490,7 @@
           sha256 = "1fpkymmgv58b734d2rr7cfj2j2if1qkwgrpk3yp2ibw2n2567y0s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/col-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/col-highlight";
           sha256 = "1kycjdlrg7a5x37b0pzqhg56yn7kaisryrk303qx1084kwq9464i";
           name = "col-highlight";
         };
@@ -7427,7 +7511,7 @@
           sha256 = "0jjj1miwc7hw2fbb1fnmfnydim81djswla8iy4waam9014yraqci";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/colemak-evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/colemak-evil";
           sha256 = "1bfzs5px1k6g3cnwjdaq2m78bbnfy3lxhjzkcch7zdv3nyacwl5z";
           name = "colemak-evil";
         };
@@ -7448,7 +7532,7 @@
           sha256 = "1k3sd07ffgpfhzg7d9mb1gc3n02zsvilxc30bgiycbjrbjgqq0i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/colonoscopy-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/colonoscopy-theme";
           sha256 = "0x9bfr4j0sp41jkgnyjlaxnnjjrc102x6sznn6cgcmqk5qhswl4q";
           name = "colonoscopy-theme";
         };
@@ -7469,7 +7553,7 @@
           sha256 = "0m98i8w513zdzkskw9a96dd73lnfbfwvr947b0djsrazn8grh6hv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-identifiers-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-identifiers-mode";
           sha256 = "1hxp8lzn7kfckn5ngxic6qiz3nbynilqlxhlq9k1n1llfg216gfq";
           name = "color-identifiers-mode";
         };
@@ -7490,7 +7574,7 @@
           sha256 = "1p1f30qz4nd5a8ym2iwrgp6vhws0dls2qlc0apblj9nj3b0ziv0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-moccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-moccur";
           sha256 = "17b9walfc5c9qfdvl9pcwb2gjikc3wxk1d3v878ckypmxd38vciq";
           name = "color-moccur";
         };
@@ -7510,7 +7594,7 @@
           sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme";
           sha256 = "1p4bjh8a9f6ixmwwnyjb520myk3bww1v9w6427za07v68m9cdh79";
           name = "color-theme";
         };
@@ -7531,7 +7615,7 @@
           sha256 = "1b0ymwszqsjcihcbfp7s4fjam983ixh3yb7sdc0rmqlyric1zwxq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-approximate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-approximate";
           sha256 = "1wdnia9q42x7vky3ks555iic5s50g4mx7ss5ppaljvgxvbxyxqh1";
           name = "color-theme-approximate";
         };
@@ -7552,7 +7636,7 @@
           sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-buffer-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-buffer-local";
           sha256 = "1448rffyzn5k5mr31hwd28wlj7if7rp5sjlqcsvbxd2mnbgkgjz0";
           name = "color-theme-buffer-local";
         };
@@ -7573,7 +7657,7 @@
           sha256 = "0q9ss11i31iiv0vn8238922fkic7j6d02f9ykbip04sm46p5k6kj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-modern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-modern";
           sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
           name = "color-theme-modern";
         };
@@ -7594,7 +7678,7 @@
           sha256 = "07703v8xyia1vx9s636aaql99i29a4r5v9z0lvaypixgsidshx10";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-sanityinc-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-sanityinc-solarized";
           sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
           name = "color-theme-sanityinc-solarized";
         };
@@ -7607,15 +7691,15 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20151215.2305";
+        version = "20160202.135";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "e309cb5a26228633797209276c5d48c070b90767";
-          sha256 = "1qs6n30amzv47d4d12z6jj506jsm5janp639jg9w65zibbp2dy7a";
+          rev = "22e40391f4a4be9455e4fa591c31a954a24dbeeb";
+          sha256 = "161xzd0jlwyafq2sck47z4igsrvrk2b1ibl206866hc56q9x1pmn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-sanityinc-tomorrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-sanityinc-tomorrow";
           sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
           name = "color-theme-sanityinc-tomorrow";
         };
@@ -7636,7 +7720,7 @@
           sha256 = "1ddscmxn6k00ip3mb4bjy4zxfklxv3jjnlbgwwr793qzwsi64vi7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-solarized";
           sha256 = "011rzq38ffmq7f2nzwrq96wwz67p82p1f0p5nib4nwqa47xlx7kf";
           name = "color-theme-solarized";
         };
@@ -7657,7 +7741,7 @@
           sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/colorsarenice-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/colorsarenice-theme";
           sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
           name = "colorsarenice-theme";
         };
@@ -7678,7 +7762,7 @@
           sha256 = "0ay4wrnyrdp4v3vjxr99hy8fpq6zsyh246c0gbp7bh63l5fx8nwr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/column-enforce-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/column-enforce-mode";
           sha256 = "1qh7kwr65spbbnzvq744gkksx50x04zs0nwn5ly60swc05d05lcg";
           name = "column-enforce-mode";
         };
@@ -7696,7 +7780,7 @@
           sha256 = "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/column-marker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/column-marker";
           sha256 = "1xgfsiw46aib2vb9bbjlgnhcgfnlfhdcxd0cl0jqj4fjfxzbz0bq";
           name = "column-marker";
         };
@@ -7717,7 +7801,7 @@
           sha256 = "0fnyksbynlmmvl39f4is0xjp6b13yshfazigbksv012hxp0whslm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/command-log-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/command-log-mode";
           sha256 = "11jq6055bvpwvrm0b8cgab25wa2mcyylpz4j56h1nqj7cnhb6ppj";
           name = "command-log-mode";
         };
@@ -7738,7 +7822,7 @@
           sha256 = "06y7ika4781gkh94ygdaz7a760s7ahrma6af6n7cqhgjyikz7lg1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/commander";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commander";
           sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
           name = "commander";
         };
@@ -7759,7 +7843,7 @@
           sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/comment-dwim-2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/comment-dwim-2";
           sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
           name = "comment-dwim-2";
         };
@@ -7769,6 +7853,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "commenter";
+        version = "20160131.39";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "commenter";
+          rev = "eec3bf91a57ff3aa3b93c36611e136572f031571";
+          sha256 = "1jvjwk776p9qrbr3j0368nqv8ydp8k0s6c66nfpcqf33rz4w1h1g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commenter";
+          sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3";
+          name = "commenter";
+        };
+        packageRequires = [ emacs let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/commenter";
+          license = lib.licenses.free;
+        };
+      }) {};
     commify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "commify";
@@ -7780,7 +7885,7 @@
           sha256 = "04bma9sdn7h8fjz62wlcwayzhr7lvzhidh48wc5rk195zlbgagwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/commify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commify";
           sha256 = "1jc6iqa4hna3277hx13scfcqzkr43yv6gndbxv7qf4ydi01ysd0m";
           name = "commify";
         };
@@ -7801,7 +7906,7 @@
           sha256 = "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/common-lisp-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/common-lisp-snippets";
           sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
           name = "common-lisp-snippets";
         };
@@ -7814,15 +7919,15 @@
     company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20160117.521";
+        version = "20160201.1600";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "faa8f84f19e786230858a4325625c7bcb18804f3";
-          sha256 = "1zhhp2vps5l5vxcza45cjwka4khhx2ar49jzhylj8iqcrgyml5gv";
+          rev = "a619a93069dab79b12d695fd4e8b043aa82d96ca";
+          sha256 = "0hy59hf2lq3w6wn5vsz839nrkijc87lyb8xyw2sj9jifd5ikpqi8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company";
           sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
           name = "company";
         };
@@ -7843,7 +7948,7 @@
           sha256 = "0r8ip22gr2ihicznyl2vbwgy3gsp5b5gy0m2i60001kyhssgmg6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-anaconda";
           sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
           name = "company-anaconda";
         };
@@ -7864,7 +7969,7 @@
           sha256 = "06gh33qzglv40r62dsapzhxwparw8ciblv80g7h6y6ilyazwcidn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ansible";
           sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
           name = "company-ansible";
         };
@@ -7885,7 +7990,7 @@
           sha256 = "067xb4mwfnmbqjyfv4717417fg7ysvz9flnx1nrk6iv96gnf4vfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-arduino";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-arduino";
           sha256 = "1bch447lllikip1xd90kdgssgc67sl04a70fxqkqlrc1bs6gkkws";
           name = "company-arduino";
         };
@@ -7914,7 +8019,7 @@
           sha256 = "0mkyg9y1rhl6hdzhr51psnvy2q0zw4y29m9p0ivb7s643k3fjjp5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-auctex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-auctex";
           sha256 = "1jia80sqmm83kzjcf1h1d9iz2k4k9albzvfka5hx6hpa4h8nm5q4";
           name = "company-auctex";
         };
@@ -7935,7 +8040,7 @@
           sha256 = "16cva7ccc0hrc6yf659kpsznlk1bkgv525lqr4nj8a12q0avjdxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-c-headers";
           sha256 = "1715vnjr5cjiq8gjcd3idnpnijg5cg3sw3f8gr5x2ixcrip1hx3a";
           name = "company-c-headers";
         };
@@ -7956,7 +8061,7 @@
           sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-cabal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-cabal";
           sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
           name = "company-cabal";
         };
@@ -7969,15 +8074,15 @@
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20160118.1109";
+        version = "20160204.942";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "e8c1fe9ad3b1197077d33b25bbe7615f695a49b6";
-          sha256 = "1vq9n68ls4a4gmqk9fkysrnlxl2shpz5wjpjcphjs42h93vr7nqs";
+          rev = "484c5f058c8a6c30ac4b4dfdb23b362ddda80fed";
+          sha256 = "0wf7m6i6qrmcj469j9dnjl805b9x1a9hk5465av8dyv3zs5csj5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-coq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-coq";
           sha256 = "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa";
           name = "company-coq";
         };
@@ -7998,7 +8103,7 @@
           sha256 = "0qbis9jqcrgj71cf8i9yfxsm7yj6d546gxw6linqd7slqn97l8rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-dcd";
           sha256 = "03849k4jzs23iglk9ghcq6283c9asffcq4dznypcjax7y4x113vd";
           name = "company-dcd";
         };
@@ -8026,7 +8131,7 @@
           sha256 = "1fx9hch42kax95nd8zadsbnadq9cylrna0qf0q4bx5yj1afz91p1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-edbi";
           sha256 = "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm";
           name = "company-edbi";
         };
@@ -8047,7 +8152,7 @@
           sha256 = "1lm26av6z18p70gxz23h87l25airawljr5lm7hw6krg706cp3aq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-emoji";
           sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
           name = "company-emoji";
         };
@@ -8068,7 +8173,7 @@
           sha256 = "1rg6jynzp37qnaq4lj48sfrhmv7mgcd2rzkixbpb3hgsy10dj9j0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-flx";
           sha256 = "1r4jcfzrhdpclblfrmi4qbl8dnhc2d7d4c1425xnslg7bhwd2vxn";
           name = "company-flx";
         };
@@ -8089,7 +8194,7 @@
           sha256 = "06ljm0ysz8czdr32gfq1y3nm3jcywihdszgnc2alx1hcgqiq0ds6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ghc";
           sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
           name = "company-ghc";
         };
@@ -8110,7 +8215,7 @@
           sha256 = "0jsnf60nz37s4csk8pnyr45fjdsac1ls64fvsh5gzi6hipxz5y6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ghci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ghci";
           sha256 = "0h9hqfb8fm90h87bi3myl84nppbbminhnvv6jqg62qi9k6snn1iq";
           name = "company-ghci";
         };
@@ -8127,11 +8232,11 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "9779bffba5e4e87b4750f718b6fa7f088c1fa6e3";
-          sha256 = "0b25iczbg72pg1525ql6hb6jyx5vck8bqn5z8f4dy9a94qpgxszl";
+          rev = "db85a48a7870f46784edc202c780b19e2f65053a";
+          sha256 = "15jjmhw3pd4hx1khbvrypd8s2kh3ymkf8p4qh1c9rbw9csypj3al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-go";
           sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
           name = "company-go";
         };
@@ -8152,7 +8257,7 @@
           sha256 = "0fnv4rvvs9rqzrs86g23jcrpg0rcgk25299hm6jm08ia0kjjby1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-inf-ruby";
           sha256 = "0cb1w0sxgb5jf0p2a5s2i4d511lsjjhyaqkqlwjz8nk4w14n0zxm";
           name = "company-inf-ruby";
         };
@@ -8173,7 +8278,7 @@
           sha256 = "0y1a9wxk9w2jk4177hkqzgqzknswikxc1dc60hzj4samyp2jhvfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-irony";
           sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
           name = "company-irony";
         };
@@ -8194,7 +8299,7 @@
           sha256 = "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-irony-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-irony-c-headers";
           sha256 = "0kiag5ggmc2f5c3gd8nn40x16i686jpdrfrflgrz2aih8p3g6af8";
           name = "company-irony-c-headers";
         };
@@ -8215,7 +8320,7 @@
           sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-jedi";
           sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
           name = "company-jedi";
         };
@@ -8228,15 +8333,15 @@
     company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
     melpaBuild {
         pname = "company-math";
-        version = "20150830.1837";
+        version = "20160119.748";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "company-math";
-          rev = "f5cedcfa73e5ddd445167969e87ddf8e1bbd2bc1";
-          sha256 = "0pxg9851pl7ck58qiz4swj2c0by914d4bn14c5imfvdn5hxnq19i";
+          rev = "21ac1c7a4077a20746bff00a85150f82f6c3130a";
+          sha256 = "114z2p5ivdsfhkir9yzrm4zw34c8jlilwqyyd4y5ing8awc9jhv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-math";
           sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
           name = "company-math";
         };
@@ -8257,7 +8362,7 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-nand2tetris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-nand2tetris";
           sha256 = "1g2i33jjh7kbpzk835kbnqicf0w4cq5rqv934bqzz5kavj9cg886";
           name = "company-nand2tetris";
         };
@@ -8278,7 +8383,7 @@
           sha256 = "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-nixos-options";
           sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
           name = "company-nixos-options";
         };
@@ -8299,7 +8404,7 @@
           sha256 = "07vcxwqynji7ggy9sb8lgpinkfjdiav0aybn5pnb0v8ck9v1w6k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-qml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-qml";
           sha256 = "0sva7i93dam8mc2z3cp785vmgcg7cphrpkwyvqyqhq8w51qg8mxx";
           name = "company-qml";
         };
@@ -8312,15 +8417,15 @@
     company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "company-quickhelp";
-        version = "20150804.519";
+        version = "20160204.647";
         src = fetchFromGitHub {
           owner = "expez";
           repo = "company-quickhelp";
-          rev = "05e0ee9b854f90ff2b007b3e19446a02513f43dc";
-          sha256 = "0hg3wrfhz3qlfb6zv6j5a4xzmm4jk25pkv8h3ryg7sl7h602idgl";
+          rev = "24f89640729210f6c7056b66e30d72282a211b3a";
+          sha256 = "0qsz03ps9654wn965s31r85va3fwj3zvwn5naijj85nm8zwb9lb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-quickhelp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-quickhelp";
           sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
           name = "company-quickhelp";
         };
@@ -8341,7 +8446,7 @@
           sha256 = "1lk3fqsgbi6mg4hrpc9gy4hbfp9snyj4yvc0zh8iqqw5nx12dab4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-racer";
           sha256 = "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4";
           name = "company-racer";
         };
@@ -8362,7 +8467,7 @@
           sha256 = "04829y7510zxjww9pq8afvnzwyyv30c0b3a71mxwf6ympfxb9rx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-restclient";
           sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
           name = "company-restclient";
         };
@@ -8389,7 +8494,7 @@
           sha256 = "1xzwalchl9lnq9848dlvhhbzyh1wkwbciz20d1iw0fsigj5g156c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-sourcekit";
           sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
           name = "company-sourcekit";
         };
@@ -8410,7 +8515,7 @@
           sha256 = "1b7p6g478para62bnpz5aqijaim8j72c9b27c2qahjmy2zj2f460";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-tern";
           sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
           name = "company-tern";
         };
@@ -8431,7 +8536,7 @@
           sha256 = "18hy60fm3b3dmp29cmzbs6grlihkwifjbzv30gprwj5f6x7m8knf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-try-hard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-try-hard";
           sha256 = "1rwn521dc8kxh43vcd3rf0h8jc53d4gmid3szj2msi0da1sk0mmj";
           name = "company-try-hard";
         };
@@ -8452,7 +8557,7 @@
           sha256 = "1a9qx041w7i1ahg6rmi82hv161k57z4aljzm8wpa9wrfj8a6df2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-web";
           sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
           name = "company-web";
         };
@@ -8473,7 +8578,7 @@
           sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ycm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ycm";
           sha256 = "1q4d63c7nr3g7q0smd55pp636vqa9lf1pkwjn9iq265369npvina";
           name = "company-ycm";
         };
@@ -8486,15 +8591,15 @@
     company-ycmd = callPackage ({ company, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s, ycmd }:
     melpaBuild {
         pname = "company-ycmd";
-        version = "20160106.834";
+        version = "20160203.1121";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "80c6d7c663b6ccc32b851348f1099790ac4c9736";
-          sha256 = "1c3c3frd9fdb77wkhg8f8g29dvr86ryzf9prg4pm8wvhifa4yhvg";
+          rev = "c64684df763411249985159ee33b10d948b9fc91";
+          sha256 = "12jwqhzqskdp2l6h60rich19rddzjcl94zaf72ljnq8h0mqc3xy0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ycmd";
           sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
           name = "company-ycmd";
         };
@@ -8515,7 +8620,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/concurrent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/concurrent";
           sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
           name = "concurrent";
         };
@@ -8536,7 +8641,7 @@
           sha256 = "0zz1k4h16pjdwiqavfbfbrbvi83ww93kgf838ap4f3n034hqfx20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/config-parser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/config-parser";
           sha256 = "0wncg1v4wccb9j16rcmwz8fcmrscj7knfisq0r4qqx3skrmpccah";
           name = "config-parser";
         };
@@ -8556,7 +8661,7 @@
           sha256 = "1l6970ng046hw2izzb15cbbbf83l6m8c9mvic8fzjixfi3g1dl55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/confluence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/confluence";
           sha256 = "003lykwd3ya0xwlahmm35nx9p6mk8vylq57yxrmgdcc64630bdpf";
           name = "confluence";
         };
@@ -8577,7 +8682,7 @@
           sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/conkeror-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/conkeror-minor-mode";
           sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
           name = "conkeror-minor-mode";
         };
@@ -8598,7 +8703,7 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/connection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/connection";
           sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
           name = "connection";
         };
@@ -8608,6 +8713,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    contextual = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "contextual";
+        version = "20160131.1237";
+        src = fetchFromGitHub {
+          owner = "lshift-de";
+          repo = "contextual";
+          rev = "8134a2d8034c624f4fdbbb0b3893de12f4257909";
+          sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/contextual";
+          sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
+          name = "contextual";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/contextual";
+          license = lib.licenses.free;
+        };
+      }) {};
     control-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "control-mode";
@@ -8619,7 +8745,7 @@
           sha256 = "1qsq543rb0z2fq716a2khs8zqyh13npzmbj58f00s8b3w3andpbh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/control-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/control-mode";
           sha256 = "1biq4p2w8rqcbvr09gxbchjqlaixjf1fzv7xv8lpv81dlhi7dgz6";
           name = "control-mode";
         };
@@ -8632,15 +8758,15 @@
     corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "corral";
-        version = "20151120.1809";
+        version = "20160129.1717";
         src = fetchFromGitHub {
           owner = "nivekuil";
           repo = "corral";
-          rev = "9a5ab7f293a23a4fec77ab4fb442d69ecfcc293f";
-          sha256 = "1q9jxg9khvjm7lqjhgfhdnb9j9620bq1k5b2cj74q8k4paa6kyyw";
+          rev = "d0b8cec7f2ff56a61775b14ba6969e97933517af";
+          sha256 = "1x87rra9pxvcs8jxnzhg2jr9wq0l3kp3qqqsw77bc4jsizdndss1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/corral";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/corral";
           sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
           name = "corral";
         };
@@ -8653,15 +8779,15 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20160112.927";
+        version = "20160201.1343";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "bcb81dde6e1abba02256d716426797a3e1b306f1";
-          sha256 = "0r1i6ck37yq92h7hc9pm6kqlh0751j8jj7vqrligghxk9d42r479";
+          rev = "00f08f74f1568b6f835abadecff32cd7c9a7a556";
+          sha256 = "0hnqw1mhaa7ybldd6mvz9lyv32yspn3x2bgx3fsrh8rhsmns06qh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/counsel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/counsel";
           sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
           name = "counsel";
         };
@@ -8682,7 +8808,7 @@
           sha256 = "1z67x4a0aricd9q6i2w33k74alddl6w0rijjhzyxwml7ibhbvphz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cp5022x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cp5022x";
           sha256 = "0v1jhkix01l299m67jag43rnps68m19zy83vvdglxa8dj3naz5dl";
           name = "cp5022x";
         };
@@ -8703,7 +8829,7 @@
           sha256 = "0kjkqylg0fncizrgcr8xx2qgjr8id41904n2pip0gicbry1n8bqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cpputils-cmake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cpputils-cmake";
           sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
           name = "cpputils-cmake";
         };
@@ -8724,7 +8850,7 @@
           sha256 = "0y37fx4ghx8a74cp7ci6p5yfpji8g42hlah2xcwfnyw0qlpqfbnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crab";
           sha256 = "1jz26bw2h7ahcb7y2qhpqrlfald244c92m6pvfrb0jg0z384i6aj";
           name = "crab";
         };
@@ -8745,7 +8871,7 @@
           sha256 = "12g6l6xlbs9h24q5lk8yjgk91xqd7r3v7r6czy10r09cmfjmkxbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crappy-jsp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crappy-jsp-mode";
           sha256 = "00wj61maib77qldzq06l9v0pbvp9jih75w1xw0ry9mij0r6ca8ii";
           name = "crappy-jsp-mode";
         };
@@ -8766,7 +8892,7 @@
           sha256 = "0l4bvk3m355b25d7pdnhczn3fckbq0rg2l4r0a0d94004ksvylqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/creds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/creds";
           sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
           name = "creds";
         };
@@ -8787,7 +8913,7 @@
           sha256 = "18c4jfjnhb7asdhwj41g06cp9rz5xd7bbx2s1xvk6gahay27rlrv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/creole";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/creole";
           sha256 = "1pqgm7m2gzkn65v3qic71c38qiira29cwx11l96qph8h8sf47zw5";
           name = "creole";
         };
@@ -8808,7 +8934,7 @@
           sha256 = "0japww5x89vd1ahjm2bc3biz6wxv94vvqq5fyyzkqsblgk5bys0h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/creole-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/creole-mode";
           sha256 = "1lj9a0bgn7lmc2wyjzzvmpaz1f1spj02l51ki2wydjbfhxq61k0s";
           name = "creole-mode";
         };
@@ -8829,7 +8955,7 @@
           sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crm-custom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crm-custom";
           sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
           name = "crm-custom";
         };
@@ -8850,7 +8976,7 @@
           sha256 = "1r9dhk8h8lq18vi0hjai8y4z42yjxg18786mcr2qs5m3q1ampf9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crontab-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crontab-mode";
           sha256 = "16qc2isvf6cgl5ihdbwmvv0gbhns4mkhd5lxkl6f8f6h0za054ci";
           name = "crontab-mode";
         };
@@ -8869,7 +8995,7 @@
           sha256 = "120hxk82i0r4qan4hfk9ldmw5a8bzv7p683lrnlcx9gyxgkia3am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crosshairs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crosshairs";
           sha256 = "1gf73li6q5rg1dimzihxq0rdxiqzbl2w78r1qzc9mxw3qj7azxqp";
           name = "crosshairs";
         };
@@ -8882,15 +9008,15 @@
     crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "crux";
-        version = "20160110.1501";
+        version = "20160130.1452";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "crux";
-          rev = "93304680ec4beea168651399b622e1ee4bff05aa";
-          sha256 = "1javwbj7kvwjff05m1w6v5nmbnk1p4x11c4k2ljx7349qjciw6af";
+          rev = "382834edb99de9b347d61beca8834838da199911";
+          sha256 = "0hrbh1vdr80l816zzzgd22vx77nl8ckc8b91z1gm675z6sqmipzf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crux";
           sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
           name = "crux";
         };
@@ -8911,7 +9037,7 @@
           sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cryptol-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cryptol-mode";
           sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
           name = "cryptol-mode";
         };
@@ -8932,7 +9058,7 @@
           sha256 = "0ry0087g1br3397js7a9iy6k2x6p0dgqlggxx9gaqhms7pmpq14b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cryptsy-public-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cryptsy-public-api";
           sha256 = "1v78rm44af3vgsml5f6kpwvnb4ks6n49br2fhjgh6nc7g3jmz97n";
           name = "cryptsy-public-api";
         };
@@ -8953,7 +9079,7 @@
           sha256 = "09b5n36z99asa81k7h7xr7906g1vpr3sg3kdcq2fdbznbpjydnvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/csharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/csharp-mode";
           sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
           name = "csharp-mode";
         };
@@ -8974,7 +9100,7 @@
           sha256 = "0ljhar80kk7k54jz1xiq4r0w6s1wkacl7qz9wkvvbzhjb0z049hq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/css-comb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/css-comb";
           sha256 = "1axwrvbc3xl1ixhh72bii3hhbi9d96y6i1my1rpvwqyd6f7wb2cf";
           name = "css-comb";
         };
@@ -8995,7 +9121,7 @@
           sha256 = "1mgc6bd0dzrp1dq1yj8m2qxjnpysd8ppdk2yp96d3zd07zllw4rx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/css-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/css-eldoc";
           sha256 = "1f079q3ccrr4drk2hvn4xs4vbrd3hg87xqbk3r9mmjvkagd1v7rf";
           name = "css-eldoc";
         };
@@ -9016,7 +9142,7 @@
           sha256 = "0hyf4im7b8zka065daw7yxrb3670dpp8q92vd2gcsva1jla92h9y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cssfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cssfmt";
           sha256 = "12yq4dhyv3p5gxnd2w193ilpj2d3gx5ns09w0z1zkg7ax3a4q4b8";
           name = "cssfmt";
         };
@@ -9037,7 +9163,7 @@
           sha256 = "1xf2hy077frfz8qf91c0l0qppcjxzr4bsbb622bx6fidqkpa3a1a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cssh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cssh";
           sha256 = "10yvvyzqr06jvijmzis9clb1slzp2mn80yclis8wvrmg4p8djljk";
           name = "cssh";
         };
@@ -9055,7 +9181,7 @@
           sha256 = "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/csv-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/csv-nav";
           sha256 = "0626vsm2f5zc2wi5pyx4xrwcr4ai8w9a3l7gi9883smvayr619sj";
           name = "csv-nav";
         };
@@ -9076,7 +9202,7 @@
           sha256 = "07vasdlai49qs0nsmq2cz1kcq1adqyarv8199imgwwcbh4vn7dqb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctable";
           sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
           name = "ctable";
         };
@@ -9095,7 +9221,7 @@
           sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctags";
           sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
           name = "ctags";
         };
@@ -9116,7 +9242,7 @@
           sha256 = "1va394nls4yi77rgm0kz5r00xiidj6lwcabhqxisz08m3h8gfkh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctags-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctags-update";
           sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
           name = "ctags-update";
         };
@@ -9137,7 +9263,7 @@
           sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctl-mode";
           sha256 = "0fydq779b0y6hmh8srfdimr5rl9mk3sj08rbvlljxv3kqv5ajczj";
           name = "ctl-mode";
         };
@@ -9158,7 +9284,7 @@
           sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctxmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctxmenu";
           sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
           name = "ctxmenu";
         };
@@ -9179,7 +9305,7 @@
           sha256 = "184plai32sn0indvi1dma6ykz907zgnrdyxdw6f5mghwca96g5kx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cucumber-goto-step";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cucumber-goto-step";
           sha256 = "1ydsd455dvaw6a180b6570bfgg0kxn01sn6cb57smqj835am6gx8";
           name = "cucumber-goto-step";
         };
@@ -9200,7 +9326,7 @@
           sha256 = "1ms0z5zplcbdwwdbgsjsbm32i57z9i2i8j9y3wm0pwzyz4zr36zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cuda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cuda-mode";
           sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
           name = "cuda-mode";
         };
@@ -9218,7 +9344,7 @@
           sha256 = "1w0msh4mfhwglkwgb8ksqfdzbd1bvspllydnjzhc0yl3s7qrifbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cursor-chg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cursor-chg";
           sha256 = "0d1ilall8c1y4w014wks9yx4fz743hvx5lc8jqxxlrq7pmqyqdxk";
           name = "cursor-chg";
         };
@@ -9239,7 +9365,7 @@
           sha256 = "0wmnhizv4jfcl1w9za4ydxf6xwxgm5vwmn1zi5vn70zmv4d6r49l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cursor-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cursor-test";
           sha256 = "1c1d5xq4alamlwyqxjx557aykz5dw87acp0lyglsrzzkdynbwlb1";
           name = "cursor-test";
         };
@@ -9257,7 +9383,7 @@
           sha256 = "1p0kacbw5zfrd7zplhlh7j1890spvn8p0bryvqqmyf8w5873pcmh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cus-edit+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cus-edit+";
           sha256 = "1kazcdfajcnrzvhsgsmwwx96rkry0dglprrc02hbd7ky1fppp4sz";
           name = "cus-edit-plus";
         };
@@ -9270,15 +9396,15 @@
     cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cyberpunk-theme";
-        version = "20151215.1153";
+        version = "20160121.1912";
         src = fetchFromGitHub {
           owner = "n3mo";
           repo = "cyberpunk-theme.el";
-          rev = "5fee81bccb07d40ff1d41aa2342ca29639b057b0";
-          sha256 = "1zx93qb83ji2jf3dya9m7prii58aj4y94h10ynldls45cqk3chz4";
+          rev = "4ffdaee0a32b8e235bf44c0daedde66eaf7b1b33";
+          sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cyberpunk-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cyberpunk-theme";
           sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
           name = "cyberpunk-theme";
         };
@@ -9299,7 +9425,7 @@
           sha256 = "1d5i8sm1xrsp4v4myidfyb40hm3wp7hgva7dizg9gbb7prmn1p5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cycbuf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cycbuf";
           sha256 = "0gyj48h5wgjawqq3j4hgk5a8d23nffmhd1q53kg7b9vfsda51hbw";
           name = "cycbuf";
         };
@@ -9320,7 +9446,7 @@
           sha256 = "0hf3r89n9zn7wkay71drxadsnd9zm6p6kvg5mvwzdy3x3z4cfyi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cycle-resize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cycle-resize";
           sha256 = "0vp57plwqx4nf3pbv5g4frjriq8niiia9xc3bv6c3gzd4a0zm7xi";
           name = "cycle-resize";
         };
@@ -9341,7 +9467,7 @@
           sha256 = "125s6vwbb9zpx6h3vrxnn7nr8pb45vhxd70ba2r3f87dlxah93am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cycle-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cycle-themes";
           sha256 = "1whp9q26sgyf59wygbrvdf9gc94bn4dmhr2f2qivpajx550fjfbc";
           name = "cycle-themes";
         };
@@ -9359,7 +9485,7 @@
           sha256 = "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cygwin-mount";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cygwin-mount";
           sha256 = "0ik2c8ab9bsx58mgcv511p50h45cpv7455n4b0kri83sx9xf5abb";
           name = "cygwin-mount";
         };
@@ -9380,7 +9506,7 @@
           sha256 = "1xcd8j5chh5j3fibi8bg2il6r09vza5xlb5fqm9j8sg3vkab26z8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cyphejor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cyphejor";
           sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
           name = "cyphejor";
         };
@@ -9401,7 +9527,7 @@
           sha256 = "0vbcq807jpjssabmyjcdkpp6nnx1288is2c6x79dkrviw2xxw3qf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cypher-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cypher-mode";
           sha256 = "174rfbm7yzkznkfjmh9bdnm5fgqv9bjwm85h39317pv1g8c3mgv0";
           name = "cypher-mode";
         };
@@ -9418,11 +9544,11 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "dace1e6c1475fdd3e5ea9c66b91caf93a8cbd215";
-          sha256 = "0a1r73qf43n9h5r4ikc250588l64z1zvdb3kjmlwzyhlpzszmll5";
+          rev = "fa946e8435a4dcc3497fc7b0f4e87256d40844ba";
+          sha256 = "1w09wwp6gaa0c65mwa9jfcjksppxqv1xb7mlgsk1wxbyprcllaq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cython-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cython-mode";
           sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
           name = "cython-mode";
         };
@@ -9443,7 +9569,7 @@
           sha256 = "1ck1a61m0kjynqwzbw9hnc7y2a6gd6l1430wm7mw3qqsq959qwm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/czech-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/czech-holidays";
           sha256 = "10c0zscbn7pr9xqdqksy4kh0cxjg9bhw8p4qzlk18fd4c8rhqn84";
           name = "czech-holidays";
         };
@@ -9464,7 +9590,7 @@
           sha256 = "0fqirypxhbvnhz86rznwdx553ppg0z0hxh1h04qg7y58g01vpsdq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/d-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/d-mode";
           sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
           name = "d-mode";
         };
@@ -9485,7 +9611,7 @@
           sha256 = "0fp40cyamchc9qq5vbpxgq3yp6vs8p3ncg46mjzr54psy3fc86dm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dactyl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dactyl-mode";
           sha256 = "0ppcabddcpwshfd04x42nbrbkagbyi1bg4vslysnlxn4kaxjs7pm";
           name = "dactyl-mode";
         };
@@ -9506,7 +9632,7 @@
           sha256 = "0fd0h07m42q2h1ggsjra20kzv209rpb4apjv408h2dxqm8sy0jiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dakrone-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dakrone-theme";
           sha256 = "0ma4rfmgwd6k24jzn6pgk46b88jfix7mz0ib7c7r90h5vmpiq814";
           name = "dakrone-theme";
         };
@@ -9519,15 +9645,15 @@
     darcula-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darcula-theme";
-        version = "20160106.1552";
+        version = "20160123.1627";
         src = fetchFromGitHub {
           owner = "fommil";
           repo = "darcula-theme-emacs";
-          rev = "52ab72417b510778946d98d560213ecb5c9ec5cc";
-          sha256 = "1029m6iyg2j6rvjz7kq23zj7fws2j7ilqkicws5wyjcznz0ijan1";
+          rev = "05c98433e23f2018e2e065dcdc534d73dac8e88e";
+          sha256 = "1abwx7fqbr395z3l3dshh242lxqpwr1mszmj1pxj420qi1qria6n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darcula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darcula-theme";
           sha256 = "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg";
           name = "darcula-theme";
         };
@@ -9548,7 +9674,7 @@
           sha256 = "07w5aycgaps904q8lk52d0g28wxq41c82xgl5mw2q56n3s5iixfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dark-krystal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dark-krystal-theme";
           sha256 = "056aql35502sgvdpbgphpqdxzbjf4ay01rra6pm11c1dya8avv0j";
           name = "dark-krystal-theme";
         };
@@ -9569,7 +9695,7 @@
           sha256 = "1w0y2j0j9n107dbk7ksr9bipshjfs9dk08qbs9m6h5aqh4hmwa4r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dark-souls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dark-souls";
           sha256 = "1ilsn657mpl7v8vkbzqf3gp0gmvy0dgynfsn8w4cb49qaiy337xc";
           name = "dark-souls";
         };
@@ -9590,7 +9716,7 @@
           sha256 = "19vrxfzhi0sqf7frzjx5z02d65r2jp1w2nhhf0527g7baid5hqvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darkburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darkburn-theme";
           sha256 = "18hwdnwmkf640vcyx8d66i424wwazbzjq3k0w0xjmwsn2mpyhm9w";
           name = "darkburn-theme";
         };
@@ -9611,7 +9737,7 @@
           sha256 = "0ajxlrnz1228w8ldgraw6a4s605isbr67p8s382jvia2zf821fmp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darkmine-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darkmine-theme";
           sha256 = "06vzldyqlmfd11g8dqrqh5x244ikfa20qwpsmbgsiry3041k8iw5";
           name = "darkmine-theme";
         };
@@ -9632,7 +9758,7 @@
           sha256 = "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darktooth-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
           name = "darktooth-theme";
         };
@@ -9653,7 +9779,7 @@
           sha256 = "1pd7a76znzypwi0khssdlas5kcma8r865d68jmr3n6xvwdmy8dlc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dart-mode";
           sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
           name = "dart-mode";
         };
@@ -9674,7 +9800,7 @@
           sha256 = "1g7vrfhafmkqwdpfllfiwirl4pi437pyaws38jsd8laxmsa4m4wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash";
           sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
           name = "dash";
         };
@@ -9695,7 +9821,7 @@
           sha256 = "0zd50sr51mmvndjb9qfc3sn502nhc939rhd454jbkmlrzqsxvphj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash-at-point";
           sha256 = "0x4nq42nbh2qgbg111lgbknc7w7m7lxd14mp9s8dcrpwsaxz960m";
           name = "dash-at-point";
         };
@@ -9716,7 +9842,7 @@
           sha256 = "1g7vrfhafmkqwdpfllfiwirl4pi437pyaws38jsd8laxmsa4m4wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash-functional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash-functional";
           sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
           name = "dash-functional";
         };
@@ -9737,7 +9863,7 @@
           sha256 = "0l4z9rjla4xvm2hmp07xil69q1cg0v8iff0ya41svaqr944qf7hf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/date-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/date-at-point";
           sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
           name = "date-at-point";
         };
@@ -9758,7 +9884,7 @@
           sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/date-field";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/date-field";
           sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
           name = "date-field";
         };
@@ -9779,7 +9905,7 @@
           sha256 = "0ry7magy9x63xv2apjbpgszp0slch92g23gqwl4rd564qafajmf0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/datomic-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/datomic-snippets";
           sha256 = "0lax0pj4k9c9n0gmrvil240pc9p25535q3n5m8nb2ar4sli8dn8r";
           name = "datomic-snippets";
         };
@@ -9800,7 +9926,7 @@
           sha256 = "1j0mk8vyr6sniliq0ix77jldx8vzl73nd5yhh82klzgyymal58ms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dayone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dayone";
           sha256 = "0hi09dj00h6g5r84jxglwkgbijhfxknx4mq5gcl5jzjis5affk8l";
           name = "dayone";
         };
@@ -9821,7 +9947,7 @@
           sha256 = "0syv4kr319d34yqi4q61b8jh5yy22wvd148x1m3pc511znh2ry5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/db";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/db";
           sha256 = "05jhga9n6gh1bmj8gda14sb703gn7jgjlvy55mlr5kdb2z3rqw1n";
           name = "db";
         };
@@ -9842,7 +9968,7 @@
           sha256 = "15r0qwjkl33p8kh2k5kxz9wnbkv1k470b1h0i6svvljkx9ynk68a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/db-pg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/db-pg";
           sha256 = "06nfibw01ijv7nr0m142y80jbbpg9kk1dh19s5wq7i6fqf7g08xg";
           name = "db-pg";
         };
@@ -9855,16 +9981,16 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20160117.27";
+        version = "20160130.2300";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "337b29c3c2cac8920f7066ec457aeb5f62644297";
-          sha256 = "1a42bwarhciccl0yhh9i24bc9f3n5c0wlnwqfcwkb7wzqy9gd55q";
+          rev = "64ad0ea6d03c0d46030cc5aaa3715b5cf3a82d3c";
+          sha256 = "02bsiq0kxm9cbbr6hr20ac4888mcyk0i8p9hrrdvaijq4fhkk76b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ddskk";
-          sha256 = "1wj3z6ldlkaj99xqh7a497in1syn7shf2w1ffcn6aiskxjrzmpiq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ddskk";
+          sha256 = "01pb00p126q7swsl12yjrhghln2wgaj65jhjr0k7dkk64x4psyc9";
           name = "ddskk";
         };
         packageRequires = [ ccc cdb ];
@@ -9884,7 +10010,7 @@
           sha256 = "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/debpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/debpaste";
           sha256 = "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw";
           name = "debpaste";
         };
@@ -9905,7 +10031,7 @@
           sha256 = "1n99nrp42slmyp5228d1nz174bysjn122jgs8fn1x0qxywg7jyxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/debug-print";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/debug-print";
           sha256 = "01dsqq2qdsbxny6j9dhvg770493awxjhk1m85c14ysgh6sl199rm";
           name = "debug-print";
         };
@@ -9926,7 +10052,7 @@
           sha256 = "01bafkc99g9vi45y95mi3sqin2lsfw885z63f7llpqvnfav86n4y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/decl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/decl";
           sha256 = "0wdhmp226wmrjvjgpbz8ihvhxxv3rrxh97sdqm3mgsav3n071n6k";
           name = "decl";
         };
@@ -9947,7 +10073,7 @@
           sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dedicated";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dedicated";
           sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
           name = "dedicated";
         };
@@ -9968,7 +10094,7 @@
           sha256 = "1haixiy94r50rfza64dypb7fi256231pf06g6p2il9kyscqg0zz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dedukti-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dedukti-mode";
           sha256 = "17adfmrhfks5f45ddr6ygjq870ac50vfzc5872ycv414zg0w4sa9";
           name = "dedukti-mode";
         };
@@ -9989,7 +10115,7 @@
           sha256 = "1ysv1q7n7k2l4x8x7hlzmxmawyxl5lx627sbdv3phkvjh5zccsm8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/default-text-scale";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/default-text-scale";
           sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
           name = "default-text-scale";
         };
@@ -10010,7 +10136,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/deferred";
           sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
           name = "deferred";
         };
@@ -10031,7 +10157,7 @@
           sha256 = "02i621yq2ih0zp7mna8iykj41prv77hvcadz7rx8c942zyvjzxqd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/define-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/define-word";
           sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
           name = "define-word";
         };
@@ -10052,7 +10178,7 @@
           sha256 = "07jzr571q02l0lg5d40rnmzg16hmybi1nkjgslmvlx46z3c4xvyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/defproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/defproject";
           sha256 = "1gld2fkssrjh4smpp54017549d6aw3n1zisp5s4kkb6cmszwj5gm";
           name = "defproject";
         };
@@ -10071,7 +10197,7 @@
           sha256 = "15c3ec6fcfae63201652394205fee951f3c1db8d3c6fc5f48c306b9b775c8e63";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/deft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/deft";
           sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
           name = "deft";
         };
@@ -10089,7 +10215,7 @@
           sha256 = "1gap2icsqi7cryfvcffh41zqg2ghl4y7kg9pngzdfjrc3m7sf635";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/delight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/delight";
           sha256 = "1d9m5k18k73vhidwd50mcbq7mlvwdn4sb9ih8r5gri9a9whi2nkj";
           name = "delight";
         };
@@ -10110,7 +10236,7 @@
           sha256 = "06a20sd8nc273azrgha40l1fbqvv9qmxsmkjiqbf6dcf1blkwjyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/delim-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/delim-kill";
           sha256 = "1pplc456771hi52ap1p87y7pabxlvm6raszcxjvnxff3xzw56pig";
           name = "delim-kill";
         };
@@ -10131,7 +10257,7 @@
           sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/demangle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/demangle-mode";
           sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
           name = "demangle-mode";
         };
@@ -10152,7 +10278,7 @@
           sha256 = "1hdnjwsmwbwn0ziyw805jjpaj3zpm374g9y4yn5ip4l9x4vq73xv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/demo-it";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/demo-it";
           sha256 = "063v115xy9mcga4qv16v538k12rn9maz92khzwa35wx56bwz4gg7";
           name = "demo-it";
         };
@@ -10173,7 +10299,7 @@
           sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/describe-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/describe-number";
           sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
           name = "describe-number";
         };
@@ -10194,7 +10320,7 @@
           sha256 = "18k5898r4n96h93xsvjrpm90hz3rd0ir6x3axjzqwwrgs2ik7pj2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/desktop+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/desktop+";
           sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
           name = "desktop-plus";
         };
@@ -10214,7 +10340,7 @@
           sha256 = "7c7727dd1d63be98e428700bfe340f2c4e7ff713fcc9b2b743a3366d786ae02d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/desktop-registry";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/desktop-registry";
           sha256 = "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr";
           name = "desktop-registry";
         };
@@ -10234,7 +10360,7 @@
           sha256 = "0lg6i9vw6xsnaamfjczz0cr41vlv1bs03h8c8y2jxpdkgaab31nc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dic-lookup-w3m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dic-lookup-w3m";
           sha256 = "0myv7sns9ajyr7fzn6kd8a64pfapjdksgby5ilh9mr99imm8dcfv";
           name = "dic-lookup-w3m";
         };
@@ -10255,7 +10381,7 @@
           sha256 = "0b8yg03h5arfl5rlzlg2a6q7nhx452mdyngizjzxlvkmrqnlra4v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dictcc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dictcc";
           sha256 = "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm";
           name = "dictcc";
         };
@@ -10276,7 +10402,7 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dictionary";
           sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
           name = "dictionary";
         };
@@ -10289,15 +10415,15 @@
     diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "diff-hl";
-        version = "20160114.1759";
+        version = "20160203.1701";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "diff-hl";
-          rev = "167a2dd16bbf963773c9198b391921ce05324fc8";
-          sha256 = "020dhrdy375w4myinhm6hs391r9bsmxcndrlzj8hp8qqa2ilk5w7";
+          rev = "f4edea201bc4c38d082ec3143ceec87d2dcadb37";
+          sha256 = "0sjwpvzd4x9c1b9iv66b33llvp96ryyzyp8pn1rnhvxfvjv43cnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diff-hl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diff-hl";
           sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
           name = "diff-hl";
         };
@@ -10318,7 +10444,7 @@
           sha256 = "14ccak3cmv36pd085188lypal9gd3flyikcrxn0wi6hn60w2dgvr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diffscuss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diffscuss-mode";
           sha256 = "06jd7wh4yzryz0yjwa4a0xddz7srl5mif8ff1wvcpxsb66m2zbvh";
           name = "diffscuss-mode";
         };
@@ -10339,7 +10465,7 @@
           sha256 = "0diw887x4q7kbgdvxbbnxdw51z33kqwxw3v9m45fczxbywyi4cxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diffview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diffview";
           sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
           name = "diffview";
         };
@@ -10360,7 +10486,7 @@
           sha256 = "0rjqfpya6wkf8nv00q2d40fcnssnsr3p07j9blbpcrqalkdm27ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/digistar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/digistar-mode";
           sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
           name = "digistar-mode";
         };
@@ -10381,7 +10507,7 @@
           sha256 = "17jfmgyras32w9xr8fldqj924bijgng4bjg9fy6ckwb3mgihyil8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dim";
           sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
           name = "dim";
         };
@@ -10402,7 +10528,7 @@
           sha256 = "0bw1gkaycbbv2glnaa36gwzkl1l6lsq7i2i7jinka92b27zvrans";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dim-autoload";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dim-autoload";
           sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
           name = "dim-autoload";
         };
@@ -10423,7 +10549,7 @@
           sha256 = "04vfc5zgcjp0pax5zk1x98ivx5g349c5g3748lb9pgsijqaprgg4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diminish";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diminish";
           sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
           name = "diminish";
         };
@@ -10444,7 +10570,7 @@
           sha256 = "1ldqxdwy6r0fd2vh0ckkhgpincvybghavi8c7vvyd24j91i57y2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dionysos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dionysos";
           sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
           name = "dionysos";
         };
@@ -10465,7 +10591,7 @@
           sha256 = "0mcsfsybpsxhzkd2m9bzc0np49azm6qf5x4x9h9lbxc8vfgh4z8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dircmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dircmp";
           sha256 = "0cnj7b0s8vc83sh9sai1cldw54krk5qbz1qmlvvd1whryf2pc95c";
           name = "dircmp";
         };
@@ -10475,6 +10601,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-atool";
+        version = "20160203.458";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "dired-atool";
+          rev = "8a1fb134875e83bf0ffeb693d02066c96c1c312f";
+          sha256 = "1i4q65y6r1npcxsp7fjk695my668jys46cq62syv2b8c4vbgapn3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool";
+          sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w";
+          name = "dired-atool";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-atool";
+          license = lib.licenses.free;
+        };
+      }) {};
     dired-avfs = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-avfs";
@@ -10482,11 +10629,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-avfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-avfs";
           sha256 = "1q42pvrpmd525887iicd3m5gw4w2a78xb72v7fjfl30ay1kir4bm";
           name = "dired-avfs";
         };
@@ -10504,7 +10651,7 @@
           sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-details";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-details";
           sha256 = "1390vl3i4qbnl7lbia98wznhf6x887d24f8p7146fpqjsiwbm5ck";
           name = "dired-details";
         };
@@ -10523,7 +10670,7 @@
           sha256 = "07z4h5l8763ks6b6m8dcmq78jiyq4xvan1mb0z8fbasmi1bsrya4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-details+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-details+";
           sha256 = "1gzr3z4nyzip299z08mignhigxr7drak7rv9z6gmdjrika9a29lx";
           name = "dired-details-plus";
         };
@@ -10544,7 +10691,7 @@
           sha256 = "1lcmpzwj43gix2q56bh2gw3gfqh8vl5j3mqr8s7v3k0aw816j0ni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-dups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-dups";
           sha256 = "05s02gw8b339yvsr7vvka1r2140y7mbjzs8px4kn4acgb5y7rk71";
           name = "dired-dups";
         };
@@ -10565,7 +10712,7 @@
           sha256 = "0jj9da880b4zwxba140fldai1x9p2sxc6hdf3wz6lnbvz1pyn1mv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-efap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-efap";
           sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
           name = "dired-efap";
         };
@@ -10586,7 +10733,7 @@
           sha256 = "1lnqjkbzryv655n16xj1c5bxck2jb5ccy8yckz1wp5yikkr06ba8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-fdclone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-fdclone";
           sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
           name = "dired-fdclone";
         };
@@ -10607,7 +10754,7 @@
           sha256 = "0v6n4ymlnphzmqaqlfbxvf24dh1pa0xy37xhz9xfjkk02l02wsgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-filetype-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-filetype-face";
           sha256 = "1g9wzkkqmlkxlxwx43446q9mlam035zwq0wzpf7m6394rw2xlwx6";
           name = "dired-filetype-face";
         };
@@ -10620,15 +10767,15 @@
     dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-filter";
-        version = "20160117.930";
+        version = "20160201.1426";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-filter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-filter";
           sha256 = "1mw94210i57wrqfyif6rh689xbwbpv1qp6bgc0j7z6g4xypvd52p";
           name = "dired-filter";
         };
@@ -10645,11 +10792,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-hacks-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-hacks-utils";
           sha256 = "1vgl0wqf7gc2nbiqjn0rkrdlnxfm3wrgspx5b3cixv2n8rqx8kyi";
           name = "dired-hacks-utils";
         };
@@ -10670,7 +10817,7 @@
           sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-imenu";
           sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
           name = "dired-imenu";
         };
@@ -10691,7 +10838,7 @@
           sha256 = "13xpbbdd190lklz8jmj8nw8qm414kpkij9wrd7a9ws9j1jzj8x6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-k";
           sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
           name = "dired-k";
         };
@@ -10704,15 +10851,15 @@
     dired-narrow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-narrow";
-        version = "20160103.622";
+        version = "20160130.1045";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-narrow";
           sha256 = "1rgqiscbizalh78jwc53zbj599dd13a6vzdgf75vzllc1w7jsg6d";
           name = "dired-narrow";
         };
@@ -10729,11 +10876,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-open";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-open";
           sha256 = "0a4ksz2jkva4gvhprywjc1fzrbf95xdk8gn25nv1h1c1ckhr91qx";
           name = "dired-open";
         };
@@ -10745,13 +10892,13 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20151231.1449";
+        version = "20160124.2107";
         src = fetchurl {
           url = "http://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "0d92kx5rr899cjpr280fwcisxlivq2jx1sm5w11mg82qmpsf31nx";
+          sha256 = "0fhag6jhb97jg50rb32s93mml0adncsd58z9grs7l95zva439pc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired+";
           sha256 = "1dmp6wcynran03nsa0fd26b9q0zj9wp8ngaafx1i1ybwn2gx32g5";
           name = "dired-plus";
         };
@@ -10768,11 +10915,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-rainbow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-rainbow";
           sha256 = "1b9yh8p2x1dg7dyqhjhnqqiiymyl6bwsam65j0lpvbdx8r4iw882";
           name = "dired-rainbow";
         };
@@ -10789,11 +10936,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-ranger";
           sha256 = "19lbbzqflqda5b0alqfzdhpbgqssghqb4n4viq8x4l1fac8mby6h";
           name = "dired-ranger";
         };
@@ -10814,7 +10961,7 @@
           sha256 = "01xvaqckyr31ywsn1fp9sz9wq4h4dd1hgghfqypc9s4akrxmgnf2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-single";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-single";
           sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
           name = "dired-single";
         };
@@ -10832,7 +10979,7 @@
           sha256 = "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-sort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-sort";
           sha256 = "1dzy2601yikmmbfqivf9s5xi4vd1f5g3c53f8rc74kfnxr1qn59x";
           name = "dired-sort";
         };
@@ -10850,7 +10997,7 @@
           sha256 = "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-sort-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-sort-menu";
           sha256 = "0n7zh8s3vdw3pcax8wkas9rykf917wn2dzikdlyrl5bbil9ijblb";
           name = "dired-sort-menu";
         };
@@ -10869,7 +11016,7 @@
           sha256 = "1hjci4zfzig04ji1jravxg9n67rdr4wyhmxmahbrzq9kjnql510i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-sort-menu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-sort-menu+";
           sha256 = "19ah8qgbfdvyhfszdr6hlw8l01lbdb84vf5snldw8qh3x6lw8cfq";
           name = "dired-sort-menu-plus";
         };
@@ -10886,11 +11033,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-subtree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-subtree";
           sha256 = "1vqcnkh3g6dwi2hwfkb534q0j19pkqzqk3yb7ah8ck4z4ln4ppfk";
           name = "dired-subtree";
         };
@@ -10911,7 +11058,7 @@
           sha256 = "1yx20h16hc1b04knsqhrxni0j8qgwnq7i5b0dlggq3dakcvqfxma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-toggle";
           sha256 = "18v571kp440n5g1d7pj86rr8dgbbm324f9vblkdbdvn13c5dczf5";
           name = "dired-toggle";
         };
@@ -10932,7 +11079,7 @@
           sha256 = "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-toggle-sudo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-toggle-sudo";
           sha256 = "0fy05af9aq9791ij4j9pscdk5j44pbg0kmhpqli41qiazjw7v2va";
           name = "dired-toggle-sudo";
         };
@@ -10953,7 +11100,7 @@
           sha256 = "1rx7vq6yl83fbmb76sczbb1bv972s4cyg160sm2yap1i6nzhd10p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diredful";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diredful";
           sha256 = "0y8x6q1yfsk0srxsh4g5nbsms1g9pk9d103jx7cfdac79mcigw7x";
           name = "diredful";
         };
@@ -10974,7 +11121,7 @@
           sha256 = "0mis3m6lg3vlvp8qm8iajprgx3pm3gcbhdszsm9mvrcgkahdjqnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/direx";
           sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
           name = "direx";
         };
@@ -10995,7 +11142,7 @@
           sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/direx-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/direx-grep";
           sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
           name = "direx-grep";
         };
@@ -11014,7 +11161,7 @@
           sha256 = "1q03q4j0wkbg9p2nzf1kb7l517b21mskp2v52i95jbxh09igbjjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dirtree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dirtree";
           sha256 = "0wfz9ks5iha2n0rya9yjmrb6f9lhp620iaqi92lw9smm7w83zj29";
           name = "dirtree";
         };
@@ -11035,7 +11182,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dirtree-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dirtree-prosjekt";
           sha256 = "0pyb6c0gvc16z5rc5h0kpl8021hz2hzv86cmjsd20gbhz7imrqwk";
           name = "dirtree-prosjekt";
         };
@@ -11056,7 +11203,7 @@
           sha256 = "1srlz63pncxndh1kmb6dl5sxaanspxa444wg998dld3dkdflwavq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/disaster";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/disaster";
           sha256 = "1ad8q81n0s13cwmm216wqx3s92195pda1amc4wxvpb3lq7dbd3yn";
           name = "disaster";
         };
@@ -11077,7 +11224,7 @@
           sha256 = "0f7h2rhh37lrs6xclj182li6s1fawv5m8w3hgy6qgm06dam45lka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover";
           sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
           name = "discover";
         };
@@ -11098,7 +11245,7 @@
           sha256 = "0l2g58f55p8zmzv2q2hf163ggm9p0wk8hg93wlkyldrgyb94dgf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover-clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover-clj-refactor";
           sha256 = "08bz60fxcgzab77690mmv0f7wdxcpygmasazcss427k37z9ysm7r";
           name = "discover-clj-refactor";
         };
@@ -11119,7 +11266,7 @@
           sha256 = "1vnbn4asz3lifscvy4shzisl6r0gkgq0qsa3kpgif3853wcd2rvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover-js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover-js2-refactor";
           sha256 = "139zq66cpcn4dnidf22h7x88p812ywrrz4c3c62w3915b75f71ki";
           name = "discover-js2-refactor";
         };
@@ -11140,7 +11287,7 @@
           sha256 = "0b73nc4jkf9bggnlp0l34jfcgx91vxbpavz6bpnf5rjvm0v1bil9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover-my-major";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover-my-major";
           sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
           name = "discover-my-major";
         };
@@ -11158,7 +11305,7 @@
           sha256 = "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/disk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/disk";
           sha256 = "0bij9gr4zv6jmc6dwsy3lb06vsxvmyzl8xrm8wzasxisk1qd2l6n";
           name = "disk";
         };
@@ -11179,7 +11326,7 @@
           sha256 = "075gj81rnhrvv061wnldixpfmlsyfbnvacnk107z6f9v3m2m3vl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dispass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dispass";
           sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
           name = "dispass";
         };
@@ -11200,7 +11347,7 @@
           sha256 = "0r560bpgw5p2pfcgkgcrlpp1bprv1f23dl4y5fjk06dg93fgaysa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/display-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/display-theme";
           sha256 = "07nqscmfa6iykll1m6gyiqca1g5ncx3rx468iyf2ahygpvqvnbxa";
           name = "display-theme";
         };
@@ -11221,7 +11368,7 @@
           sha256 = "03d8zb2is7n2y2z0k6j37cijjc3ndgasxsm9gqyq7drlq9bqwzsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/distinguished-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/distinguished-theme";
           sha256 = "0h03aqgijrmisbgqga42zlb5yz4x3jn9jgr29rq8canyhayr3rk4";
           name = "distinguished-theme";
         };
@@ -11242,7 +11389,7 @@
           sha256 = "120zgp38nz4ssid6bv0zy5rnf2claa5s880incgljqyl0vmj9nq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dizzee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dizzee";
           sha256 = "1axydags80jkyhpzp3m4gyplwr9k3a13w6vmrrzcv161nln7jhhs";
           name = "dizzee";
         };
@@ -11263,7 +11410,7 @@
           sha256 = "15i25zh54b2fqji0qmkg502051ymccih6pgqnzq02c43dpnsqhqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/django-manage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/django-manage";
           sha256 = "0j95g7fps28xhlrikkg61xgpbpf52xb56swmns2qdib6x1xzd6rh";
           name = "django-manage";
         };
@@ -11284,7 +11431,7 @@
           sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/django-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/django-mode";
           sha256 = "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara";
           name = "django-mode";
         };
@@ -11305,7 +11452,7 @@
           sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/django-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/django-snippets";
           sha256 = "1qs9fw104kidbr5zbxc1q71yy033nq3wxh98vvzk4z4fppnd29sw";
           name = "django-snippets";
         };
@@ -11326,7 +11473,7 @@
           sha256 = "1azf4p6salga7269l0kf13bqlxf9idp0ys8mm20qpyjpj79p5g9w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/django-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/django-theme";
           sha256 = "1rydl857zfpbvd7aziz6h7n3rrh584z2cbfxlss3wgfclzmbyhgf";
           name = "django-theme";
         };
@@ -11347,7 +11494,7 @@
           sha256 = "1nbvdnw9g3zbbb0n2sn2kxfzs5wichhl9qid3qjp8dsiq1wpv459";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dkdo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dkdo";
           sha256 = "0p7ybgldjs046jrkkbpli1iicfmblpxfz9lql8m8sz7lpjn7h300";
           name = "dkdo";
         };
@@ -11368,7 +11515,7 @@
           sha256 = "063nnln5m42qf190vr2z0ibacyn7n0xkxm3v5vaa4gxdvdwzhshs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dklrt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dklrt";
           sha256 = "11ss5x9sxgxp1wx2r1m0vsp5z5qm8m4ww20ybr6bqjw0a1gax561";
           name = "dklrt";
         };
@@ -11389,7 +11536,7 @@
           sha256 = "1nz71g8pb19aqjcb4s94hhn6j30cc04q05kmwvcbxpjb11qqrv49";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dkmisc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dkmisc";
           sha256 = "0nnbl272hldcmhyj47r463yvj7b06rjdkpkl5xk0gw9ikyja7w0z";
           name = "dkmisc";
         };
@@ -11410,7 +11557,7 @@
           sha256 = "0spj80vq6m2kqbdy6y1vh9fzwqyqkij30457d2n39kjn2gzbyar8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dmenu";
           sha256 = "1w1pgaj2yasfhsd1ibvrwy11ykq8v17h913g298h3ycsvqv8gic0";
           name = "dmenu";
         };
@@ -11431,7 +11578,7 @@
           sha256 = "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dna-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dna-mode";
           sha256 = "0ak3g152q3xxkiz1a4pl5y2vgbigbbmbc95fggirbcrh52zkzgk9";
           name = "dna-mode";
         };
@@ -11452,7 +11599,7 @@
           sha256 = "1nbm3wzd12rsrhnwlcc6b72b1ala328mfpcp5bwlfcdshw6mfcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docbook-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docbook-snippets";
           sha256 = "1ipqfylgiw9iyjc1nckbay890clfkhda81nr00cq06sjmm71iniq";
           name = "docbook-snippets";
         };
@@ -11473,7 +11620,7 @@
           sha256 = "055kr0qknjgnjs7dn6gdmahrdbs8piwldbz7vg1hgq3b046x8lky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docean";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docean";
           sha256 = "1mqmn2i9axnv5vnkg9gwfdjpzr6gxx4ia9mcdpm200ix297dg7x9";
           name = "docean";
         };
@@ -11494,7 +11641,7 @@
           sha256 = "12n63z4kkgfzkc2xji1z0k924af0v633qhvrr0rm83db9hz9j318";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docker";
           sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
           name = "docker";
         };
@@ -11515,7 +11662,7 @@
           sha256 = "0bvnvs17cbisymiqp96q4y2w2jqy5hd0zyk6rv7mihr9p97ak9kv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docker-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docker-tramp";
           sha256 = "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w";
           name = "docker-tramp";
         };
@@ -11528,15 +11675,15 @@
     dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dockerfile-mode";
-        version = "20151123.1057";
+        version = "20160128.1151";
         src = fetchFromGitHub {
           owner = "spotify";
           repo = "dockerfile-mode";
-          rev = "40be396417535c6721c1b13ca9f99c46192f1d73";
-          sha256 = "08pd42vv2c3l19nfib1hd7i7sy9dqwar1wfrvsnm5dkxcwlsm99j";
+          rev = "53434afa3b56eb9284d5e2c21956e43046cae1fa";
+          sha256 = "0vx7lv54v4bznn4mik4i6idb9dl7fpp3gw7nyhymbkr6hx884haw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dockerfile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dockerfile-mode";
           sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
           name = "dockerfile-mode";
         };
@@ -11549,15 +11696,15 @@
     dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dokuwiki-mode";
-        version = "20140130.1136";
+        version = "20160129.207";
         src = fetchFromGitHub {
           owner = "kbkbkbkb1";
           repo = "emacs-dokuwiki-mode";
-          rev = "e0cecc9551f490318e7a23ed9e0a3082c7196bc7";
-          sha256 = "104nnvp2mhsm9iwnya6k9s6mlgcg47ndshppnz0hbh556pcdyagr";
+          rev = "0e8f11572b6842b5b9d6e1a5123d988b26af04bf";
+          sha256 = "1qfmq8l4jqyrhfplsr1zd8bg9qqqwbh3mhipqzja0px0knjpqj85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dokuwiki-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dokuwiki-mode";
           sha256 = "0q5ybyj35dyh8k0nfvbglsq3ad2apc8cdijw4wqczc5180fckgy9";
           name = "dokuwiki-mode";
         };
@@ -11578,7 +11725,7 @@
           sha256 = "1xyqsnymgdd8ic3az2lgwv7s7vld6d4pcycb234bxm4in9fixgdj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dollaro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dollaro";
           sha256 = "06kaqzb0nh8sndhk7p5n4acn5nc27dyxw3ldgcbp81wj6ipii26h";
           name = "dollaro";
         };
@@ -11609,6 +11756,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "doom";
+        version = "20160121.922";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "doom";
+          rev = "5e2d3f54e5b84eaa533cbdb6cf17b1b6009f0730";
+          sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doom";
+          sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl";
+          name = "doom";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/doom";
+          license = lib.licenses.free;
+        };
+      }) {};
     doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "doremi";
         version = "20151231.1455";
@@ -11617,7 +11785,7 @@
           sha256 = "0201clwq9nbl8336lddcbwah8d6xipr7q8135yq79szfxq2bdg6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/doremi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doremi";
           sha256 = "11i4cdxgrspx44p44zz5py89ypji5li6p5w77wy0b07i8a5gq2gb";
           name = "doremi";
         };
@@ -11636,7 +11804,7 @@
           sha256 = "1m7jn80apya6s9d8phd859rq1m13xf2wz9664pqpr1p65yz2pyvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/doremi-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doremi-cmd";
           sha256 = "1qzspirn1abqps0dn5z8w6ymffc6b02dyki5hr8v74wfs8fhzx05";
           name = "doremi-cmd";
         };
@@ -11655,7 +11823,7 @@
           sha256 = "0v7ycmddh1ds64m1y5yai5nh34bd32q3wcm5y2pdzhj6jk7nj5wz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/doremi-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doremi-frm";
           sha256 = "1rj3p665q32acsxxwygv1j5nbmjqrhi0b4glzrk88xki4lyz0ihz";
           name = "doremi-frm";
         };
@@ -11673,7 +11841,7 @@
           sha256 = "157kvlb4dqiyk1h7b4p0dhrr6crdakwnrxydyl6yh51w2hdnnigw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/doremi-mac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doremi-mac";
           sha256 = "0n9fffgxnpqc7cch7aci5kxbwzk36iljdz2r8gcp5y5n1p7aamls";
           name = "doremi-mac";
         };
@@ -11691,7 +11859,7 @@
           sha256 = "0sfmcd1rq6wih9q7d9vkcfrw6gf7309mm7491jx091ij8m4p8ypp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dos";
           sha256 = "0cpijbqpci96s0d6rwqz5bbi9b0zkan1bg8vdgib1f87r7g980nc";
           name = "dos";
         };
@@ -11709,7 +11877,7 @@
           sha256 = "0xhbzq3yvfvvvl6mfihrzkd3pn5p5yxvbcyf2jhsppk7lscifsgk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dot-mode";
           sha256 = "1fik32635caq3r5f9k62qbj2dkwczz2z1v28mc7bcj7jv2p93nvh";
           name = "dot-mode";
         };
@@ -11730,7 +11898,7 @@
           sha256 = "0gc7z5ribp5yvadclq07l731m65pja00wgch4bgxsihiy7wvwknr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/download-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/download-region";
           sha256 = "1mrl2x6j708nchyh9y5avbf2cq10kpnhfj553l6akarvl5n5pvkl";
           name = "download-region";
         };
@@ -11751,7 +11919,7 @@
           sha256 = "0s7swvfd7h8r0n3cjmkps6ary9vwg61jylfm4qrkp3idsz6is548";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/downplay-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/downplay-mode";
           sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
           name = "downplay-mode";
         };
@@ -11772,7 +11940,7 @@
           sha256 = "11s4vxr6waswyx4lz3q70s8xdz0v7354sn0pfwj42mmww4pzkizs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dpaste";
           sha256 = "17mrdkldv4gfwm6ggc047l4a69xg2fy9f9mjbphkjl0p5nr6b4kz";
           name = "dpaste";
         };
@@ -11793,7 +11961,7 @@
           sha256 = "1avpg0cgzk8d6g1q0ryx41lkcdgkm0mkzr5xr32xm28dzrfmgd4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dpaste_de";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dpaste_de";
           sha256 = "0dql9qsl5gj51i3l2grl7nhw0ign8h4xa4jnhwn196j71c0rdwwp";
           name = "dpaste_de";
         };
@@ -11810,11 +11978,11 @@
         src = fetchFromGitHub {
           owner = "zenorocha";
           repo = "dracula-theme";
-          rev = "ee065fed126eecdfe33a1a578d9f1e20687d2f3a";
-          sha256 = "1x7hyj5qi9f222zwhwjqr98zzcvqjqfwxlglph8nsbadkv4s8c3v";
+          rev = "c158eb289d48a1b4eef3be62157df798675b172c";
+          sha256 = "1gxamb8hdrpm52541z37r6yr36n3sbj35mcasfipnwa5qryc3gxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dracula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dracula-theme";
           sha256 = "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r";
           name = "dracula-theme";
         };
@@ -11835,7 +12003,7 @@
           sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/draft-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/draft-mode";
           sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
           name = "draft-mode";
         };
@@ -11856,7 +12024,7 @@
           sha256 = "08kkiqhfy1i6j9156gbl85jvyj592vd08qy24ng2dj0prjvap8w1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drag-stuff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drag-stuff";
           sha256 = "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc";
           name = "drag-stuff";
         };
@@ -11877,7 +12045,7 @@
           sha256 = "1yvg3w9gm5vs26qhw3xb72v9fgdhqq9w5pksiz2gj5m19l81irar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drawille";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drawille";
           sha256 = "01rl21hbj3hwy072yr27jl6iql331v131d3mr9zifg9v6f3jqbil";
           name = "drawille";
         };
@@ -11898,7 +12066,7 @@
           sha256 = "0lzq0mkhhj3s5yrcbs576qxkd8h0m2ikc4iplk97ddpzh4nz4127";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drill-instructor-AZIK-force";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drill-instructor-AZIK-force";
           sha256 = "1bb698r11m58csd2rm17fmiw691p25npphzqgjiiqbn4vx35ja7f";
           name = "drill-instructor-AZIK-force";
         };
@@ -11919,7 +12087,7 @@
           sha256 = "1s4cz5s0mw733ak9ps62fs150y3psqmb6v5s6s88jjfsi0r03c0s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dropbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dropbox";
           sha256 = "0ak6g2d2sq026ml6cmn6v1qz7sczkplgv2j9zq9zgzafihyyzs5f";
           name = "dropbox";
         };
@@ -11937,7 +12105,7 @@
           sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dropdown-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dropdown-list";
           sha256 = "14i9w897gnb3mvnkbzhzij04bgr551r8km310mbrmzzag54w077z";
           name = "dropdown-list";
         };
@@ -11958,7 +12126,7 @@
           sha256 = "0am3n25qcfjkqfp4wjj1d2zigrmi8hg7p5sy2h91zg3blypqmpsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drupal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drupal-mode";
           sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
           name = "drupal-mode";
         };
@@ -11979,7 +12147,7 @@
           sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drupal-spell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drupal-spell";
           sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
           name = "drupal-spell";
         };
@@ -11994,11 +12162,11 @@
         version = "20130120.1457";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1725340";
+          rev = "1728559";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dsvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dsvn";
           sha256 = "12cviq6v08anif762a5qav3l8ircp81kmnl9q4yl6bkh9zxv7vy6";
           name = "dsvn";
         };
@@ -12019,7 +12187,7 @@
           sha256 = "1blfx3r2xd3idbfjrx44ma3x1d83xp67il2s2bmdwa8qz92z99lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dtrace-script-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dtrace-script-mode";
           sha256 = "0v29rzlyccrc37052w2qmvjaii84jihhp736l807b0hjjfryras4";
           name = "dtrace-script-mode";
         };
@@ -12040,7 +12208,7 @@
           sha256 = "0x8c3h3jvyn2462r0sagz63vv9pr5ivfzkshr69603ibyfgqxxkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dtrt-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dtrt-indent";
           sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5";
           name = "dtrt-indent";
         };
@@ -12061,7 +12229,7 @@
           sha256 = "0cafvhbpfqd8ajqg2757fs64kryrl2ckvbp5abldb4y8fa14pb9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dts-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dts-mode";
           sha256 = "1k8cbiayajbzwkm0s0kyin0qpq9yhymidz0srs4hbvsnb6hvp234";
           name = "dts-mode";
         };
@@ -12082,7 +12250,7 @@
           sha256 = "1ixb78dv66lmqlbv4zl5ysvv1xqafvqh1h5cfdv03jdkqlfk34jz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ducpel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ducpel";
           sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
           name = "ducpel";
         };
@@ -12100,7 +12268,7 @@
           sha256 = "0zq94x4br3sk6n4chrfnw7hpnsicxa02fcpk8hw1hfsaq3327n6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dummy-h-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dummy-h-mode";
           sha256 = "1h2pm37y9kz62id0rm0zzgh1hpkhd9gvq95kjd29w0awsp9b6ca4";
           name = "dummy-h-mode";
         };
@@ -12121,7 +12289,7 @@
           sha256 = "0g72nnz0j6dvllyxyrw20z1vg6p7sy46yy0fq017pa77sgqm0xzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dummyparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dummyparens";
           sha256 = "1yah8kpqkk9ygm73iy51fzwc8q5nw0xlwqir2qld1fc5y1lkb7dk";
           name = "dummyparens";
         };
@@ -12142,7 +12310,7 @@
           sha256 = "1qaiwm8mf4656gc1pdj8ivgy4abkjsypr52pvf4nrdkkln9qzfli";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/duplicate-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/duplicate-thing";
           sha256 = "1jx2b6h23dj561xhizzbpxp3av69ic8zdw4kkf0py1jm3gnrmlm4";
           name = "duplicate-thing";
         };
@@ -12162,7 +12330,7 @@
           sha256 = "0ghxnzi2iy1g633fshl9wdpg2asrcl0v5rkk61gqd6axm7fjaxcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dyalog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
           name = "dyalog-mode";
         };
@@ -12183,7 +12351,7 @@
           sha256 = "011423kvbfcd7jifg9425j89hlzmnw4j751s4mdz9wyr979k19ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dylan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dylan-mode";
           sha256 = "0kimvz8vmcvgxi0wvf7dqv6plj31xlksmvgip8h3bhyy7slxj3yy";
           name = "dylan-mode";
         };
@@ -12204,7 +12372,7 @@
           sha256 = "150dj1g49q9x9zx9wkymq30l5gc8c4mhsq91fm6q0yj6ip7hlfxh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dynamic-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dynamic-fonts";
           sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
           name = "dynamic-fonts";
         };
@@ -12225,7 +12393,7 @@
           sha256 = "1jsjk4fkisgprn2w1d1385kbc9w1bd707biapd1y453k20q5c4h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dynamic-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dynamic-ruler";
           sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
           name = "dynamic-ruler";
         };
@@ -12246,7 +12414,7 @@
           sha256 = "0d18kdpw4zfbq4bkqh19cf42xlinxqa71lr2d994phaxqxqq195w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2ansi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2ansi";
           sha256 = "0ns1sldipx5kyqpi0bw79kdmhi1ry5glwxfzfx8r01hbbkf0cc94";
           name = "e2ansi";
         };
@@ -12267,7 +12435,7 @@
           sha256 = "1lx0c7s810x6prf7x1lnx412gll8nn8gqpmi56n319n406cxhnhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm";
           sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
           name = "e2wm";
         };
@@ -12288,7 +12456,7 @@
           sha256 = "1g77gf24abwcvf7z52vs762s6jp978pnvza8zmzwkwfvp1mkx233";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-R";
           sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
           name = "e2wm-R";
         };
@@ -12309,7 +12477,7 @@
           sha256 = "121vd44f42bxqvdjswmjlghf1jalbs974b6cip2i049k1n08xgh0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-bookmark";
           sha256 = "1myaqxzrgff5gxcn3zn1bsmyf5122ql1mwr05wamd450lq8nmbw5";
           name = "e2wm-bookmark";
         };
@@ -12330,7 +12498,7 @@
           sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-direx";
           sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
           name = "e2wm-direx";
         };
@@ -12351,7 +12519,7 @@
           sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-pkgex4pl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-pkgex4pl";
           sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
           name = "e2wm-pkgex4pl";
         };
@@ -12372,7 +12540,7 @@
           sha256 = "0h1fnlpvy2mqfxjv64znghmiadh9qimj9q9a60cxhyc0bq0prz6f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-svg-clock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-svg-clock";
           sha256 = "0q02lksrbn43s8d9rzpglqybalglpi6qi9lix0cllag6i7fzcbms";
           name = "e2wm-svg-clock";
         };
@@ -12393,7 +12561,7 @@
           sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-sww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-sww";
           sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
           name = "e2wm-sww";
         };
@@ -12414,7 +12582,7 @@
           sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-term";
           sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
           name = "e2wm-term";
         };
@@ -12435,7 +12603,7 @@
           sha256 = "09ikwg5s42b50lfj0796pa2h32larkf5j6cy042dzh8c441vgih4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-after-load";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-after-load";
           sha256 = "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys";
           name = "easy-after-load";
         };
@@ -12456,7 +12624,7 @@
           sha256 = "1qn0givyh07w41sv5xayfzlwbpbq7p39wbhmwsgffgfqzzz5r2ys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-escape";
           sha256 = "1zspb79x6s151wwiian45j1nh0xps8y8yd98byyn5lbwbj2pp2gk";
           name = "easy-escape";
         };
@@ -12477,7 +12645,7 @@
           sha256 = "0i2plbvaalapx3svryn5lrc68m0qj1xm0z577xxzq7i9z91nanq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-kill";
           sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
           name = "easy-kill";
         };
@@ -12498,7 +12666,7 @@
           sha256 = "18fn9qnm0cwdy47nv6wafiy6cf7rnv4av4w8zmjwjj0n8ql4jl08";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-kill-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-kill-extras";
           sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
           name = "easy-kill-extras";
         };
@@ -12519,7 +12687,7 @@
           sha256 = "0qpabig0qrkyhhiifjpq9a7qv7h3nlqmpz79xy8lk58xy6rj0zk0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-lentic";
           sha256 = "1j141lncgcgfpa42m505xndiy6lh848xymfvb3cz4d6h73421khg";
           name = "easy-lentic";
         };
@@ -12540,7 +12708,7 @@
           sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-repeat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-repeat";
           sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
           name = "easy-repeat";
         };
@@ -12553,15 +12721,15 @@
     ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ebal";
-        version = "20151211.15";
+        version = "20160122.607";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ebal";
-          rev = "ef0a288d9b6e557532d772c146ff02aa82771f13";
-          sha256 = "0l2nhf6m6m01y2gw1fkn3zsjvmm1w02qj9zp4nmhgdl0qkllhdz5";
+          rev = "4d2ffa7ffbdfd6ee8a39a268e7c7c0de0905df6b";
+          sha256 = "0ysym38xaqyx1wc7xd3fvjm62dmiq4727dnjvyxv7hs4czff1gcb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ebal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
           name = "ebal";
         };
@@ -12574,15 +12742,15 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
     melpaBuild {
         pname = "ebib";
-        version = "20160115.1735";
+        version = "20160125.1621";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "b89f58493b6b544ddd80a6eea433987aa5c92b50";
-          sha256 = "03v17vbfdsv1rf3ja9k1d6mb338f8531w76f7rk5c7jyhlxi4ipl";
+          rev = "edb289c39e1ccc9f7277b852527bc665e4912cd5";
+          sha256 = "0grm2kskwms97w8jyp3ybfhrs2ynss0825knkw2x2wbdl8sg87lv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ebib";
           sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
           name = "ebib";
         };
@@ -12603,7 +12771,7 @@
           sha256 = "1hs069m4m6vhb37ac2x6hzbp9mfmpd3zhp4m631lx8dlmx11rydz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ecb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ecb";
           sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
           name = "ecb";
         };
@@ -12621,7 +12789,7 @@
           sha256 = "0jk7pb2sr4qbxwcn4ipcjc9phl9zjmgg8sf91qj113112xx7vvxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/echo-bell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/echo-bell";
           sha256 = "0adhdfbcpmdhd9252rh0jik2z3v9bzf0brpzfvcjn5py2x6724ws";
           name = "echo-bell";
         };
@@ -12642,7 +12810,7 @@
           sha256 = "1vxa6d8kp4h1havr9cq7zqgqm1xsjxhbgbi4hvi842ma6xwh4m5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eclipse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eclipse-theme";
           sha256 = "0mww0jysxqky1zkkhvhj7fn20w970n2w6501rdm5jwqfb58ivxfx";
           name = "eclipse-theme";
         };
@@ -12663,7 +12831,7 @@
           sha256 = "0h6vh719ai0cxyja6wpfi6m76d42vskj56wg666j0h6j0qw6h3i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ecukes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ecukes";
           sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
           name = "ecukes";
         };
@@ -12684,7 +12852,7 @@
           sha256 = "1x5y1d5crc48iddlsf6irkr017p32a9xjcmlm9wf3zggmr95fr3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi";
           sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
           name = "edbi";
         };
@@ -12705,7 +12873,7 @@
           sha256 = "1l5lkdgcy1z6fkjh3zrhf0f4f26bzhpqy33ak1xacvm9fyf54s2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi-database-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi-database-url";
           sha256 = "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn";
           name = "edbi-database-url";
         };
@@ -12722,11 +12890,11 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "edbi-django";
-          rev = "9cdf6d7a45402d41551c1e17edd7a29a8520f102";
-          sha256 = "0jlr1da26jkrgadaznxjynjqbg4cpnq7gda3qab2qqrjzzi8cfia";
+          rev = "e6c786aac7b3db9552d9e0d8f46413ffae8c34af";
+          sha256 = "0m08ijhlmsvxcf21jb7qmqq0bsgzv2jkm6b0x8s2mzmrzavfmggj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi-django";
           sha256 = "1s59hab35hwnspyklxbhi0js0sgdn0rc7y33dqjk0psjcikqymg1";
           name = "edbi-django";
         };
@@ -12747,7 +12915,7 @@
           sha256 = "1lndz0qlmjvi9r2f1yzw217b971ym5jzfrddcd6rind1asrzl32a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi-minor-mode";
           sha256 = "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi";
           name = "edbi-minor-mode";
         };
@@ -12768,7 +12936,7 @@
           sha256 = "0xnaj2f9zvnc6abjkaa23j6ga4anmq676aplws0n01y7qz6w0xk8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi-sqlite";
           sha256 = "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y";
           name = "edbi-sqlite";
         };
@@ -12789,7 +12957,7 @@
           sha256 = "1cfjw9b1lm29s5cbh0qqmkchbq2382s71w4rpb0gyf603s0yg13m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ede-compdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ede-compdb";
           sha256 = "1ypi7rxbgg2qck1b571hcw5m4ipllb48g6sindpdf180kbfbfpn7";
           name = "ede-compdb";
         };
@@ -12810,7 +12978,7 @@
           sha256 = "1zgiifi1k2d9g8sarfpjzamk8g1yx4ilgn60mqhy2pznp30b5qb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edebug-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edebug-x";
           sha256 = "0mzrip6y346mix4ny1xj8rkji1w531ix24k3cczmlmm4hm7l29ql";
           name = "edebug-x";
         };
@@ -12831,7 +12999,7 @@
           sha256 = "0crwdgng377sy1zbq7kqkz24v697mlzgdsvkdp1m8r7ympikkj6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-at-point";
           sha256 = "0sn5a644zm165li44yffcpcai8bhl3yfvqcljghlwaa0w45sc9im";
           name = "edit-at-point";
         };
@@ -12852,7 +13020,7 @@
           sha256 = "0vk954f44m2bq7qb122pzlb8fibrisx47ihvn3h96m8nmx0fv32r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-color-stamp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-color-stamp";
           sha256 = "1f8v8w3w7vb8jv29w06mplah8yfcs5qfjz2w4irv0rg7dwzy3zk8";
           name = "edit-color-stamp";
         };
@@ -12873,7 +13041,7 @@
           sha256 = "10c84aad1lnr7z9f75k5ylgchykr3srcdmn88hlcx2n2c4jfbkds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-indirect";
           sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
           name = "edit-indirect";
         };
@@ -12894,7 +13062,7 @@
           sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-list";
           sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
           name = "edit-list";
         };
@@ -12915,7 +13083,7 @@
           sha256 = "0ssmhwg4wfh5cxgqv8bl55449204h4zi863m7jhvas4c9zq005kd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-server";
           sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
           name = "edit-server";
         };
@@ -12936,7 +13104,7 @@
           sha256 = "174xq45xc632zrb916aw7q4bch96pbi6zgy3dk77qla3ky9cfpl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-server-htmlize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-server-htmlize";
           sha256 = "007lv3698a88wxan7kplz2117azxxpzzgshin9c1aabg059hszlj";
           name = "edit-server-htmlize";
         };
@@ -12949,15 +13117,15 @@
     editorconfig = callPackage ({ editorconfig-core, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20160116.2341";
+        version = "20160204.12";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
-          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+          rev = "6fcae90cbe88f98ccc6b152f04cc6d2ffaaab288";
+          sha256 = "17qvr9gqd4mkn0lzpxvijhwg1cbrqkqg4l9wnidbxa1wfzsr9mrd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig";
           sha256 = "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35";
           name = "editorconfig";
         };
@@ -12970,15 +13138,15 @@
     editorconfig-core = callPackage ({ cl-lib ? null, editorconfig-fnmatch, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-core";
-        version = "20160116.2341";
+        version = "20160127.35";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
-          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+          rev = "6fcae90cbe88f98ccc6b152f04cc6d2ffaaab288";
+          sha256 = "17qvr9gqd4mkn0lzpxvijhwg1cbrqkqg4l9wnidbxa1wfzsr9mrd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig-core";
           sha256 = "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r";
           name = "editorconfig-core";
         };
@@ -12991,15 +13159,15 @@
     editorconfig-fnmatch = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-fnmatch";
-        version = "20160116.2341";
+        version = "20160127.35";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
-          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+          rev = "6fcae90cbe88f98ccc6b152f04cc6d2ffaaab288";
+          sha256 = "17qvr9gqd4mkn0lzpxvijhwg1cbrqkqg4l9wnidbxa1wfzsr9mrd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig-fnmatch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig-fnmatch";
           sha256 = "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv";
           name = "editorconfig-fnmatch";
         };
@@ -13020,7 +13188,7 @@
           sha256 = "107ljwqibnd247h4iyav37y75zcgl0j2yav09s38kl3nbxmaad2y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edn";
           sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
           name = "edn";
         };
@@ -13041,7 +13209,7 @@
           sha256 = "0vsrcvrd02nx647gxp65r548qlxg50w73dy0rs1lxwy6mdgp0npv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edts";
           sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
           name = "edts";
         };
@@ -13071,7 +13239,7 @@
           sha256 = "1c2iyv392ap35nss4j901h33d3lx9lmq5v43flf2rid1766pam6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/efire";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/efire";
           sha256 = "1c8vdc58i0k7vvanwhckfc31226d3rb5xq77lh9ydgnd4i97gq2w";
           name = "efire";
         };
@@ -13092,7 +13260,7 @@
           sha256 = "1l9p8nairqr3ym5ydy0rwczcmkx2jq9b2g9r0r96n0vnjpybk6q2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/egg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/egg";
           sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
           name = "egg";
         };
@@ -13109,11 +13277,11 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "dbb8773f8a47655f3b5311e0a87f63c7b39f60db";
-          sha256 = "0sz506yx59gjkphyi3fp07i8h0mkm7gr73xfbjdhn29dss0xl7x0";
+          rev = "bea1bf82ae9c3c22e1303a34496ce8132f722b3e";
+          sha256 = "1s9anqlby0ikaal0i9vg8dkn4n0fhnqy1war4lx35qkmg3dg1m33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/egison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/egison-mode";
           sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
           name = "egison-mode";
         };
@@ -13132,7 +13300,7 @@
           sha256 = "3f41ade3332a3f1dc5cfb0b33077396feb7b683b2cf2c235b7a5f07f0b2e3271";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eide";
           sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
           name = "eide";
         };
@@ -13150,7 +13318,7 @@
           sha256 = "024qyipwlj3g0fff06cgq357blkh3hyr14vpmkqsv15x6gb9snir";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eimp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eimp";
           sha256 = "11z23kx89yy03hzs1xlbcih70lsp2lplxs8nkc8jvfcpsjwypsl0";
           name = "eimp";
         };
@@ -13160,22 +13328,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
+    ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20160114.1641";
+        version = "20160203.2226";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "6d66cc5a2efedf614b62f012fad2023c8b95189c";
-          sha256 = "1003gavr7bbsff256k2wickbvlr6xflwl6msdipxjdww66wa3gsh";
+          rev = "261576f94bb6eddc566c9d7aa557bf7cd20a2c05";
+          sha256 = "05nvfjslfwzr54m1h2xjq3icd29khxpy0mka5r05gmlj3xzhkldv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ein";
           sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
           name = "ein";
         };
-        packageRequires = [ request websocket ];
+        packageRequires = [ cl-generic request websocket ];
         meta = {
           homepage = "http://melpa.org/#/ein";
           license = lib.licenses.free;
@@ -13192,7 +13360,7 @@
           sha256 = "1w0b3giy9ca35pp2ni4afnqas64a2vriilab7jiw9anp3ryh6570";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ein-mumamo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ein-mumamo";
           sha256 = "029sk90xz9fhv2s56f5hp0aks1d6ybz517009vv4892bbzkpjv1w";
           name = "ein-mumamo";
         };
@@ -13213,7 +13381,7 @@
           sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-autoyas";
           sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
           name = "el-autoyas";
         };
@@ -13230,11 +13398,11 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "6b10697216f2de7fc836452a29d13ef4182ae3e1";
-          sha256 = "06b3ma4chsjpzwwxfy9as7sanvlpp1j4fsmxpaphjv2d8gvw98zn";
+          rev = "415817cafc576c917b2459c2d29b6acf21d6ad53";
+          sha256 = "1fl3846f70v3niklz5qsi6w1fgp0ga9vq2b712k8gikdkk1rf1i9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-get";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-get";
           sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
           name = "el-get";
         };
@@ -13255,7 +13423,7 @@
           sha256 = "140afbksvm1kvam7pyaibay8rqhfhmb22rrh39mvdnqskqfnlqgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-init";
           sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
           name = "el-init";
         };
@@ -13276,7 +13444,7 @@
           sha256 = "13cc7nnslij28fa1469s9pfmnz8j0m6bayhrqxckd0xplvwwipnx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-init-viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-init-viewer";
           sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
           name = "el-init-viewer";
         };
@@ -13297,7 +13465,7 @@
           sha256 = "1jiq2hpym3wpk80zsl4lffpv4kgkykc2zp08sb01wa7pl8d1knmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-mock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-mock";
           sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
           name = "el-mock";
         };
@@ -13318,7 +13486,7 @@
           sha256 = "1iykhicc1ic1r6h4vj3701rm0vfy41b16w3d98amf8jjypv54wv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-pocket";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-pocket";
           sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw";
           name = "el-pocket";
         };
@@ -13339,7 +13507,7 @@
           sha256 = "1lsq7980pwcwlg7z37hrig8ddm9nyvaqrlczv1w0vy631vc5z2az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-spec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-spec";
           sha256 = "017syizs8qw5phwvpzzffzdnj6rh9q4n7s51qjvj8qfb3088igkh";
           name = "el-spec";
         };
@@ -13360,7 +13528,7 @@
           sha256 = "1sba405h1sy5vxg4ki631p4979gyaqv8wnwbgca5jp2pm8l3viri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-spice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-spice";
           sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
           name = "el-spice";
         };
@@ -13381,7 +13549,7 @@
           sha256 = "04k1fz0ypmfzgwamncp2vz0lq54bq6y7c8k9nm39csp2564vmbbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-sprunge";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-sprunge";
           sha256 = "0rb1cr7zrfl1s5prxy3xwdqgnm8ddw33pcvk049km2qbccb08v6a";
           name = "el-sprunge";
         };
@@ -13402,7 +13570,7 @@
           sha256 = "016l3inzb7dby0w58najj2pvymwk6gllsxvqj2fkz3599i36p1pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-spy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-spy";
           sha256 = "1bgv4mgsnkmjdyay7lhkqdszvnwpjy4dxxw11kq45w866ba8645n";
           name = "el-spy";
         };
@@ -13420,7 +13588,7 @@
           sha256 = "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-swank-fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-swank-fuzzy";
           sha256 = "1m7y4c0r1w8ndmr1wgc2llrbfawbbxnvcvgjpsckb3704s87yxr1";
           name = "el-swank-fuzzy";
         };
@@ -13441,7 +13609,7 @@
           sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-x";
           sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
           name = "el-x";
         };
@@ -13462,7 +13630,7 @@
           sha256 = "03xlxx57z1id9mr7afkvf77m2f9rrknrm1380p51vka84v2hl3mh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el2markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el2markdown";
           sha256 = "1a52qm0jrcvvpb01blr5l7apaxqn4bvhkgha53cr48rdkmmq318g";
           name = "el2markdown";
         };
@@ -13483,7 +13651,7 @@
           sha256 = "1wikmzl9gi72h6fxawj0h20828n4vypw9rrv35kqnl4gfrdmxzkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elang";
           sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
           name = "elang";
         };
@@ -13504,7 +13672,7 @@
           sha256 = "0vppa9xihn8777rphiw1aqp96xn16vgjwff1dwvp8z861silp8ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eldoc-eval";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eldoc-eval";
           sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
           name = "eldoc-eval";
         };
@@ -13522,7 +13690,7 @@
           sha256 = "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eldoc-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eldoc-extension";
           sha256 = "0azkdx4ncjhb7qyhyg1a5pxgqqf2z1wq9iz802j0nxxnjzh9ny24";
           name = "eldoc-extension";
         };
@@ -13543,7 +13711,7 @@
           sha256 = "0s4y1319sr4xc0k6h2zhzzxsx2kc3pc2m6saah18y4kip0hjyhr8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/electric-case";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/electric-case";
           sha256 = "11mab7799kxs3w47srmds5prmwh6ldxzial9kqbqy33vybpkprmd";
           name = "electric-case";
         };
@@ -13556,15 +13724,15 @@
     electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
     melpaBuild {
         pname = "electric-operator";
-        version = "20160116.814";
+        version = "20160122.213";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "6c2c8e3e1bb25e6b4f1cf78a2e4bc327b99a5579";
-          sha256 = "1kzg7axqdwi9s4gzcz7iyw8mw5jm9i4slijk1x398cskwrijfh9h";
+          rev = "4c2f271f89e59a8cc28b447daaf80f1b73db5bb9";
+          sha256 = "0qbljvc1y39h6571xqjg4xyah0xwkv0qxx619x9frxlvlh83y4xc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/electric-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/electric-operator";
           sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
           name = "electric-operator";
         };
@@ -13585,7 +13753,7 @@
           sha256 = "0q1pb01h48wdbjgi04a6ck2jn7yfh92wpq1vka5pg54wv2k9b5fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/electric-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/electric-spacing";
           sha256 = "0fcsz9wmibqp6ci0pa5r4gzlrsyj5klajxpgfksa0nfj3dc94cvg";
           name = "electric-spacing";
         };
@@ -13606,7 +13774,7 @@
           sha256 = "1ijrhm9vrzh5wl1rr9ayl11dwm05bh1i43fnbz3ga58l6whgkfpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elein";
           sha256 = "0af263zq4xxaxhpypn769q8h1dla0ygpnd6l8xc13zlni6jjwdsg";
           name = "elein";
         };
@@ -13619,15 +13787,15 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20151227.1117";
+        version = "20160127.1930";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "2f84bb271559e8363286c5fcfd70246940058709";
-          sha256 = "1a3mwn0k6ib4sg63nhl29vsh0ji30zcyfcji161zfan6v5asrg8v";
+          rev = "75deddd0de79c66b2f50aa3d32a7b7a3a352966d";
+          sha256 = "1c3xwjzln5grxp7cci2mmly73mzl02f8wjm4hbd9napx72wjcxiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed";
           sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
           name = "elfeed";
         };
@@ -13648,7 +13816,7 @@
           sha256 = "1r2liqjww0yscxjpg13dsfhhv3yjahlbas0dabqlh4f9q0jdrgj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed-goodies";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed-goodies";
           sha256 = "0zpk6nx757hasgzcww90fzkcdn078my33p7yax7xslvi4msm37bi";
           name = "elfeed-goodies";
         };
@@ -13676,7 +13844,7 @@
           sha256 = "0cp8sbhym83db88ii7gyab6iqxppinjlrkzb9627gq7xgb5mqj5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed-org";
           sha256 = "0xf2r5ca3gnx2cv9f8rr4s1hds2ggqsbllvfr229gznkcqjnglik";
           name = "elfeed-org";
         };
@@ -13693,11 +13861,11 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "2f84bb271559e8363286c5fcfd70246940058709";
-          sha256 = "1a3mwn0k6ib4sg63nhl29vsh0ji30zcyfcji161zfan6v5asrg8v";
+          rev = "75deddd0de79c66b2f50aa3d32a7b7a3a352966d";
+          sha256 = "1c3xwjzln5grxp7cci2mmly73mzl02f8wjm4hbd9napx72wjcxiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed-web";
           sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
           name = "elfeed-web";
         };
@@ -13718,7 +13886,7 @@
           sha256 = "0rdhnnyn0xsmnshnf289kxk974r57i6nx0vii1w36j6p6q0b7f9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elhome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elhome";
           sha256 = "1k7936wxgslr29511dz9az38i9vi35rcxk68gzv35v9lpj89lalh";
           name = "elhome";
         };
@@ -13736,7 +13904,7 @@
           sha256 = "0khc3gacw27aw9pkfrnla9844lqbspgm0hrz7q0h5nr73d9pnc02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-depend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-depend";
           sha256 = "08zxzvj60v23b7d5q0hvgffm1jxq7lc5y9w22m6nv2fp29yadyiy";
           name = "elisp-depend";
         };
@@ -13757,7 +13925,7 @@
           sha256 = "1ci6nyk1vvb3wgxzarbf6448i9rjb74zzrhcmls634gfxbryxdyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-lint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-lint";
           sha256 = "102hrxdw72bm11a29i15g09lv7jlnd7vkv7292fm3mcxf5f4hkw9";
           name = "elisp-lint";
         };
@@ -13778,7 +13946,7 @@
           sha256 = "168ljhscqyvp24lw70ylv4a3c0y51sx4f66lfahbs7zpjvwf25x0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-sandbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-sandbox";
           sha256 = "1bazm1cf9ghh9b7jzqqgyfcalnrfg7vmxqbn4fiy2c76gbzlr2bp";
           name = "elisp-sandbox";
         };
@@ -13788,22 +13956,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    elisp-slime-nav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    elisp-slime-nav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elisp-slime-nav";
-        version = "20150805.1448";
+        version = "20160128.1309";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "elisp-slime-nav";
-          rev = "f6d241b11abbc4064e17e02dbd0bc6c61db256cc";
-          sha256 = "184yxv2qhqc2g5v259kprihppvcwsd52idjay2c01lkmk1i3qnj5";
+          rev = "0e96d9f1f0d334f09414b509d44d5c000b51f432";
+          sha256 = "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-slime-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-slime-nav";
           sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
           name = "elisp-slime-nav";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/elisp-slime-nav";
           license = lib.licenses.free;
@@ -13820,7 +13988,7 @@
           sha256 = "18dhijvgnx2hr9vnprcc1fl0k49bb3lpnghrqbkf7fj599kcjl7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elixir-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elixir-mode";
           sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
           name = "elixir-mode";
         };
@@ -13841,7 +14009,7 @@
           sha256 = "1sdq4372i19wdxpdp3347a1rf5zf5w6sa0da6lr511m7ri0lj6hd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elixir-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elixir-yasnippets";
           sha256 = "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a";
           name = "elixir-yasnippets";
         };
@@ -13854,15 +14022,15 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20160117.458";
+        version = "20160204.128";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "6796f031bd1452a9a1c474152df7720f4e700f38";
-          sha256 = "035awxgwj8jy6c4ihfqwvjhqpg3i00qshrslhggyclab9i784axw";
+          rev = "61671af42d2162b06ee06b4857bc4a63bf82a57b";
+          sha256 = "0cjxvmsfjki8zal31zbf4ynf7i0gy5vykpq6858qpa68vkd1p0iz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elm-mode";
           sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
           name = "elm-mode";
         };
@@ -13883,7 +14051,7 @@
           sha256 = "181hcyg5v62nxrgmb7pl9672rm9fy8crc4lqhdwvdvd7ngki1fiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elmacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elmacro";
           sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
           name = "elmacro";
         };
@@ -13904,7 +14072,7 @@
           sha256 = "1463y4zc6yabd30k6806yw0am18fjv0bkxm56p2siqrwn9pbsh8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elmine";
           sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
           name = "elmine";
         };
@@ -13925,7 +14093,7 @@
           sha256 = "0p3cj5vgka388i4dk9r7bx8pv8mywnfij9ahgqak5jlsddflh8hw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elnode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elnode";
           sha256 = "0piy5gy9a7c8s10b99fmdyh6glhvjvdyrz0x2bv30h7wplx5szi6";
           name = "elnode";
         };
@@ -13946,7 +14114,7 @@
           sha256 = "19yvhyg34w1idsh712cahmcy1pzbxcipw9j6xk567lvkqkinqg7s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elog";
           sha256 = "0hixsi60nf0khm9xmya3saf95ahn1gydp0l5wxawsc491qwg4vqd";
           name = "elog";
         };
@@ -13967,7 +14135,7 @@
           sha256 = "1jcr8bxffvnfs0ym6zkgs79hd6a0m81r4x4jr3v5l9zwxw04sy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elogcat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elogcat";
           sha256 = "0sqdqlpg4firswr742nrb6b8sz3bpijf6pbxvandq3ddpm0rx9ia";
           name = "elogcat";
         };
@@ -13988,7 +14156,7 @@
           sha256 = "1dadf24x6v1vk57bp6w0g2dysigy5cqjzwldc8dn129f4pfrhipy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpa-audit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpa-audit";
           sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
           name = "elpa-audit";
         };
@@ -14009,7 +14177,7 @@
           sha256 = "1hjmvn3kls63alh0ihb5c8gf90lrfvq1hxrlf4162qiaa0s15f8a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpa-mirror";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpa-mirror";
           sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
           name = "elpa-mirror";
         };
@@ -14022,15 +14190,15 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20151101.601";
+        version = "20160131.318";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "96fa05708629600fd79c4b0fcafe63ec97f5ce07";
-          sha256 = "0kzara7r6gvgf3p06xswxbhq01dbhmwx1pldx3mmv7knvm2mdxq8";
+          rev = "d4cd394236d1d148dcabd5048bd30961687627da";
+          sha256 = "1xjm9b32a9nfzvphj6vm0dqcr4i072zcx29kcgiyyni8zbgbwmwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpy";
           sha256 = "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709";
           name = "elpy";
         };
@@ -14057,7 +14225,7 @@
           sha256 = "055kam18k4ni1zw3310cpsvdnrp62d579r30lq67ig2lq3yxzc1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen";
           sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s";
           name = "elscreen";
         };
@@ -14078,7 +14246,7 @@
           sha256 = "0bbashrqpyhs282w5i15rzravvj0fjnydbh9vfnfnfnk8a9sssxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-buffer-group";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-buffer-group";
           sha256 = "1clmhpk9zp6hsgz6a4jpmbrr9fr6k8b324s0x61n5yi4yzgdmc0v";
           name = "elscreen-buffer-group";
         };
@@ -14099,7 +14267,7 @@
           sha256 = "091dxsb73bhqmrddwnmvblmfpwa7v7fa0ha18daxc8j0lrhzdhlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-mew";
           sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
           name = "elscreen-mew";
         };
@@ -14120,7 +14288,7 @@
           sha256 = "1cninrbgxzg0gykkpjx0i8pk2yc7sgr2kliqd35lgcxz2q4jlr51";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-multi-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-multi-term";
           sha256 = "1zwrzblkag1d18xz450b7khsdssvsxyl1x6a682vy0dkn1y5qh1n";
           name = "elscreen-multi-term";
         };
@@ -14141,7 +14309,7 @@
           sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-persist";
           sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
           name = "elscreen-persist";
         };
@@ -14162,7 +14330,7 @@
           sha256 = "1w34nnl4zalxzmyfbc81qd82m7qp3zvz608dx6hfi44pjz0dp36f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-separate-buffer-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-separate-buffer-list";
           sha256 = "1d8kc137cd8i3wglir1rlvk7w8mrdhd3xvcihi2f2f2g5nh2n5jk";
           name = "elscreen-separate-buffer-list";
         };
@@ -14183,7 +14351,7 @@
           sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elwm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elwm";
           sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
           name = "elwm";
         };
@@ -14204,7 +14372,7 @@
           sha256 = "1mchc4d61li5gfsf05dwhgb694fjj9hljnbvwvc12c1iik0zavq0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elx";
           sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
           name = "elx";
         };
@@ -14225,7 +14393,7 @@
           sha256 = "171xgznpgvwl03kzqa9nbpvj3mfznnf050pl2wih390nk5djpg12";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacs-eclim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacs-eclim";
           sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv";
           name = "emacs-eclim";
         };
@@ -14246,7 +14414,7 @@
           sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacs-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacs-setup";
           sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
           name = "emacs-setup";
         };
@@ -14267,7 +14435,7 @@
           sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsagist";
           sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
           name = "emacsagist";
         };
@@ -14288,7 +14456,7 @@
           sha256 = "1rqr08gj07hw37mqd0flmq4a10wn16vy7wg0msqq0ab2smwjhns7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsc";
           sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
           name = "emacsc";
         };
@@ -14309,7 +14477,7 @@
           sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql";
           sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
           name = "emacsql";
         };
@@ -14330,7 +14498,7 @@
           sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-mysql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-mysql";
           sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
           name = "emacsql-mysql";
         };
@@ -14351,7 +14519,7 @@
           sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-psql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-psql";
           sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
           name = "emacsql-psql";
         };
@@ -14372,7 +14540,7 @@
           sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-sqlite";
           sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
           name = "emacsql-sqlite";
         };
@@ -14393,7 +14561,7 @@
           sha256 = "0jn4xj206idh5kgbklgcrngx6wvz9gwfm61wygar6pbfzqyx1y9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsshot";
           sha256 = "08xqx017yfizdj8wz7nbh9i7qpar6398sri78abzf78inv828s9j";
           name = "emacsshot";
         };
@@ -14414,7 +14582,7 @@
           sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emagician-fix-spell-memory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emagician-fix-spell-memory";
           sha256 = "0ffjrpiph21dn8bplklsz3hrsai25l67yyr7n8qjxlwlibwqzv6j";
           name = "emagician-fix-spell-memory";
         };
@@ -14435,7 +14603,7 @@
           sha256 = "0j9vpiybpklf7kgmwpkdyywk29vpigzbn39d0m54z1kvy23xvx6x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emamux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emamux";
           sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
           name = "emamux";
         };
@@ -14456,7 +14624,7 @@
           sha256 = "1idsvilsvlxh72waalhl8vrsmh0vfvz56qcv56fc2c0pb1i90icn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emamux-ruby-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emamux-ruby-test";
           sha256 = "1l1hp2dggjlc287qkfyj21w9lri4agh91g5x707qqq8nicdlv3xm";
           name = "emamux-ruby-test";
         };
@@ -14477,7 +14645,7 @@
           sha256 = "0cv8y6hr719648yxr2fbgb1hyg36m60bsbd57f2vvvqvg87si4jz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ember-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ember-mode";
           sha256 = "0fwd34cim29dg802ibsfd120px9sj54d4wzp3ggmjjzwkl9ky7dx";
           name = "ember-mode";
         };
@@ -14490,15 +14658,15 @@
     ember-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "ember-yasnippets";
-        version = "20160111.1107";
+        version = "20160201.1720";
         src = fetchFromGitHub {
           owner = "ronco";
           repo = "ember-yasnippets.el";
-          rev = "564130ddc4d4b93c281f2221c736c6d0f3066e2f";
-          sha256 = "1v4dac3v0hkq80fpkiih2pcji3j7fw634l3caalxv36dsixmz22y";
+          rev = "5d09e0d95218ce9a9abf9c908effd17f52cf5dbe";
+          sha256 = "1sj033acw1q80accdfkrxw4kzfl8p1ld16y188ikbizvq75lfkpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ember-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ember-yasnippets";
           sha256 = "1alqrv9yhc1f8dhvh2kjcv8qbn1hdgza5iasmchr1wggxds3s50i";
           name = "ember-yasnippets";
         };
@@ -14519,7 +14687,7 @@
           sha256 = "0037nikvlcw6i228jym76pl1mgw4fn5dpz8hfr86b3m0zb012inj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emmet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emmet-mode";
           sha256 = "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819";
           name = "emmet-mode";
         };
@@ -14538,7 +14706,7 @@
           sha256 = "6e653c3b44442e21ec6e4410d8b9c0e51b2f03ed1ae62c1bb1a2ffa6c8c144da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms";
           sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m";
           name = "emms";
         };
@@ -14559,7 +14727,7 @@
           sha256 = "07qbbs2i05bqndr4dxb84z50wav8ffbc56f6saw6pdx6n0sw6n6n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-info-mediainfo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-info-mediainfo";
           sha256 = "17x8vvfhx739hcj9j1nh6j4r6zqnwa5zq9zpi9b6lxc8979k3m4w";
           name = "emms-info-mediainfo";
         };
@@ -14580,7 +14748,7 @@
           sha256 = "03a7sn8pl0pnr05rmrrbw4hjyi8vpjqbvkvh0fqnij913a6qc64l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-mark-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-mark-ext";
           sha256 = "13h6hy8y0as0xfc1cg8balw63as81fzar32q9h4zhnndl3hc1081";
           name = "emms-mark-ext";
         };
@@ -14601,7 +14769,7 @@
           sha256 = "1pz2xvv5hzfg4a8s6xnbr14mpwnr94cwsa1bpk83i7x15hmxj938";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-mode-line-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-mode-line-cycle";
           sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
           name = "emms-mode-line-cycle";
         };
@@ -14622,7 +14790,7 @@
           sha256 = "1yy4dmjp53l2df5qix31g4vizhv80wm88vjqq6qqa9p822732n0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-mpv";
           sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
           name = "emms-player-mpv";
         };
@@ -14635,15 +14803,15 @@
     emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-player-mpv-jp-radios";
-        version = "20151228.912";
+        version = "20160130.940";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "emms-player-mpv-jp-radios";
-          rev = "d68017dfcfdd95a75cbda625628af02727cdd827";
-          sha256 = "0ckd440vbb2gh8cr144hq2f120fzwhfrby9hnd1qkl60pw98b0cb";
+          rev = "552779cd56d1aad54593dbf84db60ec50d3a42a1";
+          sha256 = "05n7jcd3nsnchv0swakf068klhlvckfcb3xjmxf5nnjibffjz77r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-mpv-jp-radios";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-mpv-jp-radios";
           sha256 = "0gdap5cv08pz370fl92v9lyvgkbbyjhp9wsc4kyjm4f4pwx9fybv";
           name = "emms-player-mpv-jp-radios";
         };
@@ -14664,7 +14832,7 @@
           sha256 = "0ajxyv7yx4ni8dizs7acpsxnmy3c9s0dx28vw9y1ym0bxkgfyzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-simple-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-simple-mpv";
           sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
           name = "emms-player-simple-mpv";
         };
@@ -14685,7 +14853,7 @@
           sha256 = "0nx5bb5fjmaa1nhkbfnhd1aydqrq390x4rl1vfh11ilnf52wzzld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-soundcloud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-soundcloud";
           sha256 = "0nf1f719m4pvxn0mf4qyx8mzwhrhv6kchnrpiy9clx520y8x3dqi";
           name = "emms-soundcloud";
         };
@@ -14706,7 +14874,7 @@
           sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-cheat-sheet-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-cheat-sheet-plus";
           sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
           name = "emoji-cheat-sheet-plus";
         };
@@ -14727,7 +14895,7 @@
           sha256 = "0sh4q4sb4j58ryvvmlsx7scry9inzgv2ssa87vbyzpxq0435l229";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-display";
           sha256 = "04cf18z26d64l0sv8qkbxjixi2wbw23awd5fznvg1cs8ixss01j9";
           name = "emoji-display";
         };
@@ -14748,7 +14916,7 @@
           sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-fontset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-fontset";
           sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
           name = "emoji-fontset";
         };
@@ -14769,7 +14937,7 @@
           sha256 = "1fqhydv9anhw0z8zjbz17kbl01bdzif9ncd25vdaa5dzddd16rb1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emojify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emojify";
           sha256 = "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17";
           name = "emojify";
         };
@@ -14790,7 +14958,7 @@
           sha256 = "0bm0cxnv7g2dzfvfhkyy16kzn6shvy9gzypiqyjj42ng54xmhs0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/empos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/empos";
           sha256 = "0wbrszl9rq4is0ymxq9lxpqzlfg93gljh6almjy0hp3cs7pkzyl4";
           name = "empos";
         };
@@ -14803,15 +14971,15 @@
     emr = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }:
     melpaBuild {
         pname = "emr";
-        version = "20140817.1804";
+        version = "20160202.1703";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "emacs-refactor";
-          rev = "fd20fc1887e2ebcf752f0170b1f3bf697043fd4b";
-          sha256 = "0pl7i2a0mf2s33qpsc14dcvqbl6jm5xrvcnrhfr7visvnih29cy4";
+          rev = "d545d9084a76f2043a7f3c9d21ef5692e6843e30";
+          sha256 = "0l0jw5rakb2bsj2n1dxlj02hxvvyrgc2dfh6kn29i145lxpa03bf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emr";
           sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
           name = "emr";
         };
@@ -14842,7 +15010,7 @@
           sha256 = "0dz5xm05d7irh1j8iy08jk521p19cjai1kw68z2nngnyf1az7cim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enclose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enclose";
           sha256 = "04gs468qqhdc9avx7lgibr0f1i444714i7rifad37dfmim8qk759";
           name = "enclose";
         };
@@ -14863,7 +15031,7 @@
           sha256 = "0k5ns40s5nskn0zialwq96qll1v5k50lfa5xh8hxbpcamsfym6h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/encourage-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/encourage-mode";
           sha256 = "0fwn6w7s61c08z0d8z3awclqrhszia9is30gm2kx4hwr9dhhwh63";
           name = "encourage-mode";
         };
@@ -14884,7 +15052,7 @@
           sha256 = "1k17z1dy9m9lx2fy78ack8fyf5vqb79fwjn078f93bcjl5mc7d4k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/engine-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/engine-mode";
           sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
           name = "engine-mode";
         };
@@ -14905,7 +15073,7 @@
           sha256 = "008wggl6xxk339njrgpj2fndbil7k9f3i2hg1mjwqk033j87nbz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enh-ruby-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enh-ruby-mode";
           sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns";
           name = "enh-ruby-mode";
         };
@@ -14926,7 +15094,7 @@
           sha256 = "0vd7zy06nqb1ayjlnf2wl0bfv1cqv2qcb3cgy3zr9k9c4whcd8jh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enlive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enlive";
           sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
           name = "enlive";
         };
@@ -14943,11 +15111,11 @@
         src = fetchFromGitHub {
           owner = "enoson";
           repo = "eno.el";
-          rev = "c07674329f66d6b4ea6c3a3944f801ab77ccb7e6";
-          sha256 = "0var9h1nslww3zlqbl9mvrkz7c9i2g8ka22mwqc1iv92ka3w0czv";
+          rev = "40075bb1ed9e62f42c5799f3d3721734742ed417";
+          sha256 = "1qimqrvk0myqfi2l3viigkx1ld90qpjgi1gs6xhw2g51r8x4i3in";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eno";
           sha256 = "0k4n4vw261v3bcxg7pqhxr99vh673l963yjridl0dp1663gcrfpk";
           name = "eno";
         };
@@ -14968,7 +15136,7 @@
           sha256 = "0v5p97dvzrk3j59yjc6iny71j3fdw9bb8737wnnzm098ff42dfmd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enotify";
           sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
           name = "enotify";
         };
@@ -14981,15 +15149,15 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode2, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20160109.1359";
+        version = "20160201.837";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "14b0384ee5147ba9c22c33e21e56b9ef1de9b377";
-          sha256 = "0rki36vi3ndb295rxg5jr3fbd2lc0ns518s4hzm6p9gnjw83hvik";
+          rev = "52db33ae0304952d2deac6f4467fbeeee75bc62b";
+          sha256 = "1h7hgfzzhl7crwxkaskjhi9axb8aywb0z33a9d5z3c9safmq2r03";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ensime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ensime";
           sha256 = "1d8y72l7bh93x9zdj3d3qjhrrzr804rgi6kjifyrin772dffjwby";
           name = "ensime";
         };
@@ -15018,7 +15186,7 @@
           sha256 = "0jb8hf4v02b0zd02749533arrypjr3b3k88129grfks2kf29ybhb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/envdir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/envdir";
           sha256 = "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8";
           name = "envdir";
         };
@@ -15039,7 +15207,7 @@
           sha256 = "1yn9jn6jl6rmknj50g18z5yvpa1d8mzzx3j1pfdwfn36ak4nc9ba";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eopengrok";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eopengrok";
           sha256 = "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av";
           name = "eopengrok";
         };
@@ -15060,7 +15228,7 @@
           sha256 = "11z08y61xd00rlw5mcyrix8nx41mqs127wighhjsxsyzbfqydxdr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epc";
           sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
           name = "epc";
         };
@@ -15081,7 +15249,7 @@
           sha256 = "18gfi1287skv5xvh12arkvxy2c4fism8bdk42wc5q3y21h8nsiim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epic";
           sha256 = "0gfl8if83jbs0icz6gcjkwxvcz5v744k1kvqnbx3ga481kds9rqf";
           name = "epic";
         };
@@ -15102,7 +15270,7 @@
           sha256 = "0s4k2grikhibd075435giv3bmba1mx71ndxlr0k1i0q0xawpyyb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epl";
           sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
           name = "epl";
         };
@@ -15123,7 +15291,7 @@
           sha256 = "1a8gzf7abda0zgcllyl351m47avnf995i9lvwjf05nyx2jb31dnw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epresent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epresent";
           sha256 = "1x16wqfjfrh7kaqar5px61bf3lnlibvcbr5xaf3mcgph37sgi6la";
           name = "epresent";
         };
@@ -15144,7 +15312,7 @@
           sha256 = "1wwg46xdb488wxvglwvsy08vznrnmdmmbcvm9vb60dy3gqjmz7cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eprime-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eprime-mode";
           sha256 = "0vswjcs24f3mdyw6ai7p21ab8pdn327lr2d6css0a5nrg539cn2g";
           name = "eprime-mode";
         };
@@ -15165,7 +15333,7 @@
           sha256 = "13ds5z2nvanx8cvxrzi0da6ixx7kw222z6mrlbs8cldqcmzm7xh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eproject";
           sha256 = "0kpg4r57khbyinc73v9kj32b9m3b4nb5014r5fkl5mzzpzmd85b4";
           name = "eproject";
         };
@@ -15186,7 +15354,7 @@
           sha256 = "18r66yl52xm1gjbn0dm8z80gv4p3794pi91qa8i2sri4grbsyi5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-colorize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-colorize";
           sha256 = "1m941q7ql3yb71s71783nvz822bwhn1krmin18fvh0fbsbbnck2a";
           name = "erc-colorize";
         };
@@ -15199,15 +15367,15 @@
     erc-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-crypt";
-        version = "20151030.1257";
+        version = "20160203.1824";
         src = fetchFromGitHub {
           owner = "atomontage";
           repo = "erc-crypt";
-          rev = "5d548bab298a27ca5886392c129b14d0e93067be";
-          sha256 = "1hzp42x6f73wsjr5n01i3dzsfrl5pym2l53rzlca11prcccvklfr";
+          rev = "08ff044c1c9ef042913623295e57590e72bd1270";
+          sha256 = "0v2ly3q1r169lxwp6ml70plm6i0s96d0a1wy91ngvqgqpnpk4746";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
           name = "erc-crypt";
         };
@@ -15220,15 +15388,15 @@
     erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-hl-nicks";
-        version = "20140619.722";
+        version = "20160202.1350";
         src = fetchFromGitHub {
           owner = "leathekd";
           repo = "erc-hl-nicks";
-          rev = "e536ea57f842f85ecda5a28ceed24cd506b7be2c";
-          sha256 = "0h2hfa5qpszg0pzi1gc7qfkn9kb37pfg0vlj30049xnryh80r9br";
+          rev = "be181920ce6af0ab5d00d1c638e4e598b3998643";
+          sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-hl-nicks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-hl-nicks";
           sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
           name = "erc-hl-nicks";
         };
@@ -15249,7 +15417,7 @@
           sha256 = "03r13x2hxy4hk0n0ri5wld8rp8frx4j3mig6mn2v25k0cr52689f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-image";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-image";
           sha256 = "1cgzygkysjyrsdr6jwqkxlnisxccsvh4kxgn19rk4n61ms7bafvf";
           name = "erc-image";
         };
@@ -15270,7 +15438,7 @@
           sha256 = "0k3gp4c74g5awk7v9lzb6py3dvf59nggh6dw7530cswxb6kg2psa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-social-graph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-social-graph";
           sha256 = "07arn3k89cqxab5x5lczv8bpgrbirmlw9p6c37fgrl3df6f46h4h";
           name = "erc-social-graph";
         };
@@ -15291,7 +15459,7 @@
           sha256 = "0cfqbqskh260zfq1lx1s8jz2351w2ij9m73rqim16fy7zr0s0670";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-terminal-notifier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-terminal-notifier";
           sha256 = "0vrxkg62qr3ki8n9mdn02sdni5fkj79fpkn0drx0a4kqp0nrrj7c";
           name = "erc-terminal-notifier";
         };
@@ -15312,7 +15480,7 @@
           sha256 = "0n107d77z04ahypa7hn2165kkb6490v4vkzdm5zwm4lfhvlmp0x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-track-score";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-track-score";
           sha256 = "19wjwah2n8ri6gyrsbzxnrvxwr5cj48sxrar1226n9miqvgj5whx";
           name = "erc-track-score";
         };
@@ -15333,7 +15501,7 @@
           sha256 = "118q4zj9dh5xnimcsi229j5pflhcd8qz0p212kc4p9dmyrx2iw0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-tweet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-tweet";
           sha256 = "0bazwq21mah4qrzwaji6w13m91l6v9dqh9svxrd13ij8yycr184b";
           name = "erc-tweet";
         };
@@ -15354,7 +15522,7 @@
           sha256 = "0bzi2sh2fhrz49j5y53h6jgf41av6rx78smb3bbk6m74is8vim2y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-view-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-view-log";
           sha256 = "1k6fawblz0d7kz1y7sa3q43s7ci28jsmzkp9vnl1nf55p9xvv4cf";
           name = "erc-view-log";
         };
@@ -15375,7 +15543,7 @@
           sha256 = "0kh4amx3l3a14qaiyvjyak1jbybs6n49mdvzjrd1i2vd1y74zj5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-youtube";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-youtube";
           sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
           name = "erc-youtube";
         };
@@ -15396,7 +15564,7 @@
           sha256 = "1dlw34kaslyvnsrahf4rm76r2b7qqqn589i4mmhr23prl8xbz9z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-yt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-yt";
           sha256 = "0yrwvahv4l2s1aavy6y6mjlrw8l11i00a249825ab5yaxrkzz7xc";
           name = "erc-yt";
         };
@@ -15417,7 +15585,7 @@
           sha256 = "0xw3d9fz4kmn1myrsy44ki4bgg0aclv41wldl6r9nhvkrnri41cv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ercn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ercn";
           sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
           name = "ercn";
         };
@@ -15436,7 +15604,7 @@
           sha256 = "0cdyhklmsv0xfcq97c3wqh8scs6910jzvvp04w0jxlayd1dbzx49";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eredis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eredis";
           sha256 = "1j0y4h97pqsw6k18w6r3rza3ql04ag3cixyndji7i1smbfsh4v95";
           name = "eredis";
         };
@@ -15449,15 +15617,15 @@
     erefactor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erefactor";
-        version = "20150620.1943";
+        version = "20160121.359";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-erefactor";
-          rev = "fde3fd42c815c76e8015f69518a92f6bfcfde990";
-          sha256 = "17i567nfm0rykimh6bpcc5f2l7wsf8zcdy2jzd7sgrl54dvb0g9i";
+          rev = "bf68085e5635eb94fd85709f8e1355c1f5534745";
+          sha256 = "1v8x6qmhywfxs7crzv7hfl5n4zq5y3ar40l873946l4wyk0wclng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erefactor";
           sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
           name = "erefactor";
         };
@@ -15470,15 +15638,15 @@
     ergoemacs-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20160114.1228";
+        version = "20160204.1341";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "cac19fd1e79f46549e9e6b0ecd2d7a6e3104dd28";
-          sha256 = "0ngbxdasf5sbr0rqki6vakx0p1bcik8bivcwwn7rg77j7v7kflhi";
+          rev = "fd672d7377e49df17816c5aba6e0fcd35b61efd3";
+          sha256 = "12s4rsnp59n8swwisi7jrf721dbz9dr7a9n5r6vnq38avsfa5zw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ergoemacs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
           name = "ergoemacs-mode";
         };
@@ -15495,11 +15663,11 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "427c9f4f7777dd00e0a03a42b9834a4d669305b6";
-          sha256 = "1695js0ws73d21my269hm1s59vgkyjn6w1rxsc45q40zpj88l83x";
+          rev = "a03b7add86b92d0d7d2d744e5555314bedbc2197";
+          sha256 = "06hx5cscqylha7lghlf05mgihiw7mwzg7jjzqx4ffwdkpg5zsnb9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erlang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erlang";
           sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
           name = "erlang";
         };
@@ -15520,7 +15688,7 @@
           sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-async";
           sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
           name = "ert-async";
         };
@@ -15538,7 +15706,7 @@
           sha256 = "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-expectations";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-expectations";
           sha256 = "094lkf1h83rc0dkvdv8923xjrzj5pnpnsb4izk8n5n7g0rbz1l9w";
           name = "ert-expectations";
         };
@@ -15558,7 +15726,7 @@
           sha256 = "eedfdd6753c32d16baa341e6d20abee8713921d8eb850d16782cde55bdbeec46";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-junit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-junit";
           sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
           name = "ert-junit";
         };
@@ -15579,7 +15747,7 @@
           sha256 = "08yfq3qzscxvzyxvyvdqpkrm787278yhkdd9prbvrgjj80p8n7vq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-modeline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-modeline";
           sha256 = "06pc50q9ggin20cbfafxd53x35ac3kh85dap0nbws7514f473m7b";
           name = "ert-modeline";
         };
@@ -15600,7 +15768,7 @@
           sha256 = "0ivnfc42pw9pc9glx2m4klzx4csy4m60hj1x12js7492bd0ri933";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-runner";
           sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
           name = "ert-runner";
         };
@@ -15621,7 +15789,7 @@
           sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-lib";
           sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
           name = "es-lib";
         };
@@ -15631,22 +15799,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    es-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "es-mode";
-        version = "20150916.2233";
+        version = "20160128.1119";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "c5dd41e453e83da2e841894d9a51598f03318f7c";
-          sha256 = "1cc2k52vq2m4hzmrpb51xd5pjnxzv3iy8rf2y02c6f3a5xpilj9k";
+          rev = "a0c142951e6fc932c691e344262aecd422538d17";
+          sha256 = "0hrhj08xnd4xavvx8hyaysnz52c1wd1fgfwgark4lcjlh6aiagdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-mode";
           sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
           name = "es-mode";
         };
-        packageRequires = [ dash ];
+        packageRequires = [ cl-lib dash ];
         meta = {
           homepage = "http://melpa.org/#/es-mode";
           license = lib.licenses.free;
@@ -15663,7 +15831,7 @@
           sha256 = "14rsifcx2kwdmwq9zh41fkb848l0f4igp5v9pk3x4jd2yw9gay7m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-windows";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-windows";
           sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
           name = "es-windows";
         };
@@ -15684,7 +15852,7 @@
           sha256 = "0id7820vjbprlpprj4fyhylkjvx00b87mw4n7jnxn1gczvjgafmc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/escreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/escreen";
           sha256 = "0yis27362jc63jkzdndz1wpysmf1b51rrbv3swvi6b36da5i6b54";
           name = "escreen";
         };
@@ -15705,7 +15873,7 @@
           sha256 = "1k8k9hl9m4vjqdw3x9wg04cy2lb9x64mq0mm0i3i6w59zrsnkn4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esh-buf-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esh-buf-stack";
           sha256 = "0zmwlsm98m9vbjk9mldfj2nf6cip7mlvb71j33ddix76yqggp4qg";
           name = "esh-buf-stack";
         };
@@ -15726,7 +15894,7 @@
           sha256 = "1yfvdx763xxhxf2r6kjjjyafaxrj1lpgrz1sgbhzkyj6nspmm9ms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esh-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esh-help";
           sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w";
           name = "esh-help";
         };
@@ -15747,7 +15915,7 @@
           sha256 = "13crzgkx1lham1nfsg6hj2zg875majvnig0v4ydg691zk1qi4hc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-autojump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-autojump";
           sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
           name = "eshell-autojump";
         };
@@ -15768,7 +15936,7 @@
           sha256 = "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-did-you-mean";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-did-you-mean";
           sha256 = "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz";
           name = "eshell-did-you-mean";
         };
@@ -15789,7 +15957,7 @@
           sha256 = "1b94pamb92a26lvlbwyr7kgaiwax4hkgmmalh8l5ldcwxkscq09c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-git-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-git-prompt";
           sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s";
           name = "eshell-git-prompt";
         };
@@ -15810,7 +15978,7 @@
           sha256 = "0r2fbz5z935vny9cbi857ryddhbg9v8i93jrzn2xvqs3h5wj9jn9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-prompt-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-prompt-extras";
           sha256 = "1plvc8azpmb3phlrxhw3y18dv5y0xljsr5fqym4w84m66lq5csfj";
           name = "eshell-prompt-extras";
         };
@@ -15831,7 +15999,7 @@
           sha256 = "0znk2wmvk7b5mi727cawbddvzx74dlm1lwsxgkiylx2qp299ark0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-z";
           sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
           name = "eshell-z";
         };
@@ -15852,7 +16020,7 @@
           sha256 = "0ir7j4dgy0fq9ybixaqs52kiqk73p9v6prgqzjs8nyicjrpmnpyq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/espresso-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/espresso-theme";
           sha256 = "1bsff8fnq5z0f6cwg6wprz8qi3ivsqxpxx6v6fxfammn74qqyvb5";
           name = "espresso-theme";
         };
@@ -15873,7 +16041,7 @@
           sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/espuds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/espuds";
           sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
           name = "espuds";
         };
@@ -15890,11 +16058,11 @@
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-esqlite";
-          rev = "fae9826cbc255b0f0686a801288f1441bda5f631";
-          sha256 = "0ag444hfrpdrf3lnaz7l2plj392xgh7a2080421z3g0alc74m8h3";
+          rev = "bc4047e09b8f6c34802db86095cd465935670dce";
+          sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esqlite";
           sha256 = "1dny5qjzl9gaj90ihzbhliwk0n0x7jz333hzf6gaw7wsjmx91wlh";
           name = "esqlite";
         };
@@ -15911,11 +16079,11 @@
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-esqlite";
-          rev = "fae9826cbc255b0f0686a801288f1441bda5f631";
-          sha256 = "0ag444hfrpdrf3lnaz7l2plj392xgh7a2080421z3g0alc74m8h3";
+          rev = "bc4047e09b8f6c34802db86095cd465935670dce";
+          sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esqlite-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esqlite-helm";
           sha256 = "00y2nwyx13xlny40afczr31lvbpnw1cgmj5wc3iycyznizg5kvhq";
           name = "esqlite-helm";
         };
@@ -15928,15 +16096,15 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20160118.315";
+        version = "20160127.1710";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "6d05ba7c89371764c43e30a436d7166417cabd4d";
-          sha256 = "0sdg3ai9lw2cwf93qwb5pfwydrdlys0nfcx07mxn9h7k0vsxmjfx";
+          rev = "27d5150f9a9262b3fd861321561b18446d0fb479";
+          sha256 = "091ac8l6d1dvj4jvmpqx6cibydpc7safaamp7845qasm2j97zm4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess";
           sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
           name = "ess";
         };
@@ -15957,7 +16125,7 @@
           sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-R-data-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-R-data-view";
           sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
           name = "ess-R-data-view";
         };
@@ -15978,7 +16146,7 @@
           sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-R-object-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-R-object-popup";
           sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
           name = "ess-R-object-popup";
         };
@@ -15999,7 +16167,7 @@
           sha256 = "0ici253mllqyzcbhxrazfj2kl50brr8qid99fk9nlyfgh516ms1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-smart-equals";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-smart-equals";
           sha256 = "0mfmxmsqr2byj56psx4h08cjc2j3aac3xqr04yd47k2mlivnyrxp";
           name = "ess-smart-equals";
         };
@@ -16020,7 +16188,7 @@
           sha256 = "01xa98q0pqsf4gyl6ixlpjjdqazqsxg1sf7a3j2wbh7196ps61v5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-smart-underscore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-smart-underscore";
           sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
           name = "ess-smart-underscore";
         };
@@ -16041,7 +16209,7 @@
           sha256 = "034rs6mmc5f6y8ply2a90b5s4pi4qx9m49wsxc9v0zwa9i5skmx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esup";
           sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
           name = "esup";
         };
@@ -16062,7 +16230,7 @@
           sha256 = "0mrfkq3jcsjfccqir02yijl24hllc347b02y7gk3b2yn0b676dv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esxml";
           sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
           name = "esxml";
         };
@@ -16083,7 +16251,7 @@
           sha256 = "1k361bbwd9z17qlycymb1x7scidvgvrh9bdp06rhwfh9j3slrbxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/etable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/etable";
           sha256 = "0m4h24mmhp680wfhb90im228mrcyxapzyi4kla8xdmss83gc0c32";
           name = "etable";
         };
@@ -16101,7 +16269,7 @@
           sha256 = "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/etags-select";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/etags-select";
           sha256 = "0j6mxj10n7jf087l7j86s3a8si5hzpwmvrpqisfvlnvn6a0rdy7h";
           name = "etags-select";
         };
@@ -16119,7 +16287,7 @@
           sha256 = "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/etags-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/etags-table";
           sha256 = "1jzij9jknab42jmx358g7f1c0d8lsp9baxbk3xsy7w4nl0l53d84";
           name = "etags-table";
         };
@@ -16140,7 +16308,7 @@
           sha256 = "098mfyw63b23h7jajaik1rfj307sxs82nnwf6b81j550kl2n05y6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ethan-wspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ethan-wspace";
           sha256 = "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws";
           name = "ethan-wspace";
         };
@@ -16161,7 +16329,7 @@
           sha256 = "0vd2crs261na9a682d74ycz1il661kavsz1bvs0bkak09lplc1qz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eval-in-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eval-in-repl";
           sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
           name = "eval-in-repl";
         };
@@ -16182,7 +16350,7 @@
           sha256 = "1syqakdyg3ydnq9gvkjf2rw9rz3kyhzp7avhy6dvyy65pv2ndyc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eval-sexp-fu";
           sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
           name = "eval-sexp-fu";
         };
@@ -16192,17 +16360,38 @@
           license = lib.licenses.free;
         };
       }) {};
+    evalator = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evalator";
+        version = "20160130.1359";
+        src = fetchFromGitHub {
+          owner = "seanirby";
+          repo = "evalator";
+          rev = "edf3840f5aa025cf38d0c2677b2f88f59079409e";
+          sha256 = "1a3y69s7lb24zdivxcpsjh9l6adxyjqxbpgradnj0q1n6kdyq679";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evalator";
+          sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk";
+          name = "evalator";
+        };
+        packageRequires = [ helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/evalator";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20160118.117";
+        version = "20160203.721";
         src = fetchhg {
           url = "https://bitbucket.com/lyro/evil";
-          rev = "e2c001ecfded";
-          sha256 = "1by2b0qa5hk2jvkxg8j4b0wpnw3mbg0vdggp4nh33m61290jsn5k";
+          rev = "5c0114702ea3";
+          sha256 = "1sysqcvzdnzg5qvawv3c0rwfyacjb80mvfdhdmc07vr4pyma6vcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil";
           sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc";
           name = "evil";
         };
@@ -16223,7 +16412,7 @@
           sha256 = "05fba10yvxl82g2xl48mxwz7cwjp4pylb7n8a4b08i8f9xasny7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-annoying-arrows";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-annoying-arrows";
           sha256 = "024zz9l43y1kk2hm8l96h1ahril23cj35f0x72jrcfjysid7wpry";
           name = "evil-annoying-arrows";
         };
@@ -16244,7 +16433,7 @@
           sha256 = "0cnj91lwpmk4c8nf3xi80yvv6anvkg8h1kbzbp16glkgmy6jpmy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-anzu";
           sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
           name = "evil-anzu";
         };
@@ -16265,7 +16454,7 @@
           sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-args";
           sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
           name = "evil-args";
         };
@@ -16286,7 +16475,7 @@
           sha256 = "1q6znbnshk45mdglx519qlbfhb7g47qsm245i93ka4djsjy55j9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-avy";
           sha256 = "1hc96dd78yxgr8cs9sk9y1i5h1qnyk110vlb3wnlxv1hwn92qvrd";
           name = "evil-avy";
         };
@@ -16307,7 +16496,7 @@
           sha256 = "08cpgbwsrk8n88qiq2z90s6wx0ayvrrb38m8dks595x2qzzpa1gi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-cleverparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-cleverparens";
           sha256 = "10zkyaxy52ixh26hzm9v1y0gakcn5sdwz4ny8v1vcmjqjphnk799";
           name = "evil-cleverparens";
         };
@@ -16328,7 +16517,7 @@
           sha256 = "1qiym8f56a18j5swrxx5is48nz7z76531k8cw2c7czr6611l8l5a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-commentary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-commentary";
           sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
           name = "evil-commentary";
         };
@@ -16341,15 +16530,15 @@
     evil-dvorak = callPackage ({ ace-jump-mode, evil, evil-surround, fetchFromGitHub, fetchurl, helm, helm-swoop, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-dvorak";
-        version = "20151104.726";
+        version = "20160127.615";
         src = fetchFromGitHub {
           owner = "jbranso";
           repo = "evil-dvorak";
-          rev = "c193913839e153b0f2c973fae5e6b1fe51809d2b";
-          sha256 = "0jbb0ln54p43rqyw188ggrc848v24mhwdj9xna16y4g41g00i105";
+          rev = "86f7ebd4dc5db6cd126ef2e12a113c9af1354e53";
+          sha256 = "0fdlj2m8bzdwqh43qb34il3fmang0zpdgxfkrsmxy9kpc0bsx940";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-dvorak";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-dvorak";
           sha256 = "1iq9wzcb625vs942khja39db1js8r46vrdiqcm47yfji98g39gsn";
           name = "evil-dvorak";
         };
@@ -16370,7 +16559,7 @@
           sha256 = "17dng6iik4jzri6f435icrfb5g9zs2zqc6jgwkpphsgjcc12izrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-easymotion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-easymotion";
           sha256 = "0zixgdhc228y6yqr044cbyls0pihzacqsgvybhhar916p4h8izgv";
           name = "evil-easymotion";
         };
@@ -16383,15 +16572,15 @@
     evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-ediff";
-        version = "20160118.1118";
+        version = "20160202.1441";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "evil-ediff";
-          rev = "1df82b66e16794987d8cd3e5fa05ab1920ae48dd";
-          sha256 = "1qf94jfp6vgm3lg8wsmpk137rdv0q0n3d6xcc54afhm9qi84gzkn";
+          rev = "c852bf960db9a9f13089b29c1b68ab4fffe55171";
+          sha256 = "16pz48gdpl68azaqwyixh10y1x9xzi1lnhq2v0nrd0y6bfcqcvc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-ediff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-ediff";
           sha256 = "1xwl2511byb00ybfnm6q6mbkgzarrq8bfv5rbip67zqbw2qgmb6i";
           name = "evil-ediff";
         };
@@ -16412,7 +16601,7 @@
           sha256 = "1dl201jx7kfmkhd7ism6wlmlnbgfg1qn17faryz7kc5v2mms69b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-escape";
           sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
           name = "evil-escape";
         };
@@ -16433,7 +16622,7 @@
           sha256 = "0gbpd1wmlcvddiym0r410rch8bjg4gxslynwmfqywwgbva8zm46c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-exchange";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-exchange";
           sha256 = "1mvw7w23yfbfmhzj6wimslbryb0gppryw24ac0wh4fzl9rdcma4r";
           name = "evil-exchange";
         };
@@ -16454,7 +16643,7 @@
           sha256 = "1cv24qnxxf6n1grf4n5969v8y9xll5zb9mbfdnq9iavdvhnndk2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-god-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-god-state";
           sha256 = "1g547d58zf11qw0zz3fk5kmrzmfx1rhawyh5d2h8bll8hwygnrxf";
           name = "evil-god-state";
         };
@@ -16475,7 +16664,7 @@
           sha256 = "1kdigwpl9pp88l11bkpxkw91pvs8z3gachxccibivzgjxd2pnvfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-iedit-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-iedit-state";
           sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
           name = "evil-iedit-state";
         };
@@ -16496,7 +16685,7 @@
           sha256 = "1g6r1ydscwjvmhh1zg4q3nap4avk8lb9msdqrh7dff6pla0r2qs6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-indent-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-indent-plus";
           sha256 = "15vnvch0qsaram22d44k617bqhr9rrf8qc86sf20yvdyy3gi5j12";
           name = "evil-indent-plus";
         };
@@ -16517,7 +16706,7 @@
           sha256 = "0nghisnc49ivh56mddfdlcbqv3y2vqzjvkpgwv3zp80ga6ghvdmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-indent-textobject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-indent-textobject";
           sha256 = "172a3krid5lrx1w9xcifkhjnvlxg1nbz4w102d99d0grr9465r09";
           name = "evil-indent-textobject";
         };
@@ -16530,15 +16719,15 @@
     evil-jumper = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-jumper";
-        version = "20160114.1429";
+        version = "20160119.1809";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "evil-jumper";
-          rev = "b57b706a3a983462c9c764da1670f7bde5eb0471";
-          sha256 = "1h8v78wlr1v5k6fdk8v8nkx3xqp9yf5gpzyn1f3k9wn8rp7bbjhb";
+          rev = "f18fbae5c971211bec6bd56cccf7196ede798bf7";
+          sha256 = "1p9r7dqhp2bnsgj18fpmf7wamndgmgkw1c5lrnx3hngwnfkw2fgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-jumper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-jumper";
           sha256 = "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x";
           name = "evil-jumper";
         };
@@ -16559,7 +16748,7 @@
           sha256 = "10xrlimsxk09z9cw6rxdz8qvvn1i0vhc1gdicwxri0j10p0hacl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-leader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-leader";
           sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
           name = "evil-leader";
         };
@@ -16580,7 +16769,7 @@
           sha256 = "0lvjqs40caxj3781cs41qavk10vlz2mjw0r6fmxa2z3c087cxnxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-lisp-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-lisp-state";
           sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
           name = "evil-lisp-state";
         };
@@ -16593,15 +16782,15 @@
     evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "evil-magit";
-        version = "20160117.2026";
+        version = "20160203.1803";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "evil-magit";
-          rev = "233d0bd6c87c8113e4ed4684b50c3eb5a5d91a67";
-          sha256 = "00ly0p93l9li2hydpkijyp7mi00kwjw4nyzw2ibxabqsv4071clz";
+          rev = "6bccbe90390436fd814d55e9ba4408e0454c99cd";
+          sha256 = "0mih5s2kk6pas1w1i62ghsi3jdx5qm0b7yqbc924rz2zp6za3p0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-magit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-magit";
           sha256 = "10mhq6mzpklk5sj28lvd478dv9k84s81ax5jkwwxj26mqdw1ybg6";
           name = "evil-magit";
         };
@@ -16622,7 +16811,7 @@
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-mark-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-mark-replace";
           sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
           name = "evil-mark-replace";
         };
@@ -16643,7 +16832,7 @@
           sha256 = "0kf4m1ghpxfalqx2zwm1d8xav4d6l6bpk79g5cvssk5jz5913fbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-matchit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-matchit";
           sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
           name = "evil-matchit";
         };
@@ -16656,15 +16845,15 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20151230.1042";
+        version = "20160202.1527";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "6b2ec63d4824243e6eec75618365a45620af2957";
-          sha256 = "1idngl8b3k7mpyxkrg3hg87w7iz2p5smbcl9lsckm1c01z0siwjr";
+          rev = "d06bb3f47411e5f210ac986abc04a60d15808f68";
+          sha256 = "12af93aba20m9h8dgz6bxhm63khrlx0iclnwflkdy4s5w229938q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-mc";
           sha256 = "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs";
           name = "evil-mc";
         };
@@ -16685,7 +16874,7 @@
           sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-nerd-commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-nerd-commenter";
           sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
           name = "evil-nerd-commenter";
         };
@@ -16706,7 +16895,7 @@
           sha256 = "1aq95hj8x13py0pwsnc6wvd8cc5yv5qin8ym9js42y5966vwj4np";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-numbers";
           sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
           name = "evil-numbers";
         };
@@ -16727,7 +16916,7 @@
           sha256 = "0pir7a3xxbcp5f3q9pi36rpdpi8pbx18afmh0r3501ynssyjfq53";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-org";
           sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
           name = "evil-org";
         };
@@ -16748,7 +16937,7 @@
           sha256 = "0b08y4spapl4g2292j3l4cr84gjlvm3rpma3gqld4yb1sxd7v78p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-paredit";
           sha256 = "0xvxxa3gjgsrv10a61y0591bn3gj8v1ff2wck8s0svwfl076gyfy";
           name = "evil-paredit";
         };
@@ -16761,15 +16950,15 @@
     evil-quickscope = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-quickscope";
-        version = "20150929.1448";
+        version = "20160202.1324";
         src = fetchFromGitHub {
           owner = "blorbx";
           repo = "evil-quickscope";
-          rev = "d2f512fa4bd0b0603529a441e474ca551f621650";
-          sha256 = "0yx5ry102hzhqx1aql58fkd986xgj250bbcxabpnvy27gim2b977";
+          rev = "37a20e4c56c6058abf186ad4013c155e695e876f";
+          sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-quickscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-quickscope";
           sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
           name = "evil-quickscope";
         };
@@ -16790,7 +16979,7 @@
           sha256 = "12rdx5zjp5pck008cykpw200rr1y0b3lj2dpzf82llfyfaxzh7wi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-rails";
           sha256 = "0ah0nvzl30z19566kacyrsznsdm3cpij8n3bw3dfng7263rh60gj";
           name = "evil-rails";
         };
@@ -16811,7 +17000,7 @@
           sha256 = "176rdp7mp9p0w5s7539jgldfn3r79q653g8yzcp99y59b8dycbh5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-rsi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-rsi";
           sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
           name = "evil-rsi";
         };
@@ -16832,7 +17021,7 @@
           sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-search-highlight-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-search-highlight-persist";
           sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
           name = "evil-search-highlight-persist";
         };
@@ -16853,7 +17042,7 @@
           sha256 = "0xwrg03w40pncdy5ppn7f77ravcbimj1ylc1r4clpqiha1d4xkhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-smartparens";
           sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
           name = "evil-smartparens";
         };
@@ -16874,7 +17063,7 @@
           sha256 = "0iyk8pn7pc3js3ppn46myzfr2i0b47wwrzv72939aydpw64rx76q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-snipe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
           name = "evil-snipe";
         };
@@ -16895,7 +17084,7 @@
           sha256 = "1x4nphjq8lvg8qsm1pj04mk9n59xc6jlxiv5s3bih1nl4xkssrxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-space";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-space";
           sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
           name = "evil-space";
         };
@@ -16908,15 +17097,15 @@
     evil-surround = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-surround";
-        version = "20151210.1418";
+        version = "20160128.1228";
         src = fetchFromGitHub {
           owner = "timcharper";
           repo = "evil-surround";
-          rev = "9f1ab3c302d585c3489f0429b904e7e6e3204e94";
-          sha256 = "15vy2l6q0zm50wknw4fnz2v3j81p77y4ya7clk66lia3qdca4z9v";
+          rev = "bfa438cf62e29074b3fc68c582765a7e0f9907e4";
+          sha256 = "01p02h17ls0pmisnfbyna7xf6fz2c7fyyvdb1yq38dwv2j4zi1b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-surround";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-surround";
           sha256 = "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag";
           name = "evil-surround";
         };
@@ -16937,7 +17126,7 @@
           sha256 = "1rjpgcl9m23fzlw9gfp0yyf5k5dcgn88pjm8glmmdpx1b08ymk79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-tabs";
           sha256 = "0qgvpv5hcai8wmkv2fp6i2vdy7qp4gwidwpzz8j6vl9519x73s62";
           name = "evil-tabs";
         };
@@ -16958,7 +17147,7 @@
           sha256 = "10aic2r1akk38hh761hr5vp9fjlh1m5nimag0nzdq5x9g9467cc8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-terminal-cursor-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-terminal-cursor-changer";
           sha256 = "1300ch6f8mkz45na1hdffglhw0cdrrxmwnbd3g4m3sl5z4midian";
           name = "evil-terminal-cursor-changer";
         };
@@ -16979,7 +17168,7 @@
           sha256 = "1v4z2snllgg32cy8glv7xl0m9ib7rwi5ixgdydz1d0sx0z62jyhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-textobj-anyblock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-textobj-anyblock";
           sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
           name = "evil-textobj-anyblock";
         };
@@ -17000,7 +17189,7 @@
           sha256 = "0nff90v6d97n2xizvfz126ksrf7ngd5rp0j7k7lhbv0v5zcqgxiv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-textobj-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-textobj-column";
           sha256 = "13q3nawx05rn3k6kzq1889vxjznr454cib96pc9lmrq7h65lym2h";
           name = "evil-textobj-column";
         };
@@ -17021,7 +17210,7 @@
           sha256 = "00yfq8aflxvp2nnz7smgq0c5wlb7cips5irj8qs6193ixlkpffvx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-tutor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-tutor";
           sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
           name = "evil-tutor";
         };
@@ -17042,7 +17231,7 @@
           sha256 = "0m4ipz3x5k3gbyjgsnhl6rr4jvhqn61cyc1gmv0mkc2pbqqs1ijq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-vimish-fold";
           sha256 = "01wp4h97hjyzbpd7iighjj26m79499wp5pn8m4pa7v59f6r3sdk6";
           name = "evil-vimish-fold";
         };
@@ -17063,7 +17252,7 @@
           sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-visual-mark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-visual-mark-mode";
           sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
           name = "evil-visual-mark-mode";
         };
@@ -17084,7 +17273,7 @@
           sha256 = "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-visualstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-visualstar";
           sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
           name = "evil-visualstar";
         };
@@ -17105,7 +17294,7 @@
           sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evm";
           sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
           name = "evm";
         };
@@ -17126,7 +17315,7 @@
           sha256 = "1frhcgkiys0pqrlcsi5zcl3ngblr38wrwfi6wzqk75x21rnwnbqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ewmctrl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ewmctrl";
           sha256 = "1w60pb7szai1kh06jd3qvgpzq3z1ci4a77ysnpqjfk326s6zv7hl";
           name = "ewmctrl";
         };
@@ -17147,7 +17336,7 @@
           sha256 = "1i6zf17rwa390c33cbspz81dz86vwlphyhjjsia4gp205nfk3s20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eww-lnum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eww-lnum";
           sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
           name = "eww-lnum";
         };
@@ -17164,11 +17353,11 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "4d6a6aa18031a4bbdd5b3bfad8686dc5ff942ab2";
-          sha256 = "0n86zj350jw1lxnaa450qmggza0za3a1zg9k9clwb9cjz4wwghsi";
+          rev = "c2ca275d3243e8253513ced73e3ac21dc352e303";
+          sha256 = "0xxk0cr28g7vw8cwsnwrdrc8xqr50g6m9h0v43mx2iws9pn9dd47";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/exec-path-from-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/exec-path-from-shell";
           sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
           name = "exec-path-from-shell";
         };
@@ -17189,7 +17378,7 @@
           sha256 = "0wz4h5hrr5ci0w8pynd2nr1b2zl5hl4pa8gc16mcabik5927rf7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/expand-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/expand-line";
           sha256 = "07nfgp6jlrb9wxqy835j79i4g88714zndidkda84z16qn2y901a9";
           name = "expand-line";
         };
@@ -17210,7 +17399,7 @@
           sha256 = "0qqqv0pp25xg1zh72i6fsb7l9vi14nd96rx0qdj1f3pdwfidqms1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/expand-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/expand-region";
           sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
           name = "expand-region";
         };
@@ -17231,7 +17420,7 @@
           sha256 = "0ah8zayipwp760909llb9whcdvmbsdgkg0x5y4qlcicm1r9kwcc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/express";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/express";
           sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
           name = "express";
         };
@@ -17252,7 +17441,7 @@
           sha256 = "0nry653cd3qzsj6asrf9hh4zkzhz8nnwjrg1wp17f5ggzpjyybjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/extempore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/extempore-mode";
           sha256 = "1z8nzpcj27s74kxfjz7wyr3848jpd6mbyjkssd06ri5p694j9php";
           name = "extempore-mode";
         };
@@ -17273,7 +17462,7 @@
           sha256 = "15dwl1rb3186k328a83dz9xmslc0px60ah16fifvmr3migis9hwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/extend-dnd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/extend-dnd";
           sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
           name = "extend-dnd";
         };
@@ -17294,7 +17483,7 @@
           sha256 = "0w2g7rpw26j65j4r23w6j8nw3arw73l601kyy6qv9p9bkk1yc072";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eyebrowse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eyebrowse";
           sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
           name = "eyebrowse";
         };
@@ -17313,7 +17502,7 @@
           sha256 = "1fg3j0jlww2rqc6k2nq95hcg6i26nqdp043h7kyjcwrgqbjfsigl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eyedropper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eyedropper";
           sha256 = "07kdn90vm2nbdprw9hwdgi4py6gqzmrad09y1fwqdy49hrvbwdzk";
           name = "eyedropper";
         };
@@ -17334,7 +17523,7 @@
           sha256 = "1rgzydxv7c455vj1jm44vvs6xc4qgivqqb0g6zh5x4wdcpgdi2g9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eyuml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eyuml";
           sha256 = "0ada2gcl8bw9nn0fz8g9lbqy8a8w1554q03fzd7lv8qla33ri3wx";
           name = "eyuml";
         };
@@ -17355,7 +17544,7 @@
           sha256 = "15qa09x206s7rxmk35rslqniydh6hdb3n2kbspm5zrndcmsqz4zi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ez-query-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ez-query-replace";
           sha256 = "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx";
           name = "ez-query-replace";
         };
@@ -17376,7 +17565,7 @@
           sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/f";
           sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
           name = "f";
         };
@@ -17397,7 +17586,7 @@
           sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fabric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fabric";
           sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
           name = "fabric";
         };
@@ -17415,7 +17604,7 @@
           sha256 = "0yr3fqpn9pj6y8bsb6g7hkg75sl703pzngn8gp0sgs3v90c180l5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/face-remap+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/face-remap+";
           sha256 = "0vq6xjrv3qic89pxzi6mx1s08k4ba27g8wqm1ap4fxh3l14wkg0y";
           name = "face-remap-plus";
         };
@@ -17433,7 +17622,7 @@
           sha256 = "1kayc4hsalvqnn577y3f97w9kz94c53vcxwx01s0k34ffav919c2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/facemenu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/facemenu+";
           sha256 = "0lbggalgkj59wj67z95949jmppmqrzrp63mdhw42r2x0fz1ir0iv";
           name = "facemenu-plus";
         };
@@ -17451,7 +17640,7 @@
           sha256 = "0sqrymmr583cgqmv4bs6rjms5ij5cm8vvxjrfc9alacwyz5f7w8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/faces+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/faces+";
           sha256 = "0k3m434f3d3061pvir0dnykmv6r9jswl7pzybzja3afiy591hh92";
           name = "faces-plus";
         };
@@ -17472,7 +17661,7 @@
           sha256 = "0sjmjydapfnv979dx8dwiz67wffamiaf41s4skkwa0wn2h4p6wja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/faceup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/faceup";
           sha256 = "0l41xp38iji55dv20lk7r187ywcz8s1g2jmwbjwkspzmcf763xvx";
           name = "faceup";
         };
@@ -17493,7 +17682,7 @@
           sha256 = "19zm9my7fl1r3q48axjv2f8x9hcjk6qah4y4r92b90bzfmcdc30y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/factlog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/factlog";
           sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
           name = "factlog";
         };
@@ -17514,7 +17703,7 @@
           sha256 = "1sc5f867h7i0n2gd9qcydqn1b2pk227l92ad4bf9nnpl3jmdr26v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/faff-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/faff-theme";
           sha256 = "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g";
           name = "faff-theme";
         };
@@ -17535,7 +17724,7 @@
           sha256 = "11fm0h9rily5731s137mgv8rdbfqi99s6f36bgr0arwbq3f2j3fs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fakespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fakespace";
           sha256 = "09dsmrqax4wfcw8fd5jf07bjxm5dizpc2qvjkqwg74j2n352wv27";
           name = "fakespace";
         };
@@ -17556,7 +17745,7 @@
           sha256 = "1w5apzbzr1jd983b0rzsy9ldb0z0zcq6mpyb5r8czl5wd4vvj69h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fakir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fakir";
           sha256 = "07bicglgpm6qkcsxwj6rswhx4hgh27rfg8s1cki7g8qcvk2f7b25";
           name = "fakir";
         };
@@ -17577,7 +17766,7 @@
           sha256 = "0m7rjzl9js2gjfcaqp2n5pn5ykpqnv8qfv35l5m5kpfigsi9cbb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fancy-battery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fancy-battery";
           sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
           name = "fancy-battery";
         };
@@ -17590,15 +17779,15 @@
     fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fancy-narrow";
-        version = "20151021.533";
+        version = "20160124.603";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "fancy-narrow";
-          rev = "5196dc6066d354883fa21090266b6cebccc9f6fd";
-          sha256 = "1i6xq03fhkffahrlfjcds5mvk4rsipia9diaqv7qfbhzrfwvn665";
+          rev = "4737d706d1f3e90885e6642ba782f1fa605414c6";
+          sha256 = "0825hyz8b2biil0pd2bgjxqd2zm3gw9si7br5hnh51qasbaw9hid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fancy-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fancy-narrow";
           sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
           name = "fancy-narrow";
         };
@@ -17619,7 +17808,7 @@
           sha256 = "08lgfa2k42qpcs4999b77ycsg76zb56qbcxbsvmg0pcwjwa1ambz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/farmhouse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/farmhouse-theme";
           sha256 = "0hbqdrw6x25b331qhbg3yaaa45c2b896wknsjm0a1kg142klq229";
           name = "farmhouse-theme";
         };
@@ -17640,7 +17829,7 @@
           sha256 = "0m2qn3rd16s7ahyw6f9a4jb73sdc8bqp6d03p450yzcn36lw78z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fasd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fasd";
           sha256 = "0i49z50bpi7fx0dm5jywlndnq9hb0dm5a906k4017w8y7sfpfl6c";
           name = "fasd";
         };
@@ -17661,7 +17850,7 @@
           sha256 = "0y95lrdqd9i2kbb266s1wdiim4m8vrn3br19d8s55ib6xlywf8cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fastnav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fastnav";
           sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
           name = "fastnav";
         };
@@ -17671,18 +17860,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "faust-mode";
+        version = "20160119.1120";
+        src = fetchFromGitHub {
+          owner = "magnetophon";
+          repo = "emacs-faust-mode";
+          rev = "de3015c23aa26e8242e69293f0e2966b329b7dcf";
+          sha256 = "0m9nzl0z3gc6fjpfqklwrsxlcgbbyydls004a39wfppyz0wr94fy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/faust-mode";
+          sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc";
+          name = "faust-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/faust-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
-        version = "20160107.2318";
+        version = "20160202.1609";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "fcitx.el";
-          rev = "5e216df6df652599d921e00afb6e52a050f8cb50";
-          sha256 = "03w68zbgprly45i6ps7iviwvjf3acbc7f7acvjpzj2plf0g5i19z";
+          rev = "7a7a07c6cebb0f765a28d27de042c8088969a789";
+          sha256 = "0ybxm656j4p3j47cgh3xm4wln6rai16s8ag55dbsznxdn158c3ss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fcitx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fcitx";
           sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
           name = "fcitx";
         };
@@ -17703,7 +17913,7 @@
           sha256 = "0c56j8ip2fyma9yvwaanz89jyzgi9k11xwwkflzlzc4smnvgfibr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fcopy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fcopy";
           sha256 = "13337ymf8vlbk8c4jpj6paqi06xdmk39yf72s40kmfrbvgmi8qy1";
           name = "fcopy";
         };
@@ -17720,11 +17930,11 @@
         src = fetchFromGitHub {
           owner = "michaelklishin";
           repo = "cucumber.el";
-          rev = "40886bc4cc5b1e855d6bb78505ebc651593d409d";
-          sha256 = "18b27xfajhd0vi7dcaky7pi7vmnlmdb88gkx3hwangj78d24as5d";
+          rev = "84562dd5cb2d86216cf548be47defb094de04960";
+          sha256 = "0ylm4zcf82f5rl4lps5p6p8dc3i5p2v7w93caadgzv5qbl400h5d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/feature-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/feature-mode";
           sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
           name = "feature-mode";
         };
@@ -17745,7 +17955,7 @@
           sha256 = "0pjw9fb3n08yd38680ifdn2wlnw2k6q97lzhqb2259mywsycyqy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fetch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fetch";
           sha256 = "1jqc6pspgcrdzm7ij46r1q6vpjq7il5dy2xyxwn2c1ky5a80paby";
           name = "fetch";
         };
@@ -17763,7 +17973,7 @@
           sha256 = "110h0ff7bkwx7icph0j997hq53zpyz426dji4vs89zf75cf1nl7s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fic-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fic-mode";
           sha256 = "037f2jr8bs2sfxw28cal2d49bsbrg0zkz2xdham627l04qnkgv8x";
           name = "fic-mode";
         };
@@ -17782,7 +17992,7 @@
           sha256 = "0xnr709vmwbryyfxngxs80gjfxv009ik6wcs4jd74ph5lm6gqh4f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/figlet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/figlet";
           sha256 = "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj";
           name = "figlet";
         };
@@ -17800,7 +18010,7 @@
           sha256 = "0s79b5jj3jfl3aih6r3fa0zix40arysk6mz4fijapd8ybaflz25n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/files+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/files+";
           sha256 = "1m1pxf6knrnyc9ygmyr27gm709ydxf0kkh1xrfcza6n476frmwr8";
           name = "files-plus";
         };
@@ -17818,7 +18028,7 @@
           sha256 = "020rpjrjp2gh4w6mrphrvk27kdizfqbjsw2sxraf8jz0dibg9gfg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/filesets+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/filesets+";
           sha256 = "06n8pw8c65bmrkxda2akvv57ndfijgbp95l40j7sjg8bjp385spn";
           name = "filesets-plus";
         };
@@ -17839,7 +18049,7 @@
           sha256 = "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fill-column-indicator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fill-column-indicator";
           sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
           name = "fill-column-indicator";
         };
@@ -17860,7 +18070,7 @@
           sha256 = "1x9wmxbcmd6qgdyzrl978nczfqrgyk6xz3rnh5hffbapy1v1rw47";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fillcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fillcode";
           sha256 = "0bfsw55vjhx88jpy6npnzfwinvggivbvkk7fa3iwzq19005fkag2";
           name = "fillcode";
         };
@@ -17881,7 +18091,7 @@
           sha256 = "0f76cgh97z0rbbg2bp217nqmxfimzkvw85k9mx8bj78i9s2cdmwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/finalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
@@ -17902,7 +18112,7 @@
           sha256 = "18a4ydp30ycx5w80j3xgghclzmzbvrkl2awxixy4aj68nmljk480";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-by-pinyin-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
           name = "find-by-pinyin-dired";
         };
@@ -17920,7 +18130,7 @@
           sha256 = "1pch1kjbgnbf8zmlxh6wg4ch9bpfg7hmwkw1mrr1hiym05xvza0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-dired+";
           sha256 = "06a6lwx61xindlchh3ps8khhxc6sr7i9d7i60rjw1h07nxmh0fli";
           name = "find-dired-plus";
         };
@@ -17941,7 +18151,7 @@
           sha256 = "0bf32nhpmjvvgnr6g9xqh8pqnhr3dl24y3g40lsv4pc8ffs70ydm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-file-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-file-in-project";
           sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
           name = "find-file-in-project";
         };
@@ -17962,7 +18172,7 @@
           sha256 = "090m5647dpc8r8fwi3mszvc8kp0420ma5sv0lmqr2fpxyn9ybkjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-file-in-repository";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-file-in-repository";
           sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
           name = "find-file-in-repository";
         };
@@ -17983,7 +18193,7 @@
           sha256 = "1d6zn3qsg4lpk13cvn5r1w88dnhfydnhwf59x6cb4sy5q1ihk0g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-temp-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-temp-file";
           sha256 = "0c98zm94958rb9kdvqr3pad744nh63y3vy3lshfm0lsg85k9j62p";
           name = "find-temp-file";
         };
@@ -18004,7 +18214,7 @@
           sha256 = "1r6cs7p43pi6n2inbrv9q924m679izxwxqgyr4sjjj3lg6an4cnx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-things-fast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-things-fast";
           sha256 = "1fs3wf61lzm1hxh5sx8pr74g7g9np3npdwg7xmk81b5f2jx2vy6m";
           name = "find-things-fast";
         };
@@ -18022,7 +18232,7 @@
           sha256 = "0x3f9qygp26c4yw32cgyy35bb4f1fq0fg7q8s9vs777skyl3rvp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/finder+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/finder+";
           sha256 = "1ichxghp2vzx01n129fmjm6iwx4b98ay3xk1ja1i8vzyd2p0z8vh";
           name = "finder-plus";
         };
@@ -18040,7 +18250,7 @@
           sha256 = "0a04mgya59w468jv2bmkqlayzgh0r8sdz0qg3n70wn9rhdcwnl9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/findr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/findr";
           sha256 = "0pxyfnn3f70gknxv09mfkjixqkzn77rdbql703wsslrj2v1l7bfq";
           name = "findr";
         };
@@ -18061,7 +18271,7 @@
           sha256 = "1vjgcxyzv2p74igr3y0z6hk7bj6yqwjawx90xvvmp9z7m91d4yrg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fingers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fingers";
           sha256 = "1r8fy6q6isjxz9mvaa8in4imdghzla3gg1l93dfm1v2rlr7bhzbg";
           name = "fingers";
         };
@@ -18082,7 +18292,7 @@
           sha256 = "14yy7kr2iv549xaf5gkav48lk2hzmvipwbs0rzljzw60il6k05hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fiplr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fiplr";
           sha256 = "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i";
           name = "fiplr";
         };
@@ -18103,7 +18313,7 @@
           sha256 = "02ajday0lnk37dnzf4747ha3w0azisq35fmdhq322hx0hfb1c66x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firebelly-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firebelly-theme";
           sha256 = "0lns846l70wcrzqb6p5cy5hpd0szh4gvjxd4xq4zsb0z5nfz97jr";
           name = "firebelly-theme";
         };
@@ -18124,7 +18334,7 @@
           sha256 = "0v8liv6aq10f8dxbl3d4rph1qk891dlxm9wqdc6w8aj318750hfm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firecode-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firecode-theme";
           sha256 = "10lxd93lkrvz8884dv4sh6fzzg355j7ab4p5dpvwry79rhs7f739";
           name = "firecode-theme";
         };
@@ -18137,15 +18347,15 @@
     firefox-controller = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, moz, popwin }:
     melpaBuild {
         pname = "firefox-controller";
-        version = "20160104.1725";
+        version = "20160125.1721";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "emacs-firefox-controller";
-          rev = "26a2e4b9246a7b5415032799b742b998529fce9e";
-          sha256 = "1rz56n2gmw11w2yxlhn0i8xmig9m8lxihgaikg65xmy9nqa5j7bj";
+          rev = "0282bccb8ef7edcacb54a4991cc2c51bfdbf04a7";
+          sha256 = "1hr4mfvaz8rc60fn5xi7sp1xn72rk2fg346di3mmcfnb9na9cbzq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firefox-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firefox-controller";
           sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6";
           name = "firefox-controller";
         };
@@ -18166,7 +18376,7 @@
           sha256 = "1smg4mqc5qdwzk5mp2hfm6l4s7k408x46xfl7fl45csb18islmrp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fireplace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fireplace";
           sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
           name = "fireplace";
         };
@@ -18187,7 +18397,7 @@
           sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firestarter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firestarter";
           sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
           name = "firestarter";
         };
@@ -18208,7 +18418,7 @@
           sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fish-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fish-mode";
           sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
           name = "fish-mode";
         };
@@ -18226,7 +18436,7 @@
           sha256 = "082c6yyb1269va6k602hxpdf7ylfxz8gq8swqzwf07qaas0b5qxd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fit-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fit-frame";
           sha256 = "1xcq4n9gj0npjjl98vqacms0a0wnzw62a9iplyf7bgj7n77pgkjb";
           name = "fit-frame";
         };
@@ -18236,6 +18446,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fix-input";
+        version = "20160122.2319";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "fix-input";
+          rev = "728ae9258ebe790a69cf332407cba2f8c0be7d81";
+          sha256 = "16rd23ygh76fs4i7rni94k8gwa9n360h40qmhm65snp31kqnpr1p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fix-input";
+          sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p";
+          name = "fix-input";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fix-input";
+          license = lib.licenses.free;
+        };
+      }) {};
     fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fix-word";
@@ -18247,7 +18478,7 @@
           sha256 = "17f11v9sd5fay3i4k6lmpsjicdw9j3zvx3fvhx0a86mp7ay2ywwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fix-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fix-word";
           sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
           name = "fix-word";
         };
@@ -18268,7 +18499,7 @@
           sha256 = "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fixmee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fixmee";
           sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
           name = "fixmee";
         };
@@ -18296,7 +18527,7 @@
           sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flappymacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flappymacs";
           sha256 = "0dcpl5n7wwsk62ddgfrkq5dkm91569y4i4f0yqa61pdmzhgllx7d";
           name = "flappymacs";
         };
@@ -18317,7 +18548,7 @@
           sha256 = "0z77lm6jv2w5z551pwarcx6xg9kx8fgms9dlskngfvnzbqkldj1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flash-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flash-region";
           sha256 = "1rgg7j34ka0nj1yjl688asim07bbz4aavh67kly6dzzwndr0nw8c";
           name = "flash-region";
         };
@@ -18338,7 +18569,7 @@
           sha256 = "0ib6r6q4wbkkxdwgqsd25nx7ccxhk16lqkvwikign80j9n11g7s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flatland-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flatland-black-theme";
           sha256 = "0cl2qbry56nb4prbsczffx8h35x91pgicw5pld0ndw3pxid9h2da";
           name = "flatland-black-theme";
         };
@@ -18359,7 +18590,7 @@
           sha256 = "0cl8m1i1aaw4zmkrkhfchhp0gxhpvhcmpjglsisjni47y5mydypf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flatland-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flatland-theme";
           sha256 = "14drqwcp9nv269aqm34d426a7gx1a7kr9ygnqa2c8ia1fsizybl3";
           name = "flatland-theme";
         };
@@ -18380,7 +18611,7 @@
           sha256 = "0j8pklgd2sk01glgkr24b5n5521425vws8zwdi4sxcv74922j5zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flatui-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flatui-theme";
           sha256 = "0s88xihw44ks4b07wcb9swr52f3l1ls0jn629mxvfkv4a6hn7rmz";
           name = "flatui-theme";
         };
@@ -18401,7 +18632,7 @@
           sha256 = "187ah7yhmr3ckw23bf4fivx8v79yj0zmilrkjj7k6l198w8wmvql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flex-autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flex-autopair";
           sha256 = "0hphrqwryp3c0wwyf2f16hj8nc7jlg2dkvljgm2rdvmh2kgj3007";
           name = "flex-autopair";
         };
@@ -18421,7 +18652,7 @@
           sha256 = "02z1w8z9fqdshyyf03c26zjwhmmclb02caw3b6nhhk4w1rkbh6is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flex-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flex-isearch";
           sha256 = "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3";
           name = "flex-isearch";
         };
@@ -18442,7 +18673,7 @@
           sha256 = "1w913kw4b3dipawn567847jxl89j0prnf6656yqi2rp96axx3lhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flim";
           sha256 = "1gkaq549svflx8qyqrk0ccb52b7wp17wmd5jgzkw1109bpc4k6jc";
           name = "flim";
         };
@@ -18460,7 +18691,7 @@
           sha256 = "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fliptext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fliptext";
           sha256 = "0cmyan9hckjsv5wk1mvjzif9nrc07frhzkhhl6pkgm0j0f1q30ji";
           name = "fliptext";
         };
@@ -18481,7 +18712,7 @@
           sha256 = "12b1b7avjdbfm184mcg3bh3s6k0ygfz1sraz8q7qnrsyw4170893";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/floobits";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/floobits";
           sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
           name = "floobits";
         };
@@ -18502,7 +18733,7 @@
           sha256 = "10f9135i9z2y4k0x6fbwm0g6vhsj6ag41xq504zpygqzp6y6ikmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx";
           sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
           name = "flx";
         };
@@ -18523,7 +18754,7 @@
           sha256 = "10f9135i9z2y4k0x6fbwm0g6vhsj6ag41xq504zpygqzp6y6ikmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx-ido";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx-ido";
           sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
           name = "flx-ido";
         };
@@ -18544,7 +18775,7 @@
           sha256 = "1cmjw1zrb1nq9nx0d634ajli1di8x48k6s88zi2s2q0mbi28lzz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx-isearch";
           sha256 = "14cshv5xb57ch5g3m3hfhawnnabdnbacp4kx40d0pw6jxw677gqd";
           name = "flx-isearch";
         };
@@ -18557,15 +18788,15 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20160117.1229";
+        version = "20160129.511";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "fe8b311cd90a7dc5cbfe1548104ca0b9f9212e9f";
-          sha256 = "0x5cw5qfchrj9bc5iaryrm2gnbm1liwjc7qdybgjhd1mbywpf4qh";
+          rev = "89d57c2771967b64351a1bc489a053912f06b48d";
+          sha256 = "1h172zkvlz1bx1s82vknm6wz2hhwk8253fdhd6bqaa2f5biivw71";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck";
           sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
           name = "flycheck";
         };
@@ -18586,7 +18817,7 @@
           sha256 = "0fh5z68gnggm0qjb8ncmfngv195lbp1dxz9jbmdi418d47mlba9c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ats2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ats2";
           sha256 = "0xm7zzz6hs5qnqkmv7hwxpvp3jjca57agx71sj0m12v0h53gbzhr";
           name = "flycheck-ats2";
         };
@@ -18607,7 +18838,7 @@
           sha256 = "0klnhq0zfn5zbkwl7y9kja7x49n1w6r1qbphk7a7v9svgm3h9s7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-cask";
           sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
           name = "flycheck-cask";
         };
@@ -18620,15 +18851,15 @@
     flycheck-checkbashisms = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-checkbashisms";
-        version = "20160103.2026";
+        version = "20160120.2007";
         src = fetchFromGitHub {
           owner = "Gnouc";
           repo = "flycheck-checkbashisms";
-          rev = "e7941394f016a1363698f129cad8340a396c9fb8";
-          sha256 = "159r4bdfwn6s88j2ky85x2m4hs7y55kfkr0jd1fvc60zpy8xcqqy";
+          rev = "6acb957a33a21e61764792b80ba4e33e88f2271f";
+          sha256 = "18nhfj0vx8rg2236nb9475s27rhyb34m81i7l6zkhifqba6rb0bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-checkbashisms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-checkbashisms";
           sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
           name = "flycheck-checkbashisms";
         };
@@ -18649,7 +18880,7 @@
           sha256 = "1ckzs32wzqpnw89rrw3l7i4gbyn25wagbadsc4mcrixml5nf0mck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-clangcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-clangcheck";
           sha256 = "1316cj3ynl80j39ha0371ss7cqw5hcr3m8944pdacdzbmp2sak2m";
           name = "flycheck-clangcheck";
         };
@@ -18670,7 +18901,7 @@
           sha256 = "0ndhhcfgpd5yg95jg64785mc9g6cgm1k7dwakzb3qlqnynbrjrcp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-clojure";
           sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
           name = "flycheck-clojure";
         };
@@ -18691,7 +18922,7 @@
           sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-color-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-color-mode-line";
           sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
           name = "flycheck-color-mode-line";
         };
@@ -18712,7 +18943,7 @@
           sha256 = "073vkjgcyqp8frsi05s6x8ml3ar6hwjmn2c7ryfab5b35kp9gmdi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-css-colorguard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-css-colorguard";
           sha256 = "1n56j5nicac94jl7kp8fbqxmd115vbhzklzgfz5jbib2ab8y60jc";
           name = "flycheck-css-colorguard";
         };
@@ -18722,18 +18953,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-cstyle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-cstyle";
+        version = "20160126.2116";
+        src = fetchFromGitHub {
+          owner = "alexmurray";
+          repo = "flycheck-cstyle";
+          rev = "50a8899c61083f6f5466a0b1b954fe3efdc2ecf2";
+          sha256 = "072868zy2624m8la0i291f8xmqlv4s1r683qw8l0s24vhi1d22fk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-cstyle";
+          sha256 = "0p3lzpcgwk4nkq1w0iq40njz8ll2h3vi9z5fbvv1ar4r80fqd909";
+          name = "flycheck-cstyle";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-cstyle";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-d-unittest = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-d-unittest";
-        version = "20150709.109";
+        version = "20160125.618";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-d-unittest";
-          rev = "f2255abf6a5cd9268b1576d9b46356f8151a7311";
-          sha256 = "1r71alxbxwcrdf3r5rg7f0bdwh0ylvayp5g97i9biyxdg59az4ad";
+          rev = "93de1f358ca4b2964c43a465031f3efa8561af06";
+          sha256 = "0b4yq39c8m03pv5cgvvqcippc3yfphpgjw3bh2bnxch1pwfik3xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-d-unittest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-d-unittest";
           sha256 = "0n4m4f0zqcx966582af1nqff5sla7jcr0wrmgzzxnn97yjrlnzk2";
           name = "flycheck-d-unittest";
         };
@@ -18754,7 +19006,7 @@
           sha256 = "1hw875dirz041vzw1pxjpk5lr1zmrp2kp9m6pazs9j19d686hyn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-dedukti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-dedukti";
           sha256 = "00nc18w4nsi6vicpbqqpr4xcdh48g95vnay3kirb2xp5hc2rw3x8";
           name = "flycheck-dedukti";
         };
@@ -18775,7 +19027,7 @@
           sha256 = "15dc76r047pnxll229z0pmpn76zw3cc6qs81b7wg7yc5czsk8axh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-dialyzer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-dialyzer";
           sha256 = "0bn81yzijmnfg5xcnvcvxvqxz995iaafhgbfckgcal974s229kd2";
           name = "flycheck-dialyzer";
         };
@@ -18796,7 +19048,7 @@
           sha256 = "0dqkd9h54qmr9cv2gmic010j2h03i80psajrv4wq3c4pvxyqyn2j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-dmd-dub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-dmd-dub";
           sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
           name = "flycheck-dmd-dub";
         };
@@ -18817,7 +19069,7 @@
           sha256 = "08dlm3g2d8rl53hq0b4z7gp8529almlkyf69d3c8f9didmlhizk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-elm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-elm";
           sha256 = "06dpv19wgbw48gbf701c77vw1dkpddx8056wpim3zbvwwfwk8ra4";
           name = "flycheck-elm";
         };
@@ -18838,7 +19090,7 @@
           sha256 = "0lk7da7axn9fm0kzlzx10ir014rsdsycffi8jcy4biqllw6yi4dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-flow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-flow";
           sha256 = "0p4vvk09vjgk98dwzr2qzldvij3v6af56pradssi6sm3shbqhkk3";
           name = "flycheck-flow";
         };
@@ -18859,7 +19111,7 @@
           sha256 = "0q1m1f3vhw1wy0pa3njy55z28psznbw2xwmwk2v1p5c86n74ns8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ghcmod";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ghcmod";
           sha256 = "0mqxg622lqnkb52a0wff7h8b0k6mm1k7fhkfi95fi5sahclja0rp";
           name = "flycheck-ghcmod";
         };
@@ -18880,7 +19132,7 @@
           sha256 = "0j2mvf3zjznwkm8dykcgs1v5sz0i882mrivghxqr3h6n3ni4wag4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-gometalinter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-gometalinter";
           sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
           name = "flycheck-gometalinter";
         };
@@ -18901,7 +19153,7 @@
           sha256 = "0fykawnq9ch1vj76rsimwbmn2xxdamsnvbj4ahqaqhq7adb2wyrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-google-cpplint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-google-cpplint";
           sha256 = "0llrvg6mhcsj5aascsndhbv99122zj32agxk1w6s8xn8ksk2i90b";
           name = "flycheck-google-cpplint";
         };
@@ -18922,7 +19174,7 @@
           sha256 = "01y3nv4h5zz4w2bydw7f2w98rbyhbyq80w5w5y5nal5w4vd76qb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-haskell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-haskell";
           sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
           name = "flycheck-haskell";
         };
@@ -18943,7 +19195,7 @@
           sha256 = "1x61q0fqr1jbqs9kk59f565a02qjxh1gnp1aigys0yz6qnshvzbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-hdevtools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-hdevtools";
           sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
           name = "flycheck-hdevtools";
         };
@@ -18964,7 +19216,7 @@
           sha256 = "1ax55yhf9q8i8z1f97zp3r08dqv8npd2llllbwa67d1bj49bsf2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-irony";
           sha256 = "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z";
           name = "flycheck-irony";
         };
@@ -18985,7 +19237,7 @@
           sha256 = "15cgqbl6n3nyqiizgs2zvcvfs6bcnjk3bj81lhhwrzizbjvap3rv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ledger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ledger";
           sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
           name = "flycheck-ledger";
         };
@@ -19006,7 +19258,7 @@
           sha256 = "0isqa6ybdd4166h3rdcg0b8pcxn00v8dav58xwfcj92nhzvs0qca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-mercury";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-mercury";
           sha256 = "1z2y6933f05yv9y2aapmn876jnsydh642zqid3j88bb9kqi67x0h";
           name = "flycheck-mercury";
         };
@@ -19027,7 +19279,7 @@
           sha256 = "1vdnw6hnhg8aqcsdqcd2rqz4fsfgxn2xr3xixkvwmpplb4x40c8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-mypy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-mypy";
           sha256 = "1w418jm6x3vcg2x31nzc8a3b8asx6gznl6m76ip8w98riz7vy02f";
           name = "flycheck-mypy";
         };
@@ -19048,7 +19300,7 @@
           sha256 = "06hs41l41hm08dv93wldd98hmnd3jqbg58pj5ymn15kgdsy1rirg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-nim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-nim";
           sha256 = "0w6f6998rqx8a3i4xhga7mrmvhxrm690wkqwfzspidid2z7v71az";
           name = "flycheck-nim";
         };
@@ -19069,7 +19321,7 @@
           sha256 = "0fm8w7126vf04n76qhh33rzybvl1n7va2whbqzafbvmv2nny3v94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ocaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ocaml";
           sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
           name = "flycheck-ocaml";
         };
@@ -19090,7 +19342,7 @@
           sha256 = "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-package";
           sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
           name = "flycheck-package";
         };
@@ -19111,7 +19363,7 @@
           sha256 = "0ffas4alqhijvm8wl1p5nqjhnxki8gs6b5bxb4nsqwnma8qmlcx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-perl6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-perl6";
           sha256 = "0czc0fqx7g543afzkbjyz4bhxfl4s3v5swn9xrkayv8cgk8acvp4";
           name = "flycheck-perl6";
         };
@@ -19124,15 +19376,15 @@
     flycheck-pos-tip = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "flycheck-pos-tip";
-        version = "20160115.453";
+        version = "20160122.905";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-pos-tip";
-          rev = "a42e15a2965bf086228375ab7a4db3603b862c5a";
-          sha256 = "1kcjw0s8lx4lbkfqksf92i0iz509l2vbrkknyd7xx0yqlkvxfkyf";
+          rev = "f0f8a4232b53494d6cf13934b53c61ed6c32273f";
+          sha256 = "11brmradnsz3qqj11rviwdh6hqhbicgycr2zs5wrfbq8rifx4cv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-pos-tip";
           sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
           name = "flycheck-pos-tip";
         };
@@ -19153,7 +19405,7 @@
           sha256 = "0dq4ikqskkpcl3z4s5vl6h4f4bx4dsgyn2knlr3x4wjcgzyrv0qn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-protobuf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-protobuf";
           sha256 = "0cn5b9pr9i9hrix7dbrylwb2812al8ipbpqvlb9bm2f8hc9kgsmc";
           name = "flycheck-protobuf";
         };
@@ -19166,15 +19418,15 @@
     flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-purescript";
-        version = "20160117.1049";
+        version = "20160118.1745";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "flycheck-purescript";
-          rev = "6716f7b193b18d92082edd8ebfbd137ed92aec93";
-          sha256 = "12bjlrzkfz2ixi0d7jzbasgaliswdpkqi5j32rg8mac8hncgq5jr";
+          rev = "586bf33da5c474a76428b97b83dea6c7b0e9e416";
+          sha256 = "1r8k38ldw7mldhl2hsqc8gvb99svc1vlhlqfnj8hqd3vvqxd5r1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-purescript";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-purescript";
           sha256 = "05j1iscyg9khw0zq63676zrisragklxp48hmbc7vrbmbiy964lwd";
           name = "flycheck-purescript";
         };
@@ -19195,7 +19447,7 @@
           sha256 = "16albss527dq4ncpiy8p326fib038qc6wjbh985lw2p1f9babswa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-pyflakes";
           sha256 = "186h5ky48i1xmjbvvhn1i0rzhsy8bgdv1d8f7rlr2z4brb52f9c1";
           name = "flycheck-pyflakes";
         };
@@ -19216,7 +19468,7 @@
           sha256 = "08ar85p5llk0lxlm2rd7rfc8s449vrknsrzzxqg8kvakgpd0nx7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-rust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-rust";
           sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w";
           name = "flycheck-rust";
         };
@@ -19237,7 +19489,7 @@
           sha256 = "17mhsxnixw37x9jpy59nn3npw93r1rza2zcw6jmqzandmj0jyvm4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-status-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-status-emoji";
           sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
           name = "flycheck-status-emoji";
         };
@@ -19258,7 +19510,7 @@
           sha256 = "0hn3qjff1lcpd2ghjixkkq2bpmrmqab3860vy38yw201yy4xmn5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-tip";
           sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
           name = "flycheck-tip";
         };
@@ -19279,7 +19531,7 @@
           sha256 = "0m9fjfpand20qy9d196z5khiznn25n95zbmgs8q2s2wcn4f7022p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-typescript-tslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-typescript-tslint";
           sha256 = "141x4scl13gqxyg0nlc8vig1iaybc3g95il5r51k4k83isi62iyq";
           name = "flycheck-typescript-tslint";
         };
@@ -19296,11 +19548,11 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "80c6d7c663b6ccc32b851348f1099790ac4c9736";
-          sha256 = "1c3c3frd9fdb77wkhg8f8g29dvr86ryzf9prg4pm8wvhifa4yhvg";
+          rev = "c64684df763411249985159ee33b10d948b9fc91";
+          sha256 = "12jwqhzqskdp2l6h60rich19rddzjcl94zaf72ljnq8h0mqc3xy0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ycmd";
           sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
           name = "flycheck-ycmd";
         };
@@ -19321,7 +19573,7 @@
           sha256 = "10i0rbvk6vyifgbgskdyspmw9q64x99fzi8i1h8bgv58xhfx6pm7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-coffee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-coffee";
           sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
           name = "flymake-coffee";
         };
@@ -19342,7 +19594,7 @@
           sha256 = "1dlxn8hhz3gfrhvkwhlxjmby6zc0g8yy9n9j9dn8c4cbi2fhyx5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-cppcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-cppcheck";
           sha256 = "11brzgq2zl32a8a2dgj2imsldjqaqvxwk2jypf4bmfwa3mkcqh3d";
           name = "flymake-cppcheck";
         };
@@ -19363,7 +19615,7 @@
           sha256 = "00cnz3snhs44aknq6wmf19hq9bzb5pj0hvfzz93l6n7ngd8vvpzy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-css";
           sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
           name = "flymake-css";
         };
@@ -19381,7 +19633,7 @@
           sha256 = "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-cursor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-cursor";
           sha256 = "1s065w0z3sfv3d348w4zhlw96xf3j28bcz14sl46963mj2dm90lr";
           name = "flymake-cursor";
         };
@@ -19402,7 +19654,7 @@
           sha256 = "1mylcsklnv3q27q1gvf7wrila39rmxab1ypmvjh5p56d91y6pszc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-easy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-easy";
           sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
           name = "flymake-easy";
         };
@@ -19423,7 +19675,7 @@
           sha256 = "04w6g4wixrpfidxbk2bwazhvf0cx3c2v2mxnycqqlqkg0m0sb0fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-elixir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-elixir";
           sha256 = "15r3m58hnc75l3j02xdr8yg25fbn2sbz1295ac44widzis82m792";
           name = "flymake-elixir";
         };
@@ -19444,7 +19696,7 @@
           sha256 = "14kbqyw4v1c51dx7pfgqbn8x4j8j3rgyyq2fa9klqzxpldcskl24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-gjshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-gjshint";
           sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
           name = "flymake-gjshint";
         };
@@ -19465,7 +19717,7 @@
           sha256 = "03gh0y988pksghmmvb5av2vnlbcsncafvn4nwihsis0bhys8k28q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-go";
           sha256 = "030m67d8g60ljm7ny3jh4vwj3cshypsklgbjpcvh32y109ga1hy1";
           name = "flymake-go";
         };
@@ -19486,7 +19738,7 @@
           sha256 = "0zldhlvxmk0xcjmj4ns48pp4h3bvijrzs1md69ya7m3dmsbayfrc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-google-cpplint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-google-cpplint";
           sha256 = "0q7v70xbprh03f1yabq216q4q82a58s2c1ykr6ig49cg1jdgzkf3";
           name = "flymake-google-cpplint";
         };
@@ -19507,7 +19759,7 @@
           sha256 = "08rcsg76qdq2l6z8q339yw770kv1q657ywqvq6a20pxxz2158a8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-haml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-haml";
           sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
           name = "flymake-haml";
         };
@@ -19528,7 +19780,7 @@
           sha256 = "0hwcgas83wwhk0szwgw7abf70400knb8dfabknwv0qrcsk4gqffd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-haskell-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-haskell-multi";
           sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
           name = "flymake-haskell-multi";
         };
@@ -19549,7 +19801,7 @@
           sha256 = "003fdrgxlyhs595ndcdzhmdkcpsf9bpw53hrlrrrh07qlnqxwrvp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-hlint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-hlint";
           sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
           name = "flymake-hlint";
         };
@@ -19570,7 +19822,7 @@
           sha256 = "0ywm9fpb7d7ry2fly8719fa41q97yj9za3phqhv6j1chzaxvcv3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-jshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-jshint";
           sha256 = "0j4djylz6mrq14qmbm35k3gvvsw6i9qc4gd9ma4fykiqzkdjsg7j";
           name = "flymake-jshint";
         };
@@ -19591,7 +19843,7 @@
           sha256 = "0y01albwwcnhj4pnpvcry0zw7z2g9py9q2p3sw5zhgw3g0v5p9ls";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-jslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-jslint";
           sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
           name = "flymake-jslint";
         };
@@ -19612,7 +19864,7 @@
           sha256 = "1qn15pr7c07fmki484z5xpqyn8546qb5dr9gcp5n1172wnh2a534";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-json";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-json";
           sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
           name = "flymake-json";
         };
@@ -19633,7 +19885,7 @@
           sha256 = "0ggi8a4j4glpsar0sqg8q06rscajjaziis5ann31wphx88rc5wd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-less";
           sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
           name = "flymake-less";
         };
@@ -19654,7 +19906,7 @@
           sha256 = "1fz7kywp1y2nhp50b2v961wz604sw1gzqcid4k8igz9aii3ygxcv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-lua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-lua";
           sha256 = "0pa66ymhazcfgd9jmxizq5w2sgj008hph42wsa9ljr2rina1gai6";
           name = "flymake-lua";
         };
@@ -19675,7 +19927,7 @@
           sha256 = "1f4l2r4gp03s18255jawc7s5abpjjrw54937wzygmvzvqvmaiikj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-perlcritic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-perlcritic";
           sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
           name = "flymake-perlcritic";
         };
@@ -19696,7 +19948,7 @@
           sha256 = "09mibjdji5mf3qvngspv1zmik1zd9jwp4mb4c1w4256202359sf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-php";
           sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
           name = "flymake-php";
         };
@@ -19717,7 +19969,7 @@
           sha256 = "140rlp6m0aqibwa0bhv8w6l3giziybqdw7x271nq8f3r60ch13bi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-phpcs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-phpcs";
           sha256 = "0zzxi3c203fiw6jp1ar9bb9f28x2lg23bczgy8n5cicrq59jfsn9";
           name = "flymake-phpcs";
         };
@@ -19738,7 +19990,7 @@
           sha256 = "1r3yjqxig2j7l50l787qsi96mkvjcgqll9vb4ci51j7b43d53c5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-puppet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-puppet";
           sha256 = "1izq6s33p74dy4wzfnjii8wjs723bm5ggl0w6hkvzgbmyjc01hxv";
           name = "flymake-puppet";
         };
@@ -19759,7 +20011,7 @@
           sha256 = "1aijapvpw4skfhfmz09v5kpaxay6b0bp77bbjkrvgyizsqdd39vp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-python-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-python-pyflakes";
           sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
           name = "flymake-python-pyflakes";
         };
@@ -19780,7 +20032,7 @@
           sha256 = "13yk9cncp3zw6d7zkgdpgprpw6wrirk2gxgjvkr15dwcyx1g3109";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-ruby";
           sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
           name = "flymake-ruby";
         };
@@ -19801,7 +20053,7 @@
           sha256 = "1qxb3vhh83ikhmm89ms7irdip2l03hnjcq5ncmgywkaqkpslaacv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-rust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-rust";
           sha256 = "080cvgl2cg08kyvmgg080zqb6k6bngga3m5lfwb2dpmi1bajywc1";
           name = "flymake-rust";
         };
@@ -19822,7 +20074,7 @@
           sha256 = "0rwjiplpqw3rrh76llnx2fn78f6avxsg0la5br46q1rgw4n8r1w1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-sass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-sass";
           sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
           name = "flymake-sass";
         };
@@ -19843,7 +20095,7 @@
           sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-shell";
           sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
           name = "flymake-shell";
         };
@@ -19864,7 +20116,7 @@
           sha256 = "0qpr0frcn3w0f6yz8vgavwbxvn6wb0qkfk653v4cfy57dvslr4wf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-vala";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-vala";
           sha256 = "0yp81phd96z594ckav796qrjm0wlkrfsl0rwpmgg840qn49w71vx";
           name = "flymake-vala";
         };
@@ -19885,7 +20137,7 @@
           sha256 = "0mdam39a85csi9b90wak9j3zkd25lj6x54affwkg3fym8yphmplm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-yaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-yaml";
           sha256 = "17wghm797np4hlidf3wwb47w4klwc6qyk6ry1z05psl3nykws1g7";
           name = "flymake-yaml";
         };
@@ -19906,7 +20158,7 @@
           sha256 = "07hy1kyw4cbxydmhp4scsy3dcbk2s50rmdp8rch1vbcjk5lj4mvb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyparens";
           sha256 = "1mvbfq062qj8vmgzk6rymg3idlfc1makfp1scmjvpw98h30j2a0a";
           name = "flyparens";
         };
@@ -19927,7 +20179,7 @@
           sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyspell-lazy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyspell-lazy";
           sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
           name = "flyspell-lazy";
         };
@@ -19948,7 +20200,7 @@
           sha256 = "1rdpggnw9mz3qr4kp5gh9nvwncivj446vdhpc04d4jgrl568bhqb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyspell-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyspell-popup";
           sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
           name = "flyspell-popup";
         };
@@ -19969,7 +20221,7 @@
           sha256 = "1fk4zsb4jliwz10sqz5bpqgj1p479mc506dmvy4zq3vqnpbypqvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fm";
           sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f";
           name = "fm";
         };
@@ -19990,7 +20242,7 @@
           sha256 = "0984fhf1nlpdh9mh3gd2xak3v2rlv76qxppqvr6a4kl1dxwg37r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fm-bookmarks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fm-bookmarks";
           sha256 = "12ami0k6rfwhrr6xgj0dls4mkk6dp0r9smwzhr4897dv0lw89bdj";
           name = "fm-bookmarks";
         };
@@ -20003,15 +20255,15 @@
     focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "focus";
-        version = "20160111.722";
+        version = "20160131.1618";
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "Focus";
-          rev = "307df45c69d3a830b4caee8c418a3feff522f13a";
-          sha256 = "11ya3pfqfx8jpib1p6pys8vwn10q8ac5wla35d2nl6glnijx3cj5";
+          rev = "abad47f1c40e595779c376a1e936c1609be1cdf4";
+          sha256 = "0vqjyc00ba9wy2rn454hhy9rnnghljc1i8f3zrpkdmkqn5cg3336";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/focus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/focus";
           sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
           name = "focus";
         };
@@ -20032,7 +20284,7 @@
           sha256 = "1k5xhnr1jkfw8896kf2nl4633r6ni5bnc53rs6lxn8y9lj0srafb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/focus-autosave-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/focus-autosave-mode";
           sha256 = "1zwp99mk360mqk4mjnnjr6islavginc9732p0jn9g5yz62xypxpc";
           name = "focus-autosave-mode";
         };
@@ -20053,7 +20305,7 @@
           sha256 = "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-dwim";
           sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
           name = "fold-dwim";
         };
@@ -20074,7 +20326,7 @@
           sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-dwim-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-dwim-org";
           sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
           name = "fold-dwim-org";
         };
@@ -20095,7 +20347,7 @@
           sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-this";
           sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
           name = "fold-this";
         };
@@ -20116,7 +20368,7 @@
           sha256 = "1z2dkyzj1gq3gp9cc3lhi240f8f3yjpjnw520xszm0wvx1rp06ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/folding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/folding";
           sha256 = "0rb4f4llc4z502znmmc0hfi7n07lp01msx4y1iyqijvqzlq2i93y";
           name = "folding";
         };
@@ -20134,7 +20386,7 @@
           sha256 = "04j9xybn9an3bm2p2aqmqnswxxg3gwq2mc96brkgxkr88h316d4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/font-lock+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/font-lock+";
           sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
           name = "font-lock-plus";
         };
@@ -20155,7 +20407,7 @@
           sha256 = "04n32rgdz7m24jji8p0j42zmf2r60sdbbr4mkr6435fqyvmdd20k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/font-lock-studio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/font-lock-studio";
           sha256 = "0swwbfaypc78cg4ak24cc92kgxmr1x9vcpaw3jz4zgpm2wzbgmrq";
           name = "font-lock-studio";
         };
@@ -20176,7 +20428,7 @@
           sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/font-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/font-utils";
           sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
           name = "font-utils";
         };
@@ -20197,7 +20449,7 @@
           sha256 = "103xz042h8w6c85hn19cglfsa34syjh18asm41rjhr9krp15sdl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fontawesome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
           name = "fontawesome";
         };
@@ -20218,7 +20470,7 @@
           sha256 = "1jw888nqmbi9kcd9ycl2fqrmrnqxnmkx72n0b3nf3hp7j956yb21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/forecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/forecast";
           sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
           name = "forecast";
         };
@@ -20239,7 +20491,7 @@
           sha256 = "1fczg710a0rjs932yv6vv9rwr9g5ii6cwva82nqfzyhlkf0b1sn5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/foreign-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/foreign-regexp";
           sha256 = "189cq8n759f28nx10fn3w4qbq7q49bb788kp9l70pj38jgnjn7n7";
           name = "foreign-regexp";
         };
@@ -20260,7 +20512,7 @@
           sha256 = "00wqn8h50xr90pyvwk4sv552yiajlzq56wh6f6lad5w90j47q1lx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/foreman-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/foreman-mode";
           sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
           name = "foreman-mode";
         };
@@ -20281,7 +20533,7 @@
           sha256 = "0nj056x87gcpdqkgx3li5syp6wbj58a1mw2aqa48zflbqwyvs03i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/form-feed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/form-feed";
           sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
           name = "form-feed";
         };
@@ -20302,7 +20554,7 @@
           sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/format-sql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/format-sql";
           sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
           name = "format-sql";
         };
@@ -20323,7 +20575,7 @@
           sha256 = "1nqx2igxmwswjcrnzdjpx5qcjr60zjy3q9cadq5disms17wdcr6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fortpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fortpy";
           sha256 = "1nn5vx1rspfsijwhilnjhiy0mjw154ds3lwxvkpwxpchygirlyxj";
           name = "fortpy";
         };
@@ -20344,7 +20596,7 @@
           sha256 = "1kk04hl2y2svrs07w4pq9f4g7vs9qzy2qpw9prvi1gravmnfrzc4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fortune-cookie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fortune-cookie";
           sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78";
           name = "fortune-cookie";
         };
@@ -20357,15 +20609,15 @@
     fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fountain-mode";
-        version = "20160105.2011";
+        version = "20160118.2004";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "8aab9a3020846f48baf1e22500d1cfde95bab353";
-          sha256 = "0mwsmqfm2y5158kkaf91m5c616fxx5467649wdi9zl21izmc04d4";
+          rev = "cca2529a2d97ab404f51edd82a73bfabf7656a2d";
+          sha256 = "0jrqkrjjqg471x9ymzf5faxnv9zc8lyy2lh2m4dys2l4wc704lhr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fountain-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fountain-mode";
           sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
           name = "fountain-mode";
         };
@@ -20378,13 +20630,13 @@
     frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }:
     melpaBuild {
         pname = "frame-cmds";
-        version = "20151231.1522";
+        version = "20160124.1026";
         src = fetchurl {
           url = "http://www.emacswiki.org/emacs/download/frame-cmds.el";
-          sha256 = "190qkf856b769qzkpbrjnfl8sw9x7nwzacf9mr6adxnav07v0fay";
+          sha256 = "1867zmm3pyqz8p9ig44jf598z9jkyvbp04mfg6j6ys3hyqfkw942";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-cmds";
           sha256 = "0xwzp6sgcb5ap76hpzm8g4kl08a8cgq7i2x9w64njyfink7frwc0";
           name = "frame-cmds";
         };
@@ -20402,7 +20654,7 @@
           sha256 = "0lvlyxb62sgrm37hc21dn7qzlrq2yagiwpspa926q6dpzcsbam15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-fns";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-fns";
           sha256 = "1wq8wva9q1hdzkvjk582a3fgig0lpqz9ch1p2jd6p29kb1i15f5p";
           name = "frame-fns";
         };
@@ -20423,7 +20675,7 @@
           sha256 = "0n6jhm1198c8slvdymsfjif0dfx3wlf8q4mm0yvpiln46shhwldx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-restore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-restore";
           sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm";
           name = "frame-restore";
         };
@@ -20444,7 +20696,7 @@
           sha256 = "1vvkdgj8warl40kqmd0408q46dxy9qp2sclq4q92b6falry9qy30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-tag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-tag";
           sha256 = "1n13xcc3ny9j9h1h4vslpjl6k9mqksr73kgmqrmkq301p8zps94q";
           name = "frame-tag";
         };
@@ -20462,7 +20714,7 @@
           sha256 = "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/framemove";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/framemove";
           sha256 = "10qf017j0zfnzmcs1i56pznhbvgw7mv4232p8znqaaxphgh6r0ar";
           name = "framemove";
         };
@@ -20483,7 +20735,7 @@
           sha256 = "11h9xw6jnw7dacyv1jch2a77xp7hfb93690m7hhazy6l87xmm4dk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/framesize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/framesize";
           sha256 = "1rwiwx3n7gkpfihbf6ndl1lxza4zi2rlj5av6lfp5qypbw9wddkf";
           name = "framesize";
         };
@@ -20504,7 +20756,7 @@
           sha256 = "12rmwf7gm9ib2c99jangygh2yswy41vxlp90rg0hvlhdfmbqa8p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/free-keys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/free-keys";
           sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj";
           name = "free-keys";
         };
@@ -20525,7 +20777,7 @@
           sha256 = "0zwlnzbi91hkfz1jgj9s9pxwi21s21cwp6psdm687wj2a3wy4231";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fringe-current-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fringe-current-line";
           sha256 = "125yn0wbrrxrmdn7qfxj0f4538sb3xnqb3r2inz3gpblc1vxnqb8";
           name = "fringe-current-line";
         };
@@ -20546,7 +20798,7 @@
           sha256 = "0ra9rc53l1gvkqank8apasl3r7wz2yfjrcvmfk3wpxhh24ppxv9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fringe-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fringe-helper";
           sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
           name = "fringe-helper";
         };
@@ -20559,15 +20811,15 @@
     fsharp-mode = callPackage ({ auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "20160108.450";
+        version = "20160126.945";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "9169baa9290e92d2e0ccc3cfd9c2a423136eb251";
-          sha256 = "1ckq45szq8lfg4spmvrj53s3p1hfl7x8k86cgq254gbs7kq8w7p2";
+          rev = "b2a70da8ba3c573e02c6a9951ef5f0089cec6c78";
+          sha256 = "115xl18nsg2j9sbp3qqzrjfpnzczk1zmrwrfrpqjq3jmv21ilsv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fsharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fsharp-mode";
           sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
           name = "fsharp-mode";
         };
@@ -20580,15 +20832,15 @@
     fstar-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20151023.953";
+        version = "20160118.2138";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "5e7c3d5a4b5422284d8ef4b69023b1fd71952b81";
-          sha256 = "0qq2gradcibjhn477sljy4lnsmi3pzlac42hpa92c6ca1srh3lc4";
+          rev = "2d9874827702c919590a19540d6641a4ffa245fd";
+          sha256 = "19f3fzz0p99mc747m2qqii0idslac3q0fc1q39macd8kx715jkhl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fstar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fstar-mode";
           sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy";
           name = "fstar-mode";
         };
@@ -20608,7 +20860,7 @@
           sha256 = "e2bddf41eacdf63ce42ff433b0a23da3a8de21a6e6b11ab8405ae5a17e09b493";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuel";
           sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
           name = "fuel";
         };
@@ -20629,7 +20881,7 @@
           sha256 = "0bjny4ryrs788myhiaf3ir99vadf2v4swa5gkz9i36a7j6wzpgk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/full-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/full-ack";
           sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
           name = "full-ack";
         };
@@ -20642,15 +20894,15 @@
     fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fullframe";
-        version = "20160118.816";
+        version = "20160119.411";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "fullframe";
-          rev = "73b945389e021aa43dbb4edde09a8ae404a6a79b";
-          sha256 = "0f0k37kl85j9373i2bdsy6g2lspar794x46di36sccr84719946r";
+          rev = "24a362bc6e2db08ada1a53292d526d472d41e7b2";
+          sha256 = "1gq67hx5m3ifzr49k110azcr5y68sdb3aljqx3yg71apfi5dg4w6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fullframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fullframe";
           sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
           name = "fullframe";
         };
@@ -20671,7 +20923,7 @@
           sha256 = "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/function-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
           name = "function-args";
         };
@@ -20690,7 +20942,7 @@
           sha256 = "109z1d0zrya1s9wy28nz5ynpg4zl7i1p6q1n57m1b1kkhhckjcv5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/furl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/furl";
           sha256 = "15njmanpj3qb8ic3k4sbrngqnsg85lvlj32dmii3y9bpgvis3k6f";
           name = "furl";
         };
@@ -20711,7 +20963,7 @@
           sha256 = "0rzp8c2164w775ggm2fs4j5dz33vqcah84ysp81majirwfql1niv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuzzy";
           sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
           name = "fuzzy";
         };
@@ -20729,7 +20981,7 @@
           sha256 = "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuzzy-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuzzy-format";
           sha256 = "055b8710yxbi2sdqsqk6jqgnzky4nykv8jgqgwy8q2isgj6q98jb";
           name = "fuzzy-format";
         };
@@ -20747,7 +20999,7 @@
           sha256 = "1q3gbv9xp2jxrf9vfarjqk9k805xc9z72zbaw7aqdxrj1bafxwnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuzzy-match";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuzzy-match";
           sha256 = "0mpy84f2zdyzmipzhs06b8rl2pxiypazf35ls1nc1yj8r16ijrds";
           name = "fuzzy-match";
         };
@@ -20768,7 +21020,7 @@
           sha256 = "0w2kqmx38ji5273mzhn9sp4r6vn7jfwb5qpsf2w8d46avpf8rj5i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fvwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fvwm-mode";
           sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
           name = "fvwm-mode";
         };
@@ -20789,7 +21041,7 @@
           sha256 = "08qnyr945938hwjg1ypkf2x4mfxbh3bbf1xrgz1rk2ddrfv7hmkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fwb-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fwb-cmds";
           sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
           name = "fwb-cmds";
         };
@@ -20802,15 +21054,15 @@
     fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fxrd-mode";
-        version = "20151220.1444";
+        version = "20160121.1253";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "fxrd-mode";
-          rev = "e8c93535cc04083d3b63a1944770488984bc19ce";
-          sha256 = "1n2cvingj7li61k1ff4kmf2gf591fdkslvqsqk0lh71nz59c543j";
+          rev = "7b49c7bec2ed4a579fa0234555667377e8ba0f53";
+          sha256 = "1sk2z71xfi4wqb7ap8jvad8cbzdbilwzqx9vy45zmgx1jh7g4ba9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fxrd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fxrd-mode";
           sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
           name = "fxrd-mode";
         };
@@ -20831,7 +21083,7 @@
           sha256 = "08x5li0mshrlamr7vswy7xh358bqhh3pngjr4ckswfi0l2r5fjbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fyure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fyure";
           sha256 = "0k5z2xqlrzp5lyvp2lr462x38kqdmqld845bvyvkfjd2k4yri71x";
           name = "fyure";
         };
@@ -20852,7 +21104,7 @@
           sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fzf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fzf";
           sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
           name = "fzf";
         };
@@ -20873,7 +21125,7 @@
           sha256 = "0sn3y1ilbg532mg941qmzipvzq86q31x86ypaf0h0m4015r7l59v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gandalf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gandalf-theme";
           sha256 = "0wkmsg3pdw98gyp3q508wsqkzw821qsqi796ynm53zd7a4jfap4p";
           name = "gandalf-theme";
         };
@@ -20885,14 +21137,14 @@
       }) {};
     gap-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "gap-mode";
-        version = "20160109.2332";
+        version = "20160204.936";
         src = fetchhg {
           url = "https://bitbucket.com/gvol/gap-mode";
-          rev = "605c441c15b6";
-          sha256 = "0ff0p86j59ki4dy2cd0iwy0lp577bfl2izh1xbnz623kn4nwzvid";
+          rev = "1de32f2ff384";
+          sha256 = "1jsw2mywc0y8sf7yl7y3i3l8vs3jv1srjf34lgb5xfz6p8wc5lc0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gap-mode";
           sha256 = "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2";
           name = "gap-mode";
         };
@@ -20913,7 +21165,7 @@
           sha256 = "0j0dg7nl9kmanayvw0712x5c5x9h48qmqdsyi0pijvgmv8l5slg5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gather";
           sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
           name = "gather";
         };
@@ -20932,7 +21184,7 @@
           sha256 = "01kbvmylymm6qww45mbjjxmb8ccdl9c2pxdyqfq3g73vwzrvndk4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/geben";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/geben";
           sha256 = "1hvvy1kp8wrb1qasm42fslgdkg095g4jxgzbnwpa4vp5cq270qbm";
           name = "geben";
         };
@@ -20953,7 +21205,7 @@
           sha256 = "14v5gm931dcsfflhsvijr4ihx7cs6jymvnjzph3arvhvqwyqhwgq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/geeknote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/geeknote";
           sha256 = "1ci82fj3layd95lqj2w40y87xps6bs7x05z8ai9m59k244g26m8v";
           name = "geeknote";
         };
@@ -20966,15 +21218,15 @@
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "20160107.1832";
+        version = "20160119.2245";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "296c3b687d8eeb520c7ccf52282e46dfe1ef3a4e";
-          sha256 = "0hkqv2cm0559aihy0kazra48jr4icy43vc46mmcs4gf99lpzdd4x";
+          rev = "04b0b3915741860a61532059b7e5291b7b98e031";
+          sha256 = "0mcn29ldm01vf7np73mn29j69n6nlc17vb789m65cl59gm4b7lb8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/geiser";
           sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
           name = "geiser";
         };
@@ -20995,7 +21247,7 @@
           sha256 = "1l3ps28a1wdrg2fgvvkdxdadfgpplijs4ig1yqq8yi7k13k046p4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/general-close";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/general-close";
           sha256 = "17v0aprfvxbygx5517a8hrl88qm5lb9k7523yd0ps5p9l5x96964";
           name = "general-close";
         };
@@ -21016,7 +21268,7 @@
           sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/genrnc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/genrnc";
           sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
           name = "genrnc";
         };
@@ -21037,7 +21289,7 @@
           sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/german-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/german-holidays";
           sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
           name = "german-holidays";
         };
@@ -21058,7 +21310,7 @@
           sha256 = "1ch8yp0mgk57x0pny9bvkknsqj27fd1rcmpm9s7qpryrwqkp1ix4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gerrit-download";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gerrit-download";
           sha256 = "1rlz0iqgvr8yxnv5qmk29xs1jwf0g0ckzanlyldcxvs7n6mhkjjp";
           name = "gerrit-download";
         };
@@ -21079,7 +21331,7 @@
           sha256 = "0bwjiq4a4f5pg0ngvc3lmkk7aki8n9zqfa1dym0lk4vy6yfhcbhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ggo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ggo-mode";
           sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
           name = "ggo-mode";
         };
@@ -21100,7 +21352,7 @@
           sha256 = "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ggtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ggtags";
           sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
           name = "ggtags";
         };
@@ -21121,7 +21373,7 @@
           sha256 = "0fkq3yl9jpakfnahymjv28fcal38c210garnq055rgmyhyhhpdwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gh";
           sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
           name = "gh";
         };
@@ -21142,7 +21394,7 @@
           sha256 = "0g3bjpnwgqczw6ddh4mv7pby0zyqzqgywjrjz2ib6hwmdqzyp1s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gh-md";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gh-md";
           sha256 = "0b72fl1hj7gkqlqrr8hklq0w3ryqqqfn5qpb7a9i6q0vh98652xm";
           name = "gh-md";
         };
@@ -21159,11 +21411,11 @@
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "ghc-mod";
-          rev = "566dbebe298f1e75254a4c3aa07d7410612659d4";
-          sha256 = "01qf3xjqybk9ligaqyarzhdgmwgfkgi19mw9aiggg15fgrix977k";
+          rev = "d77e262915d5726dc48549e3e7ea25c89e675475";
+          sha256 = "06p4hg8nkjphqkfim3ax1v82i29sfawfd8bdc4i3zrlbrvhdcnli";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghc";
           sha256 = "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g";
           name = "ghc";
         };
@@ -21184,7 +21436,7 @@
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghc-imported-from";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghc-imported-from";
           sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
           name = "ghc-imported-from";
         };
@@ -21205,7 +21457,7 @@
           sha256 = "17fl3k2sqiavbv3bp6rnp3p89j6pnpkkp7wi26pzzk4675r5k45q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghci-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghci-completion";
           sha256 = "1a6k47z5kmacj1s5479393jyj27bjx0911yaqfmmwg2hr0yz7vll";
           name = "ghci-completion";
         };
@@ -21226,7 +21478,7 @@
           sha256 = "0lcbyw6yrl6c8py5v2hqghcbsf9cbiplzil90al4lwqps7rw09a8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gherkin-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gherkin-mode";
           sha256 = "0dhrsz24hn0sdf22wpmzbkn66g4540vdkl03pc27kv21gwa9ixxv";
           name = "gherkin-mode";
         };
@@ -21247,7 +21499,7 @@
           sha256 = "1aj5j0y244r1fbbbl0lzb53wnyhljw91kb4n3hi2gagm7zwp8jcf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghq";
           sha256 = "0prvywcgwdhx5pw66rv5kkfriahal2mli2ibam5np3z6bwcq4ngh";
           name = "ghq";
         };
@@ -21268,7 +21520,7 @@
           sha256 = "1na8pp1g940zi22jgqi6drsm12db0hyw99v493i5j1p2y67c4hxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gildas-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gildas-mode";
           sha256 = "0bc3d8bnvg1w2chrr4rp9daq1x8p41qgklrniq0bbkr2h93cmkgv";
           name = "gildas-mode";
         };
@@ -21281,15 +21533,15 @@
     gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
     melpaBuild {
         pname = "gist";
-        version = "20151228.2141";
+        version = "20160118.1856";
         src = fetchFromGitHub {
           owner = "defunkt";
           repo = "gist.el";
-          rev = "8219359f88644ebf3a00e7011a39426416336939";
-          sha256 = "1xiwb6m5ibz228aiizhavkd0w7vcxsx6nlk8kkhhdwffj8cglf2d";
+          rev = "88d0e5be77fefad9fe1413505a80bdac7a9e7361";
+          sha256 = "18433gjhra0gqrwnxssd3njpxbvqhh64bds9rym1vq9l7w09z024";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gist";
           sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
           name = "gist";
         };
@@ -21310,7 +21562,7 @@
           sha256 = "0471xm0h6jkmxnrcqy5agq42i8immdb2qpnw7q7czrbsl521al8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git";
           sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
           name = "git";
         };
@@ -21331,7 +21583,7 @@
           sha256 = "0yxmrcrvl9pbwhd7w4vnrv2jqyskzvqp17sr3vzjlvv694jd4dms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-annex";
           sha256 = "0194y24vq1w6m2cjgqgx9dqp99cq8y9licyry2zxa5brbrsxi94l";
           name = "git-annex";
         };
@@ -21352,7 +21604,7 @@
           sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-auto-commit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-auto-commit-mode";
           sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
           name = "git-auto-commit-mode";
         };
@@ -21373,7 +21625,7 @@
           sha256 = "0g839pzmipjlv32r0gh166jn3na5d0wh2w1sia2k4yx1w0ch1bsx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-blame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-blame";
           sha256 = "0glmnj77vya8ivjin4qja7lis67wyibzy9k6z8b54z7mqf9ikx06";
           name = "git-blame";
         };
@@ -21394,7 +21646,7 @@
           sha256 = "1irqmypgc4l1jlzj4g65ihpic3ffnnkcg1hlysj7qpip5nbflqgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-command";
           sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
           name = "git-command";
         };
@@ -21407,15 +21659,15 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20160118.58";
+        version = "20160130.849";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "45b06a7b8664046fd1aecb3f07db535edd80d013";
-          sha256 = "1c6x10nm5syahn85vrgg9i6i7kzy4h7l9alahaxb71w6jwf91rsg";
+          rev = "08d0d095c7c16fb8223d3beeea232412f88936f5";
+          sha256 = "08h1lypdvgv0rkq1sjkmw9zwvbjwvpklzjyawb5chgfa5grgfiii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-commit";
           sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
           name = "git-commit";
         };
@@ -21428,15 +21680,15 @@
     git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, helm, lib, melpaBuild, projectile, s }:
     melpaBuild {
         pname = "git-commit-insert-issue";
-        version = "20151204.619";
+        version = "20160122.949";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "git-commit-insert-issue";
-          rev = "1bdfd1960bc279ca830e034a6708b25493b3f460";
-          sha256 = "0axy8r0cs8mdsxvs57p7gqyp4lpr5a2d49947j8ri7xmxp77jwp1";
+          rev = "df1c86ac1ec9f40b11fa5c7400966ef97f4c3c67";
+          sha256 = "1vdyrqg2w5q4xmazqqh2ymjnrp9p1x5172nllwryz43jvvxaw05s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-commit-insert-issue";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-commit-insert-issue";
           sha256 = "0mhpszm2y178dxgjv3kh2n744hg2kd60h16zbgmjf4f8228xw8j3";
           name = "git-commit-insert-issue";
         };
@@ -21454,7 +21706,7 @@
           sha256 = "074k1r8rkvyhhwnqy4gnyd7shidxgc25l1xq4hmnwjn13nsyqfnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-dwim";
           sha256 = "0vdd2cksiqbnxplqbpb16bcmp137fj3p9a7pa0622wx8vd5p0rkr";
           name = "git-dwim";
         };
@@ -21467,15 +21719,15 @@
     git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-gutter";
-        version = "20160116.100";
+        version = "20160202.1027";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-gutter";
-          rev = "88b526b6611e9847ef0a55075930565c61e5a220";
-          sha256 = "0mim9gvyh7rfp4k4y1y10pwpdpiik2xnw5lkvsv6259cs1fqyv8s";
+          rev = "07410145fe492c9f36c8fa3e91c0e8210c73ba96";
+          sha256 = "0hgqimvh09nppm96x5mz4kzdqr9f8dja3si9xn1169xl1279kqvb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter";
           sha256 = "12yjl9hsd72dwzl42hdcmjfdbxyi356jcq0kz8k7jvcsn57z4p2k";
           name = "git-gutter";
         };
@@ -21496,7 +21748,7 @@
           sha256 = "0vc1da72vwlys723xi7xvv4ii43sjxgsywb2ss0l0kcm0rays6lv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter-fringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter-fringe";
           sha256 = "14wyiyyi2rram2sz3habvmygy5a5m2jfi6x9fqcyfr3vpcjn1k4i";
           name = "git-gutter-fringe";
         };
@@ -21517,7 +21769,7 @@
           sha256 = "1rsj193zpblndki4khjjlwl2njxb329d42l75ki55msxifqrn4fi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter-fringe+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter-fringe+";
           sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
           name = "git-gutter-fringe-plus";
         };
@@ -21538,7 +21790,7 @@
           sha256 = "0bhrrgdzzj8gwxjx7b2kibp1b6s0vgvykfg0n47iq49m6rqkgi5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter+";
           sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
           name = "git-gutter-plus";
         };
@@ -21551,15 +21803,15 @@
     git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-lens";
-        version = "20150817.214";
+        version = "20160204.37";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-lens";
-          rev = "1feacc217c58fd4a41f9378eb09658f664036509";
-          sha256 = "0s1adgsigaq47vx8bfbmr5z8jq9y230ykwbw0jqka61n4ibg9ish";
+          rev = "be62df785ae14fa8652fe2cdd342d3256f8c0933";
+          sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-lens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-lens";
           sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
           name = "git-lens";
         };
@@ -21580,7 +21832,7 @@
           sha256 = "1la3zzcjnmzgxkd4ljr9b5335ddbrvid47kfzp2s358xknzmbsdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
           name = "git-link";
         };
@@ -21593,15 +21845,15 @@
     git-messenger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "git-messenger";
-        version = "20150314.802";
+        version = "20160121.2042";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-messenger";
-          rev = "7b16fdc9f6fd1a3b9c9f212b1633291c4c18fc9b";
-          sha256 = "038m4fjva8ynlms6dbh55w8x8wsn9c3z02rh4782ck2zi51q0d8g";
+          rev = "ca6526119706623de1e573c48addc4cc60ba7860";
+          sha256 = "082g2gqbf8yjgvj2c32ix6j3wwba5fmgcyi75bf0q0bbg4ck5rab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-messenger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
           name = "git-messenger";
         };
@@ -21622,7 +21874,7 @@
           sha256 = "1v0jk35ynfg9hivw9gdz2snk73pac67xlfx7av8argdcss1bmyb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-ps1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-ps1-mode";
           sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
           name = "git-ps1-mode";
         };
@@ -21635,15 +21887,15 @@
     git-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-timemachine";
-        version = "20160105.506";
+        version = "20160120.616";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-timemachine";
-          rev = "87804bbf6e633f42a48567f21bca52019632f64f";
-          sha256 = "1fq9lzn8vvjh0ayl5h0lywxr6zfg3k41xa66vqrf1hdan3a7ax1j";
+          rev = "7c66a878ee89861dcd59b5dfc598520daa156052";
+          sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-timemachine";
           sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
           name = "git-timemachine";
         };
@@ -21664,7 +21916,7 @@
           sha256 = "1ivnf4vsqk6c7iw1cid7q1hxp7047ajd1mpg0fl002d7m7ginhyl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-wip-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-wip-timemachine";
           sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
           name = "git-wip-timemachine";
         };
@@ -21685,7 +21937,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitattributes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitattributes-mode";
           sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
           name = "gitattributes-mode";
         };
@@ -21706,7 +21958,7 @@
           sha256 = "184q3vsxa9rvhc1n57ms47r73f3zap25wswzi66rm6rmfi2k7678";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitconfig";
           sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
           name = "gitconfig";
         };
@@ -21727,7 +21979,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitconfig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitconfig-mode";
           sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
           name = "gitconfig-mode";
         };
@@ -21748,7 +22000,7 @@
           sha256 = "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-browse-file";
           sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
           name = "github-browse-file";
         };
@@ -21769,7 +22021,7 @@
           sha256 = "000m6w2akx1z1lb32nvy6qzyggpcvlbdjh1i8419rzaidxf5gaxg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-clone";
           sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
           name = "github-clone";
         };
@@ -21790,7 +22042,7 @@
           sha256 = "065gpnllsk4x574fn9d6m4ajxl7mj5w2w5g9in421sp5r80fp9fv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-issues";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-issues";
           sha256 = "12c6yb3v7xwkzc51binfgl4jb3sm3al5nlrklbsxhn44alazsvb0";
           name = "github-issues";
         };
@@ -21811,7 +22063,7 @@
           sha256 = "11nfpy39xdkjxaxbfn8rppj4rcz57wl15gyibp01j9w7wmb5b4pr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-notifier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-notifier";
           sha256 = "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw";
           name = "github-notifier";
         };
@@ -21832,7 +22084,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitignore-mode";
           sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
           name = "gitignore-mode";
         };
@@ -21849,11 +22101,11 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "78deece7f314f9652b50117605e93be9f8c860f4";
-          sha256 = "07i4j9yl1yag70sl89n7v4yg4jvh5mrifhrf1xswlb29by6najdx";
+          rev = "1615468bbbe2bf07914dd525067ac39db2bc19c0";
+          sha256 = "00mma30r7ixbrxjmmddz4klh517fcr3yn6ss4zw33fh2hzj3w6rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitlab";
           sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
           name = "gitlab";
         };
@@ -21874,7 +22126,7 @@
           sha256 = "1h66wywhl5ipryx0s0w1vxp3ydg57zpizjz61wvf6qd8zn07nhng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitolite-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitolite-clone";
           sha256 = "1la1nrfns9j6wii6lriwwsd44cx3ksyhh09h8lf9dai6wp67kjac";
           name = "gitolite-clone";
         };
@@ -21895,7 +22147,7 @@
           sha256 = "0y8msn22lzfwh7d417abay9by2zhs9zswhcj8a0l7ln2ksljl500";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitty";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitty";
           sha256 = "1z6w4vbn0aaajyqanc7h1m5ali7dbrnh4ngw87a2x2pkxarx6x16";
           name = "gitty";
         };
@@ -21916,7 +22168,7 @@
           sha256 = "0b6ldcfzbdn0mzrcl08zm9kx1hap3djsbzd1qvph1pa2gab25n8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/glsl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/glsl-mode";
           sha256 = "0d05qb60k5f7wwpsp3amzghayfbwcha6rh8nrslhnklpjbg87aw5";
           name = "glsl-mode";
         };
@@ -21937,7 +22189,7 @@
           sha256 = "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmail-message-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmail-message-mode";
           sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
           name = "gmail-message-mode";
         };
@@ -21958,7 +22210,7 @@
           sha256 = "01hhanijqlh741f9wh6xn88qvghwqnfj5j0rvys5mghssfspqs3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmail2bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmail2bbdb";
           sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
           name = "gmail2bbdb";
         };
@@ -21979,7 +22231,7 @@
           sha256 = "08d6j5wws2ngngf3p31ic0lrsrp9i9lkpr3nxgmiiadm617x8hv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmpl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmpl-mode";
           sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
           name = "gmpl-mode";
         };
@@ -22000,7 +22252,7 @@
           sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnome-calendar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnome-calendar";
           sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
           name = "gnome-calendar";
         };
@@ -22021,7 +22273,7 @@
           sha256 = "1svnvm9fqqx4mrk9jjn11pzqwk71w8kyyd9wwxam8gz22ykw5jb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnomenm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnomenm";
           sha256 = "01vmr64j6hcvdbzg945c5a2g4fiidl18dsk4px7mdf85cv45kzqm";
           name = "gnomenm";
         };
@@ -22042,7 +22294,7 @@
           sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gntp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gntp";
           sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
           name = "gntp";
         };
@@ -22063,7 +22315,7 @@
           sha256 = "1dfkjzx33wzafj9cfm1bpj99bmnq5a8qrvzmhjykr7mfkca79ymz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnu-apl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnu-apl-mode";
           sha256 = "0971pzc14gw8f0b4lzvicxww1k3wc58gbr3fd0qvdra2jifk2is6";
           name = "gnu-apl-mode";
         };
@@ -22084,7 +22336,7 @@
           sha256 = "1gm116479gdwc4hr3nyv1id692dcd1sx7w2a80pvmgr35ybccn7c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnuplot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnuplot";
           sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
           name = "gnuplot";
         };
@@ -22105,7 +22357,7 @@
           sha256 = "1pss9a60dh6i277pkp8j5g1v5h7qlh11w2fki50qcp0zglyw1kaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnuplot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnuplot-mode";
           sha256 = "1avpik06cmi4h6v6039c64b4zw1r1nsg3nrryl254gl881pysfxg";
           name = "gnuplot-mode";
         };
@@ -22126,7 +22378,7 @@
           sha256 = "1i278npayv3kfxxd1ypi9n83q5l402sbc1zkm11pf8g006ifqsp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-alias";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-alias";
           sha256 = "0mbq9v8fiqqyldpb66v9bc777mzxywaq2dabivabxjg6554s8chf";
           name = "gnus-alias";
         };
@@ -22147,7 +22399,7 @@
           sha256 = "0ylcphnf4lv78kiazdkl5izn7ql402fpvv82n7n1gpjiqq4ylalr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-desktop-notify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-desktop-notify";
           sha256 = "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b";
           name = "gnus-desktop-notify";
         };
@@ -22165,7 +22417,7 @@
           sha256 = "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-spotlight";
           sha256 = "065jcix6a4mxwq8wc8gkr0x9lxmn6hlvf0rqmhi8hb840km1syjx";
           name = "gnus-spotlight";
         };
@@ -22186,7 +22438,7 @@
           sha256 = "1dzb3h5swvmwwy7x1lhz79cq2kpmamk35jb4dwmmxz6j248kmv6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-summary-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-summary-ext";
           sha256 = "0svyz8fy4k9ba6gpdymf4cf8zjjpgm71y48vlybxbv507xjm17qf";
           name = "gnus-summary-ext";
         };
@@ -22207,7 +22459,7 @@
           sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-x-gm-raw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-x-gm-raw";
           sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
           name = "gnus-x-gm-raw";
         };
@@ -22224,11 +22476,11 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "9779bffba5e4e87b4750f718b6fa7f088c1fa6e3";
-          sha256 = "0b25iczbg72pg1525ql6hb6jyx5vck8bqn5z8f4dy9a94qpgxszl";
+          rev = "db85a48a7870f46784edc202c780b19e2f65053a";
+          sha256 = "15jjmhw3pd4hx1khbvrypd8s2kh3ymkf8p4qh1c9rbw9csypj3al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-autocomplete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-autocomplete";
           sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
           name = "go-autocomplete";
         };
@@ -22249,7 +22501,7 @@
           sha256 = "0phy24cra8cza89xrqsx9xrwg98v9qwqx0fzgm1gwlf333zb3hha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-complete";
           sha256 = "0dl0ibw145f84kd709r5i2kaw07z1sjzn3dmsiqn8dncspcf2vb4";
           name = "go-complete";
         };
@@ -22270,7 +22522,7 @@
           sha256 = "09rxz40bkr0l75v3lmf8lcwqsgjiv5c8zjmwzy2d4syj4qv69c5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-direx";
           sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
           name = "go-direx";
         };
@@ -22291,7 +22543,7 @@
           sha256 = "0wha1h5mnnh3nsiaf5q1drrvk1gj2cn18bapi8ysy5jdpzi4xqsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-dlv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-dlv";
           sha256 = "13mk7mg2xk7v65r1rs6rmvi4g5nvm8jqg3p9nhk62d46i7dzp61i";
           name = "go-dlv";
         };
@@ -22312,7 +22564,7 @@
           sha256 = "1jwh5rqk7vr6kna6i0p3fl3wjk3mhlr6gxklc3xij4r2zdyfj8na";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
           name = "go-eldoc";
         };
@@ -22333,7 +22585,7 @@
           sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-errcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-errcheck";
           sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
           name = "go-errcheck";
         };
@@ -22346,15 +22598,15 @@
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "20151226.1424";
+        version = "20160127.204";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "dccb56c1b1b85c3d7b3184a6606024077d4e1775";
-          sha256 = "0wsh3rgay1k6ncayhqnnsnl5v2xwl60k6qyanmps0jgyshdv67zj";
+          rev = "63e67b187e8fbe6153995a754c60f65217e53142";
+          sha256 = "10bmd6vx1pxaal61kx87xabw13cyvl7v8z7cfxbxhv5cx0l3qizq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-mode";
           sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
           name = "go-mode";
         };
@@ -22375,7 +22627,7 @@
           sha256 = "1hpxvp0slqafbxhkashnmfjssb0ccjq67x01b4p7gznf6rwji166";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-playground";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-playground";
           sha256 = "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6";
           name = "go-playground";
         };
@@ -22396,7 +22648,7 @@
           sha256 = "0xm3v6snsxv1x8i4jdq3k2aax7v1xm4zvgc9khabwhc2y63xja46";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-playground-cli";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-playground-cli";
           sha256 = "00h89rh8d7lq1di77nv609xbzxmjmffq6mz3cmagylxncflg81jc";
           name = "go-playground-cli";
         };
@@ -22417,7 +22669,7 @@
           sha256 = "16n8655i7qidakxijymx1n84pnkn3hxpj7lsr901j03blxdrij5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-projectile";
           sha256 = "07diik27gr82n11a8k62v1jxq8rhi16f02ybk548f6cn7iqgp2ml";
           name = "go-projectile";
         };
@@ -22433,11 +22685,11 @@
         version = "20151027.838";
         src = fetchgit {
           url = "https://go.googlesource.com/tools";
-          rev = "3c782264fbde3108fd1eae9abcc4015edfd79e65";
-          sha256 = "10de1525f4d37081db8f8d9c70d7c9d8f918f1650c4218ccbdafa2d6d34305b1";
+          rev = "a6e3cc80e87d58d7fdb23da870845b456969b929";
+          sha256 = "ba6f77b796479d401f0037132a71493665c0af9830b6b26b1c9ed477247cde8e";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-rename";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-rename";
           sha256 = "1sc3iwxiydgs787a6pi778i0qzqv3bf498r47jwiw5b6mmib3fah";
           name = "go-rename";
         };
@@ -22458,7 +22710,7 @@
           sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-scratch";
           sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
           name = "go-scratch";
         };
@@ -22479,7 +22731,7 @@
           sha256 = "0di6xwpl6pi0430q208gliz8dgrzwqnmp997q7xcczbkk8zfwn0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-snippets";
           sha256 = "1wcbnfzxailv18spxyv4a0nwlqh9l7yf5vxg0qcjcp5ajd2w12kn";
           name = "go-snippets";
         };
@@ -22500,7 +22752,7 @@
           sha256 = "0n5nsyfwx2pdlwx6bl35wrfyady5dwraimv92f58mhc344ajd70y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-stacktracer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-stacktracer";
           sha256 = "1laz2ggqydnyr7b36ggb7sphlib79dhp7nszw42wssmv212v94cy";
           name = "go-stacktracer";
         };
@@ -22521,7 +22773,7 @@
           sha256 = "1am415k4xxcva6y3vbvyvknzc6bma49pq3p85zmpjsdmsp18qdix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/god-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/god-mode";
           sha256 = "01xx2byjh6vlckaxamm2x2qzicd9qc8h6amyjg0bxz3932a4llaa";
           name = "god-mode";
         };
@@ -22542,7 +22794,7 @@
           sha256 = "1k4i9z9h4m0h0y92mncr96jir63q5h1bix5bpnlfxhxl5w8pvk1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gold-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gold-mode";
           sha256 = "1b67hd1fp6xcj65xxp5jcpdjspxsbzxy26v6lqg5kiy8knls57kf";
           name = "gold-mode";
         };
@@ -22563,7 +22815,7 @@
           sha256 = "0wdw89n7ngxpcdigv8c01h4i84hsdh0y7xq6jdj1i6mnajl8gk92";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/golden-ratio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/golden-ratio";
           sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
           name = "golden-ratio";
         };
@@ -22584,7 +22836,7 @@
           sha256 = "18a7dv8yshspyq4bi30j0l4ap9qp696syfc29mgvly4xyqh9x4qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/golden-ratio-scroll-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/golden-ratio-scroll-screen";
           sha256 = "1ygh104vr65s7frlkzyhrfi6shrbvp2b2j3ynj5dip253v85xki5";
           name = "golden-ratio-scroll-screen";
         };
@@ -22605,7 +22857,7 @@
           sha256 = "16lghkdi0rd7l1fph0a254k6axxivmpmc6grx4ryvza3f4yf7483";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/golint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/golint";
           sha256 = "1q4y6mgll8wyp0c7zx810nzsm0k4wvz0wkly1fbja9z63sjzzxwb";
           name = "golint";
         };
@@ -22626,7 +22878,7 @@
           sha256 = "1anjzlg53kjdqfjcdahbxy8zk9hdha075c1f9nzrnnbbqvmirbbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gom-mode";
           sha256 = "07zr38gzqb3ds9mpf94c1vhl1rqd0cjh4g4j2bz86q16c0rnmp7m";
           name = "gom-mode";
         };
@@ -22647,7 +22899,7 @@
           sha256 = "06p1dpnmg7lhdff1g7c04qq8f9srgkmnm42jlqy85k87j3p5ys2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google";
           sha256 = "15z8l3adw8il0simk8phjgksh0v88cffb6gg3hv8a7nf5bla43my";
           name = "google";
         };
@@ -22668,7 +22920,7 @@
           sha256 = "12m3hxfwp9r86xdwbslvfxcanpxszcg6x0kcgv5i1k6aygrim9h2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-c-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-c-style";
           sha256 = "10gsbg880jbvxs4291vi2ww30ird2f313lbgcb11lswivmhrmd1r";
           name = "google-c-style";
         };
@@ -22689,7 +22941,7 @@
           sha256 = "1h7nj570drp2l9x6475gwzcjrp75ms8dkixa7qsgszjdk58qyhnb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-contacts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-contacts";
           sha256 = "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn";
           name = "google-contacts";
         };
@@ -22710,7 +22962,7 @@
           sha256 = "183igr5lp20zcqi7rc01fk76sfxdhksd74i11v16gdsifdkjimd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-maps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-maps";
           sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx";
           name = "google-maps";
         };
@@ -22731,7 +22983,7 @@
           sha256 = "0r6hngf3h5x55lk2qwfgd6bhjhkax5nz8ml43d1x23y5bjnrricq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-this";
           sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
           name = "google-this";
         };
@@ -22752,7 +23004,7 @@
           sha256 = "0hvxyqkxv5hfsa9sv71m7d98g25a1xc962r961nw6vmbvsf64z6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-translate";
           sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
           name = "google-translate";
         };
@@ -22773,7 +23025,7 @@
           sha256 = "0l022aqpnb38q6kgdqpbxrc1r7fljwl7xq14yi5jb7qgzw2v43cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gore-mode";
           sha256 = "0nljybh2pw8pbbajfsz57r11rs4bvzfxmwpbm5qrdn6dzzv65nq3";
           name = "gore-mode";
         };
@@ -22794,7 +23046,7 @@
           sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gorepl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gorepl-mode";
           sha256 = "12h9r4kf9y2v601myhzzdw2c4jc5cb7s94r5dkzriq578digxphl";
           name = "gorepl-mode";
         };
@@ -22807,15 +23059,15 @@
     gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gotest";
-        version = "20151218.249";
+        version = "20160125.800";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "ab0da939aad5cec301126c59b7718cd3158b3233";
-          sha256 = "1b6zn1fmqvfb7bcpmhzkgcy5003dl22w3f293arlsd1xkbjgkxa2";
+          rev = "57f894e68b47352aeacaf0d9c61039b24ba42918";
+          sha256 = "0vf42j9jpa75879pxb1h7qgflcrrg78dgq5lg8v0sbpy7z86zaxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gotest";
           sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
           name = "gotest";
         };
@@ -22836,7 +23088,7 @@
           sha256 = "12lglll20w321vvl6zpqd8r9745y58g6zzfm83iifyzd9hzx7v30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gotham-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gotham-theme";
           sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
           name = "gotham-theme";
         };
@@ -22854,7 +23106,7 @@
           sha256 = "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-chg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-chg";
           sha256 = "0fs0fc1mksbb1266sywasl6pppdn1f9a4q9dwycl9zycr588yjyv";
           name = "goto-chg";
         };
@@ -22875,7 +23127,7 @@
           sha256 = "0j2hdxqfsifm0d8ilwcw7np6mvn4xm58xglzh42gigj2fxv87g99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-gem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-gem";
           sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
           name = "goto-gem";
         };
@@ -22896,7 +23148,7 @@
           sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-last-change";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-last-change";
           sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
           name = "goto-last-change";
         };
@@ -22906,6 +23158,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
+    melpaBuild {
+        pname = "govc";
+        version = "20160201.1146";
+        src = fetchFromGitHub {
+          owner = "vmware";
+          repo = "govmomi";
+          rev = "367391c0c3de585b791b72bdcd045810fb17d606";
+          sha256 = "1bqqdwwc63g05wwnk15745mmf4g7r23nzyq681im6icy13x6z07x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/govc";
+          sha256 = "1ivgaziv25wlzg6y4zh8x7mv97pnyhi7p8jpvgh5fg5lnqpzhl4v";
+          name = "govc";
+        };
+        packageRequires = [ dash emacs json-mode magit-popup s ];
+        meta = {
+          homepage = "http://melpa.org/#/govc";
+          license = lib.licenses.free;
+        };
+      }) {};
     govet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "govet";
@@ -22917,7 +23190,7 @@
           sha256 = "1fzf43my7qs4n37yh1jm6fyp76dfgknc5g4zin7x5b5lc63g0wxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/govet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/govet";
           sha256 = "1rpgngixf1xnnqf0l2vvh6y9q3395qyj9ln1rh0xz5lm7d4pq4hy";
           name = "govet";
         };
@@ -22938,7 +23211,7 @@
           sha256 = "1l43h008l7n6waclb2km32dy8aj7m5yavm1pkq38p9ppzayfxqq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gplusify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gplusify";
           sha256 = "0fgkcvppkq6pba1giddkfxp9z4c8v2cid9nb8a190b3g85wcwycr";
           name = "gplusify";
         };
@@ -22959,7 +23232,7 @@
           sha256 = "0xs2278gamzg0710bm1fkhjh1p75m2l1jcl98ldhyjhvaf9d0ysc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gradle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gradle-mode";
           sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
           name = "gradle-mode";
         };
@@ -22980,7 +23253,7 @@
           sha256 = "03dranmbrq9gkvlcvzlrvv0nvpkgk02hcwfcjkdifql2j8h23jgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grails-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grails-mode";
           sha256 = "1zdlmdkwyaj2zns3xwmqpil83j7857aj2070kvx8xza66dxcnlm4";
           name = "grails-mode";
         };
@@ -23001,7 +23274,7 @@
           sha256 = "11ry4p5r0hg3jlmfhp6hfkryzrp6snl38v8j7ds8limhbpdh5wr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grails-projectile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grails-projectile-mode";
           sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
           name = "grails-projectile-mode";
         };
@@ -23022,7 +23295,7 @@
           sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grandshell-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grandshell-theme";
           sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
           name = "grandshell-theme";
         };
@@ -23043,7 +23316,7 @@
           sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphene";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphene";
           sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
           name = "graphene";
         };
@@ -23076,7 +23349,7 @@
           sha256 = "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphene-meta-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphene-meta-theme";
           sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
           name = "graphene-meta-theme";
         };
@@ -23097,7 +23370,7 @@
           sha256 = "12r6a3hikzqcdbplmraa4p4w136c006yamylxfjf8580v15xngrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphviz-dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphviz-dot-mode";
           sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
           name = "graphviz-dot-mode";
         };
@@ -23118,7 +23391,7 @@
           sha256 = "0nvl8mh7jxailisq31h5bi64s9b74ah1465wiwh18x502swr2s3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grapnel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grapnel";
           sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
           name = "grapnel";
         };
@@ -23138,7 +23411,7 @@
           sha256 = "0djv2ps2ahw9b1b5i45hgy7l7cch7cgh7rzq601c0r6vi7gm2ac5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grass-mode";
           sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
           name = "grass-mode";
         };
@@ -23159,7 +23432,7 @@
           sha256 = "0rgv96caigcjffg1983274p4ff1icx1xh5bj7rcd53hai5ag16mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/green-phosphor-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/green-phosphor-theme";
           sha256 = "1p4l75lahmbjcx74ca5jcyc04828vlcahk7gzv5lr7z9mhvq6fbh";
           name = "green-phosphor-theme";
         };
@@ -23180,7 +23453,7 @@
           sha256 = "1670pxgmqflzw5d02mzsmqjf3gp0c4wf25z0crmaamyfmwdz9pag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gregorio-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gregorio-mode";
           sha256 = "0f226l67bqqc6m8wb97m7lkxvwrfbw74b1riasirca1anzjl8jfx";
           name = "gregorio-mode";
         };
@@ -23201,7 +23474,7 @@
           sha256 = "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grep-a-lot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grep-a-lot";
           sha256 = "1513vnm5b587r15hcbnplgsfv7kv8g5fd0w4nwb6pq7myzv53ra1";
           name = "grep-a-lot";
         };
@@ -23219,7 +23492,7 @@
           sha256 = "1pqx01c61i3rxvq2qf8l6gcla8jsmc1af5780s78clqfi51kbg2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grep+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grep+";
           sha256 = "1qj4f6d3l88bdcnq825pylnc76m22x2i15yxdhc2b6rv80df7zsx";
           name = "grep-plus";
         };
@@ -23240,7 +23513,7 @@
           sha256 = "14c09m9p6556rrf0qfad4zsv7qxa5flamzg6fa83cxh0qfg7wjbp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/greymatters-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/greymatters-theme";
           sha256 = "10cxajyws5rwk62i4vk26c1ih0dq490kcfx7gijw38q3b5r1l8nr";
           name = "greymatters-theme";
         };
@@ -23259,7 +23532,7 @@
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grin";
           sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
           name = "grin";
         };
@@ -23272,15 +23545,15 @@
     grizzl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grizzl";
-        version = "20151223.1358";
+        version = "20160131.151";
         src = fetchFromGitHub {
           owner = "d11wtq";
           repo = "grizzl";
-          rev = "38b819b8f132962e24eb6a2cff33d571e848776d";
-          sha256 = "1v5xh0hana9wqc73g0yrzk5ip9zxbqg9xi8k7972nzj3fnma77bh";
+          rev = "b0996a9e2e5f6a9c4327ba7665ab29b633e404eb";
+          sha256 = "1d2kwiq3zy8wdg5zig0q9rrdcs4xdv6zsgvgc21b3kv83daq1dsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grizzl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grizzl";
           sha256 = "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24";
           name = "grizzl";
         };
@@ -23301,7 +23574,7 @@
           sha256 = "03dranmbrq9gkvlcvzlrvv0nvpkgk02hcwfcjkdifql2j8h23jgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/groovy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/groovy-mode";
           sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
           name = "groovy-mode";
         };
@@ -23322,7 +23595,7 @@
           sha256 = "0l6gkhzg0dn4q223gljh1jh305aa9n8rbf9h5gg5d1aygs7cb3ha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gruber-darker-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gruber-darker-theme";
           sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
           name = "gruber-darker-theme";
         };
@@ -23343,7 +23616,7 @@
           sha256 = "1js849s8b9x0n6ak2qwv90lk6zr71mgkk9f0xccdhikz4c8vxk0r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grunt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grunt";
           sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
           name = "grunt";
         };
@@ -23364,7 +23637,7 @@
           sha256 = "04jknwkax9gdmzz0yq0m21grl9c43vr3abdam3g8zjh5sjx5gs14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gruvbox-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gruvbox-theme";
           sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32";
           name = "gruvbox-theme";
         };
@@ -23385,7 +23658,7 @@
           sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gs-mode";
           sha256 = "02ldd92fv1k28nygl34i8gv0b0i1v5qd7nl1l17cf5f3akdwc6iq";
           name = "gs-mode";
         };
@@ -23406,7 +23679,7 @@
           sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gscholar-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gscholar-bibtex";
           sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
           name = "gscholar-bibtex";
         };
@@ -23427,7 +23700,7 @@
           sha256 = "14sx5m6fpkm2q8ljkicl1yy1sw003k4rzz9hi7lm1nfqr2l4n6q0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guide-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guide-key";
           sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
           name = "guide-key";
         };
@@ -23448,7 +23721,7 @@
           sha256 = "1s6p4ysdbqx5fk68s317ckj5rjmpkwwb0324sbqqa6byhw3j0xyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guide-key-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guide-key-tip";
           sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
           name = "guide-key-tip";
         };
@@ -23469,7 +23742,7 @@
           sha256 = "16h1g88y4q737sxcjkm1kxirv5m2x3l9wgmz0s4hlxjzli8fc7jr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guru-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guru-mode";
           sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
           name = "guru-mode";
         };
@@ -23490,7 +23763,7 @@
           sha256 = "0060qw4gr9fv6db20xf3spgl2fwg2iid5ckfjm3vj3ydyv62q13s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gvpr-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gvpr-mode";
           sha256 = "19p6f06qdjvh2vmgbabajvkfxpn13j899jrivw9mqyssz0cyvzgw";
           name = "gvpr-mode";
         };
@@ -23511,7 +23784,7 @@
           sha256 = "15d7zjxjp9h8jmxq3dqakwzlymqk6hqsg7zklkjs0ih7fz0d25pl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hackernews";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hackernews";
           sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
           name = "hackernews";
         };
@@ -23532,7 +23805,7 @@
           sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ham-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ham-mode";
           sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
           name = "ham-mode";
         };
@@ -23542,6 +23815,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hamburg-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hamburg-theme";
+        version = "20160123.140";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "hamburg-theme";
+          rev = "aacefdf1501d97a5afc0e63c8ead4b2463323028";
+          sha256 = "1rnkzl51h263nck1bd0jyb7q58b54d764gcsh7wqxfgzs1jfr4am";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hamburg-theme";
+          sha256 = "149ln7670kjyhdfj5j9akxch47dlff2hd58amla7j3297z1nhg4k";
+          name = "hamburg-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/hamburg-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "haml-mode";
@@ -23553,7 +23847,7 @@
           sha256 = "0fmcm4pcivigz9xhf7z9wsxz9pg1yfx9qv8na2dxj426bibk0a6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haml-mode";
           sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
           name = "haml-mode";
         };
@@ -23574,7 +23868,7 @@
           sha256 = "1njrpb1s2v9skyfbgb28clrxyvyp8i4b8kwa68ynvq3vjb4fnws6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hamlet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hamlet-mode";
           sha256 = "0ils4w8ry1inlfj4931ypibj3n60xq6ah74hig62y4vrs4d47gyx";
           name = "hamlet-mode";
         };
@@ -23595,7 +23889,7 @@
           sha256 = "0w443knp6kvjm2m79cni5d17plyhbsl0a4kip7yrpv5nmg370q3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/handlebars-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/handlebars-mode";
           sha256 = "11ahrm4n588v7ir2r7sp4dkbypl5nhnr22px849hdxjcrwal24vj";
           name = "handlebars-mode";
         };
@@ -23616,7 +23910,7 @@
           sha256 = "1z37di9vk1l35my8kl8jnyqlkr1rnp0iz13hpc0r065mib67v58k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/handlebars-sgml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/handlebars-sgml-mode";
           sha256 = "10sxm7v94yxa92mqbwj3shqjs6f3zbxjvwgbvg9m2fh3b7xj617w";
           name = "handlebars-sgml-mode";
         };
@@ -23637,7 +23931,7 @@
           sha256 = "0whn8rc98dhncgizzrb22nx6b6cm655q1cf2fpn6g3knq1c2471r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/handoff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/handoff";
           sha256 = "0iqqvygx50wi2vcbs6bfgqzhcz9a89zrwb7sg0ang9qrkiz5k36w";
           name = "handoff";
         };
@@ -23658,7 +23952,7 @@
           sha256 = "124k803pgxc7fz325yy6jcyam69f5fk9kdwfgmnwwca9ablq4cfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hardcore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hardcore-mode";
           sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
           name = "hardcore-mode";
         };
@@ -23679,7 +23973,7 @@
           sha256 = "13pgxskddir74lqknkkflzkrv6q455cf5s7wjww1zgvw95j7q50v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hardhat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hardhat";
           sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
           name = "hardhat";
         };
@@ -23700,7 +23994,7 @@
           sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs";
           sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
           name = "haskell-emacs";
         };
@@ -23721,7 +24015,7 @@
           sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs-base";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs-base";
           sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
           name = "haskell-emacs-base";
         };
@@ -23742,7 +24036,7 @@
           sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs-text";
           sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
           name = "haskell-emacs-text";
         };
@@ -23752,22 +24046,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    haskell-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20160117.1545";
+        version = "20160202.1531";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "a5d18dacca2d2df14a2b786efab766f72ec8cfbf";
-          sha256 = "0a94zkns55jv0rqf1mf1x5ss0waw64yg4428838n4qiqlqrgdz44";
+          rev = "b562d054972c5d976f1c5d222bec9aa1189bd0dd";
+          sha256 = "0w5q3cff31qsyq9z4ci6x9pdacjmdlh5w6h0n485b92yb8ryxa5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-mode";
           sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
           name = "haskell-mode";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "http://melpa.org/#/haskell-mode";
           license = lib.licenses.free;
@@ -23776,15 +24070,15 @@
     haskell-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "haskell-snippets";
-        version = "20150612.1439";
+        version = "20160121.1658";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-snippets";
-          rev = "bcf12cf33a67ddc2f023a55072859e637fe4fa25";
-          sha256 = "0b3d7rvqvvcsp51aqfhl0zg9zg8j0p6vlfvga6jp9xc7626vh6f6";
+          rev = "c72e467d77c8c91439522599a741a8b2950fe1e9";
+          sha256 = "1wha5f2zx5hr6y0wvpmkg7jnxcgbzx99gd70h96c3dqqqhqz6d2a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-snippets";
           sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
           name = "haskell-snippets";
         };
@@ -23804,7 +24098,7 @@
           sha256 = "7e41c910d6901638b9dfb697206659f5441e26e0558f9227c4ba7c6f2f47d841";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-tab-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-tab-indent";
           sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
           name = "haskell-tab-indent";
         };
@@ -23825,7 +24119,7 @@
           sha256 = "1gmh455ahd9if11f8mrqbfky24c784bb4fgdl3pj8i0n5sl51i88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haste";
           sha256 = "0wz15p58g4mxvwbpy9k60gixs1g4jw7pay5pbxnlggc39x1py8nf";
           name = "haste";
         };
@@ -23845,7 +24139,7 @@
           sha256 = "106a7kpjj4laxl7x8aqpv75ih54569b3bs2a1b8z4rghmikqc4aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haxe-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haxe-mode";
           sha256 = "032h0nxlsrk30bsqb02by842ycrw1qscpfprifjjkaiq08wigh1l";
           name = "haxe-mode";
         };
@@ -23866,7 +24160,7 @@
           sha256 = "1si5r86zvnp4wbzvvqyc4zhap14k8pcq5nqigx45mgvpdnwdvzln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haxor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haxor-mode";
           sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
           name = "haxor-mode";
         };
@@ -23887,7 +24181,7 @@
           sha256 = "0pjxyhh8a02i54a9jsqr8p1mcqfl6k9b8gv9lnzb242gy4518y3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hayoo";
           sha256 = "1rqvnv5nxlsyvsa5my1wpfm82sw21s7kfbg80vrjmxh0mwlyv4p9";
           name = "hayoo";
         };
@@ -23908,7 +24202,7 @@
           sha256 = "0rgcj47h7a67qkw6696pcm1a4g4ryx8nrz55s69fw86958fp08hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hc-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hc-zenburn-theme";
           sha256 = "0jcddk9ppgcizyyciabj3sgk1pmingl97knf9nmr0mi89h7n2g5y";
           name = "hc-zenburn-theme";
         };
@@ -23929,7 +24223,7 @@
           sha256 = "1vf5130bj1ii9j8qq9vdw0ga0qgfk8brjz34ysfmz9l2ihlcxvl0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
           name = "hcl-mode";
         };
@@ -23947,7 +24241,7 @@
           sha256 = "00j74cqdnaf5rl7w4wabm4z88cm20s152y0yxnv73z9pvqbknrmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/header2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/header2";
           sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06";
           name = "header2";
         };
@@ -23968,7 +24262,7 @@
           sha256 = "06hq6p6a4fzprbj4r885vsvzddlvx0wxqk5kik06v5bm7hjmnyrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/headlong";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/headlong";
           sha256 = "042ybplkqjb30qf5cpbw5d91j1rdc71b789v277h036bri7hgxz6";
           name = "headlong";
         };
@@ -23978,22 +24272,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20160118.1311";
+        version = "20160204.1126";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "a046a6c645a04745fb352ce4b6a85ecb532b59f3";
-          sha256 = "16daffw6kk39d1d0vy9mc2n62wlq6b7qd6sbnq1l1a89q57lw646";
+          rev = "6085777884bf8cc63a6e15cbbb506d09d782f0cc";
+          sha256 = "1rwdh2mwn3ynw1c1b5fxdblnyfrqcnbs5045dfl4f8afwqqh92w8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm";
           sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9";
           name = "helm";
         };
-        packageRequires = [ async cl-lib emacs helm-core ];
+        packageRequires = [ async emacs helm-core popup ];
         meta = {
           homepage = "http://melpa.org/#/helm";
           license = lib.licenses.free;
@@ -24010,7 +24304,7 @@
           sha256 = "0nip0zrmn944wy0x2dc5ryr0m7a948rn2a8cbaajghs7a7zai4cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-R";
           sha256 = "0zq9f2xhgap3ihnrlsrsaxaz0nx014k0820bfsq7lckwcnm0mng1";
           name = "helm-R";
         };
@@ -24031,7 +24325,7 @@
           sha256 = "04rvbafa77blps7x7cmlsciys8fgmvhfhq4v51pk8z5q3j1lrgc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ack";
           sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
           name = "helm-ack";
         };
@@ -24052,7 +24346,7 @@
           sha256 = "0hxfgdn56c7qr64r59g9hvxxwa4mw0ad9c9m0z5cj85bsdd7rlx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ad";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ad";
           sha256 = "0h2zjfj9hy7bkpmmjjs0a4a06asbw0yww8mw9rk2xi1gc2aqq4hi";
           name = "helm-ad";
         };
@@ -24062,22 +24356,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "20160116.1851";
+        version = "20160126.2347";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "0c99d821e4feebfeb62dabea9cded72664c083af";
-          sha256 = "0qar85n14iifm5ijrqlg5r4x7aq5cng7s4nzw5dlzgcbvsrcizs0";
+          rev = "33a924553eb0cc8d80022bea491718aba48801d0";
+          sha256 = "1gbvhc8wpai3gvnzsmg1y7qffvimg77b36dcm7n82iy6pavdn9z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ag";
           sha256 = "023zvgmi5b5b2qga3jqd7jrq9ap8n3rhvl6jrv9fsi565sg1fv43";
           name = "helm-ag";
         };
-        packageRequires = [ cl-lib helm ];
+        packageRequires = [ emacs helm ];
         meta = {
           homepage = "http://melpa.org/#/helm-ag";
           license = lib.licenses.free;
@@ -24094,7 +24388,7 @@
           sha256 = "1rifdkhzvf7xd2npban0i8v3rjcji69063dw9rs1d32w4n7fzlfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ag-r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ag-r";
           sha256 = "0ivh7f021lbmbaj6gs4y8m99s63js57w04q7cwx7v4i32cpas7r9";
           name = "helm-ag-r";
         };
@@ -24115,7 +24409,7 @@
           sha256 = "153zq1q3s3ihjh15wyci9qdic3pin8f1j1gq2qlzyhmy0njlvgjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-anything";
           sha256 = "0yjlwsiahb7n4q3522d68xrdb8caad9gpnglz5php245yqy3n5vx";
           name = "helm-anything";
         };
@@ -24136,7 +24430,7 @@
           sha256 = "1bnypr906gfc1fbyrqfsfilsl6wiacrnhr8flpa0gmdjhvmrw7af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-aws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-aws";
           sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
           name = "helm-aws";
         };
@@ -24157,7 +24451,7 @@
           sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-backup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-backup";
           sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
           name = "helm-backup";
         };
@@ -24170,15 +24464,15 @@
     helm-bibtex = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20160108.1107";
+        version = "20160127.1352";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "55ac5ce0b49893c8c46ce6a5074ba2df9f60d0d3";
-          sha256 = "1fbsp7h35bwz802y0mksrlilm2da2l9hs72iimrdf886vh1wifxl";
+          rev = "be4c894463ee77ee719d0c5517cf414a8fcc6cce";
+          sha256 = "046gycmwrn0h1ld37b7pwylb9nkyzgpzlbf7p99fq8p2mnsz3rcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bibtex";
           sha256 = "1rsplnh18w1fqr6da79vj8x9q2lyss9sssy8pfz3hfw7p6qi6zkg";
           name = "helm-bibtex";
         };
@@ -24199,7 +24493,7 @@
           sha256 = "10k7hjfz9jmfpbmsv20jy9vr6fqxx1yp8v115hprqvw057iifsl9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bibtexkey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bibtexkey";
           sha256 = "00i7ni4r73mmxavhfcm0fd7jhx6gxvxx7prax1yxmhs46fpz8jwj";
           name = "helm-bibtexkey";
         };
@@ -24220,7 +24514,7 @@
           sha256 = "1wmcy7q4ys2sf8ya5l4n7a6bq5m9d6m19amjfwkmkh4ajkwl041y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bind-key";
           sha256 = "1yfj6mmxc165in1i85ccanssch6bg19ib1fcm7sa4i4hv0mgwaid";
           name = "helm-bind-key";
         };
@@ -24241,7 +24535,7 @@
           sha256 = "1gcx7imq9gxfgmh188a8xlpmmlrdif1vsnnff49qvk82082ghbfz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bm";
           sha256 = "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh";
           name = "helm-bm";
         };
@@ -24262,7 +24556,7 @@
           sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bundle-show";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
           name = "helm-bundle-show";
         };
@@ -24283,7 +24577,7 @@
           sha256 = "0w4svbg32y63v049plvk7djc1m2amjzrr1v979d9s6jbnnpzlb5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-c-moccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-c-moccur";
           sha256 = "1i6a4jqjy9amlhdbj5d26wzagndfgszha09vs5qf4760vjl7kn4b";
           name = "helm-c-moccur";
         };
@@ -24304,7 +24598,7 @@
           sha256 = "03c4w34r0q7xpz1ny8dya8f96rhjpc9r2c24n7vg9x6x4i2wl204";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-c-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-c-yasnippet";
           sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
           name = "helm-c-yasnippet";
         };
@@ -24325,7 +24619,7 @@
           sha256 = "0wkskm0d1mvh49l65xg6pgwd7yxy02llflkzx59ayqv4wjvsyayb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-chrome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-chrome";
           sha256 = "0p3n2pna83mp4ym8x69lk4r3q4apbj5v2blg2mwcsd9zij153nxz";
           name = "helm-chrome";
         };
@@ -24346,7 +24640,7 @@
           sha256 = "1dmj4f8pris1i7wvfplp4dbnyfm403l6rplxfrfi0cd9afg7m68i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-chronos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-chronos";
           sha256 = "1a65b680741cx4cyyizyl2c3bss36x3j2m9sh9hjc87xrzarg0s3";
           name = "helm-chronos";
         };
@@ -24367,7 +24661,7 @@
           sha256 = "18j4ikb3q8ygdq74zqzm83wgb39x7w209n3186mm051n8lfmkaif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-cider-history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-cider-history";
           sha256 = "12l8jyl743zqk8m2xzcz75y1ybdkbkvcbvfkn1k88k09s31kdq4h";
           name = "helm-cider-history";
         };
@@ -24388,7 +24682,7 @@
           sha256 = "1iqjc15pz5qr8zjxaxz1b2vys2689ri76jacmipxvgjk0y7vc5f0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-circe";
           sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
           name = "helm-circe";
         };
@@ -24409,7 +24703,7 @@
           sha256 = "10cp21v8vwgp8hv2rkdn9x8v2n8wqbphgslb561rlwc2rfpvzqvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-cmd-t";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-cmd-t";
           sha256 = "04fmhravd3ld4n1n820wlnr1jvmk7c7cdazd15gazixrlz6fm4fk";
           name = "helm-cmd-t";
         };
@@ -24422,15 +24716,15 @@
     helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-codesearch";
-        version = "20160105.727";
+        version = "20160123.513";
         src = fetchFromGitHub {
           owner = "youngker";
           repo = "helm-codesearch.el";
-          rev = "093ca750b77ca07ed64f89f8d9ba1d3fd9f61ea6";
-          sha256 = "1c2fn86sbdh91i95glfbazv0g11rg38xras8ddk8ijcxg2c4jl0v";
+          rev = "eb97593da777d34087350af3ddd6e9e34c6346bd";
+          sha256 = "05nvbwz3inbmfj88am69sz032wsj8jkfpjk5drgfijw98il9blk9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-codesearch";
           sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q";
           name = "helm-codesearch";
         };
@@ -24451,7 +24745,7 @@
           sha256 = "0fxrmvb64lav4aqs61z3a4d2mcp9s2nw7fvysyjn0r1291pkzk9j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-commandlinefu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-commandlinefu";
           sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
           name = "helm-commandlinefu";
         };
@@ -24472,7 +24766,7 @@
           sha256 = "189qmc6fdj5a01a7w45r0qpn9qjf2q9g83qic9sgnrccc841zpyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-company";
           sha256 = "1pbsg7zrz447siwd8pasw2hz5z21wa1xpqs5nrylhbghsk076ld3";
           name = "helm-company";
         };
@@ -24482,22 +24776,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-core = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20160118.1220";
+        version = "20160203.419";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "a046a6c645a04745fb352ce4b6a85ecb532b59f3";
-          sha256 = "16daffw6kk39d1d0vy9mc2n62wlq6b7qd6sbnq1l1a89q57lw646";
+          rev = "6085777884bf8cc63a6e15cbbb506d09d782f0cc";
+          sha256 = "1rwdh2mwn3ynw1c1b5fxdblnyfrqcnbs5045dfl4f8afwqqh92w8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-core";
           sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
           name = "helm-core";
         };
-        packageRequires = [ async cl-lib emacs ];
+        packageRequires = [ async emacs ];
         meta = {
           homepage = "http://melpa.org/#/helm-core";
           license = lib.licenses.free;
@@ -24514,7 +24808,7 @@
           sha256 = "0nhi8xhcf7qpsibpyy5v364xx7lqkhskzai7awkg0xcdq8b5090x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-cscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-cscope";
           sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
           name = "helm-cscope";
         };
@@ -24535,7 +24829,7 @@
           sha256 = "01a3pahpsxb7d15dkfgxypl7gzqb4dy4f36lmid1w77b9rhs6nph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-css-scss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-css-scss";
           sha256 = "0iflwl0rijbkx1b7i1s7984dw7sz1wa1cb74fqij0kcn76kal7ak";
           name = "helm-css-scss";
         };
@@ -24556,7 +24850,7 @@
           sha256 = "18d96alik66nw3rkk7k8740b4rx2bnh3pwn27ahpgj5yf51wm0ry";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ctest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ctest";
           sha256 = "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm";
           name = "helm-ctest";
         };
@@ -24577,7 +24871,7 @@
           sha256 = "1fbwxd6fm36ci85svl22h30bjqm8p5p8fxsnbmvkksln5psghn5d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dash";
           sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
           name = "helm-dash";
         };
@@ -24598,7 +24892,7 @@
           sha256 = "0y0xxs67bzh6j68j3f4zxzrl2ij5g1qvvxqklw7nz305xliis29g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-descbinds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-descbinds";
           sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
           name = "helm-descbinds";
         };
@@ -24619,7 +24913,7 @@
           sha256 = "05mb7kb4x7kzh0w9r531ppd92hzsa2v3wqcmafkcn1z5wfp7zw68";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dictionary";
           sha256 = "1pak8qn0qvbzyclhzvr5ka3pl370i4kiykypfkwbfgvqqwczhl3n";
           name = "helm-dictionary";
         };
@@ -24640,7 +24934,7 @@
           sha256 = "14sifdrfg8ydvi9mj8qm2bfphbffglxrkb5ky4q5b3j96bn8v110";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dired-recent-dirs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dired-recent-dirs";
           sha256 = "0kh0n5674ksswjzi9gji2qmx8v8g0axx8xbi0m3zby9nwcpv4qzs";
           name = "helm-dired-recent-dirs";
         };
@@ -24661,7 +24955,7 @@
           sha256 = "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dirset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dirset";
           sha256 = "0vng52axp7r01s00cqbbclbm5bx1qbhmlrx9h9kj7smx1al4daml";
           name = "helm-dirset";
         };
@@ -24682,7 +24976,7 @@
           sha256 = "0c3mn5w98phsv7gsljyp5vxxmr2w6n3nczh5zm4hcpwsra3wh1v9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-emmet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-emmet";
           sha256 = "1dkn9qa3dv2im11lm19wfh5jwwwp42sv7jc0p6qg35rhzwdpfg03";
           name = "helm-emmet";
         };
@@ -24703,7 +24997,7 @@
           sha256 = "0330s07b41nw9q32xhjdl7yw83p8ikj6b2qkir3y0jyx16gk10dl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-emms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-emms";
           sha256 = "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5";
           name = "helm-emms";
         };
@@ -24724,7 +25018,7 @@
           sha256 = "00yhmpv5xjlw1gwbcrznz83gkaby8zlqv74d3p7plca2cwjll1g9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-filesets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-filesets";
           sha256 = "1yhhchksi0r4r5c5q1mggz2hykkvk93baq91b5hkaflqi30d1v8f";
           name = "helm-filesets";
         };
@@ -24745,7 +25039,7 @@
           sha256 = "0vmlpj6zfif5f3wzgq8lkfqprl3z5gjsqj86347krblgfzhqlz30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-firefox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-firefox";
           sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
           name = "helm-firefox";
         };
@@ -24758,15 +25052,15 @@
     helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-flx";
-        version = "20160105.1418";
+        version = "20160129.1504";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "helm-flx";
-          rev = "95b197ae8b20ac125a540abff7da6c6588250477";
-          sha256 = "1np2kwrwd82nq3bs1vsgyybx1j1wc639ndfzizhskglss4m1md2y";
+          rev = "0001a85e88164e8ba6a674a19c44772ce946c9d4";
+          sha256 = "1j2ziyzyhd177b3rhrdbkqjmqbr3a8aj670mayy6l2r4ydp5xmaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-flx";
           sha256 = "03vxr5f5m4s6k6rm0976w8h3s4c3b5mrdqgmkd281hmyh9q3cslq";
           name = "helm-flx";
         };
@@ -24787,7 +25081,7 @@
           sha256 = "0k5703nj838qh0h6hzgffjrp0df9rs7psczg4r9mxpi19vqk8ff0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-flycheck";
           sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b";
           name = "helm-flycheck";
         };
@@ -24808,7 +25102,7 @@
           sha256 = "1liaid4l4x8sb133lj944gwwpqngsf8hzibdwyfdmsi4m4abh73h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-flymake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-flymake";
           sha256 = "0h87yd56nhxpahrcpk6hin142hzv3sdr5bvz0injbv8a2lwnny3b";
           name = "helm-flymake";
         };
@@ -24829,7 +25123,7 @@
           sha256 = "1k7invgzqrcm11plyvinqwf98yxibr8i4r9yw3csfsicc8b6if59";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-flyspell";
           sha256 = "1g6xry2y6396pg7rg8hc0l84z5r3j2df7dpd1jgffxa8xa3i661f";
           name = "helm-flyspell";
         };
@@ -24850,7 +25144,7 @@
           sha256 = "1jns0428jmxrm4w9yk67ffbzmgyjgp1v5ii152y0wsb105ary0xp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-fuzzier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-fuzzier";
           sha256 = "0qdgf0phs3iz29zj3qjhdgb3i4xvf5r2vi0709pwxx2s6r13pvcc";
           name = "helm-fuzzier";
         };
@@ -24871,7 +25165,7 @@
           sha256 = "1yxnmxq6ppfgwxrk5ryc5xfn82kjf4j65j14hy077gphr0q61q6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-fuzzy-find";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-fuzzy-find";
           sha256 = "0lczlrpd5jy2vhy9jl3rjcdyiwr136spqm8k2rj8m9s8wpn0v75i";
           name = "helm-fuzzy-find";
         };
@@ -24892,7 +25186,7 @@
           sha256 = "16p1gisbza48qircsvrwx020n96ss1c6s68d7cgqqfc0bf2467is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ghc";
           sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
           name = "helm-ghc";
         };
@@ -24905,15 +25199,15 @@
     helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ghq";
-        version = "20151221.623";
+        version = "20160203.927";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-ghq";
-          rev = "2997646b2fb5421ab435b772dd2dbaeb92d70166";
-          sha256 = "0rlk9016rxj292kpxrnqgrm4xsjs4m4gk2fwh8z3fcihi013lxaw";
+          rev = "db37bfe290b234ed3f39dcce24667072172ded41";
+          sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
           name = "helm-ghq";
         };
@@ -24934,7 +25228,7 @@
           sha256 = "1yfy4a52hx44r32i0b75bka8gfcn5lp61jl86lzrsi2cr9wg10pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-git";
           sha256 = "1ib73p7cmkw96csxxpkqwn6m60k1xrd46z6vyp29gj85cs4fpsb8";
           name = "helm-git";
         };
@@ -24955,7 +25249,7 @@
           sha256 = "157b525h0kiaknn12fsw67fg26lzb20apx8sssmvlcicqcd51iaw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-git-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-git-files";
           sha256 = "02109r956nc1dmqh4v082vkr9wdixh03xhl7icwkzl7ipr5453s6";
           name = "helm-git-files";
         };
@@ -24976,7 +25270,7 @@
           sha256 = "1mp5gbda81szbx19rvaa6ybb28v64q49hqic8d478ggnjjsqhfyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-git-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-git-grep";
           sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
           name = "helm-git-grep";
         };
@@ -24997,7 +25291,7 @@
           sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-github-stars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-github-stars";
           sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
           name = "helm-github-stars";
         };
@@ -25018,7 +25312,7 @@
           sha256 = "0pd755s5zcg8y1svxj3g8m0znkp6cyx5y6lsj4lxczrk7lynzc3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gitignore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gitignore";
           sha256 = "01l7mx8g1m5qnwz973hzrgds4gywm56jgl4hcdxqvpi1n56md3x6";
           name = "helm-gitignore";
         };
@@ -25035,11 +25329,11 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "78deece7f314f9652b50117605e93be9f8c860f4";
-          sha256 = "07i4j9yl1yag70sl89n7v4yg4jvh5mrifhrf1xswlb29by6najdx";
+          rev = "1615468bbbe2bf07914dd525067ac39db2bc19c0";
+          sha256 = "00mma30r7ixbrxjmmddz4klh517fcr3yn6ss4zw33fh2hzj3w6rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gitlab";
           sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
           name = "helm-gitlab";
         };
@@ -25060,7 +25354,7 @@
           sha256 = "1r01nl1k9jjb70214rkmbqaa4qrkyd3apiyq00w02wsymy12wwic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-go-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-go-package";
           sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6";
           name = "helm-go-package";
         };
@@ -25081,7 +25375,7 @@
           sha256 = "0ml5mv282dz73hmgjalcsypdvc30pwhsfbamyz46744j7wxn6ik2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-google";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-google";
           sha256 = "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32";
           name = "helm-google";
         };
@@ -25102,7 +25396,7 @@
           sha256 = "07bmk4wbn07rg8h8rdhah285hsaaqkx5n84g87lpb7y5ba3ivlk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-grepint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-grepint";
           sha256 = "00wr3wk41sbpamxbjkqlby49g8y5z9n79p51sg7ginban4qy91gf";
           name = "helm-grepint";
         };
@@ -25123,7 +25417,7 @@
           sha256 = "0p0mk44y2z875ra8mzcb6vlf4rbkiq9yank5hdxvg2x2sxsaambk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-growthforecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-growthforecast";
           sha256 = "0716rhs5dam6p8ym83vy19svl6jr49lcfgb29mm3cqi9jcch3ckh";
           name = "helm-growthforecast";
         };
@@ -25136,15 +25430,15 @@
     helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-gtags";
-        version = "20160117.2055";
+        version = "20160202.703";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-gtags";
-          rev = "7fb96b900fb8640993354a2f83732a50da529d03";
-          sha256 = "1gfshy0brlfa8z39savj2a0jlfpqffijshsyjpz28ig2ggv8amnh";
+          rev = "f14ff7140d0f070b089df7567f2cc6b437ab9924";
+          sha256 = "1hqmwbdcjssvvl7prdykhlgbfrf4qylkvqp0nnnxp8r1wy6h6aws";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gtags";
           sha256 = "0snx0b8b4yc507q3i4fzvrd68xgzqxly8kn5cwp26ik6cv840y29";
           name = "helm-gtags";
         };
@@ -25165,7 +25459,7 @@
           sha256 = "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hatena-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
           name = "helm-hatena-bookmark";
         };
@@ -25186,7 +25480,7 @@
           sha256 = "08pfzs030d8g5s7vkpgicz4srp5cr3xpd84lhrr24ncrhbszxar9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hayoo";
           sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
           name = "helm-hayoo";
         };
@@ -25207,7 +25501,7 @@
           sha256 = "05ksfx54ar2j4mypzwh0gfir8r26s4f1i4xw319q5pa1y2100cpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-helm-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-helm-commands";
           sha256 = "0dq9p37i5rrp2nb1vhqzzqfmdg11va2xr3yz8hdxpwykm1ldqdcf";
           name = "helm-helm-commands";
         };
@@ -25228,7 +25522,7 @@
           sha256 = "052hzybign54qawdm1fflsaz4bcwflycksv6wb1nw1jv79s2qbap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hoogle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hoogle";
           sha256 = "0672mqm0c261mknbgc3a4pahq27gw2pfklflxl1y4ykbs6q7vcyw";
           name = "helm-hoogle";
         };
@@ -25249,7 +25543,7 @@
           sha256 = "0128nrhwyzslzl0l7wcjxn3dlx3h1sjmwnbbnp2fj4bjk7chc59q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-idris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-idris";
           sha256 = "1y52675j4kcq14jypxjw1rflxrxwaxyn1n3m613klad55wpfaamf";
           name = "helm-idris";
         };
@@ -25270,7 +25564,7 @@
           sha256 = "0py4xs27z2jvg99i6qaf2ccz0mvk6bb9cvdyz8v8ngmnj3rw2vla";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-img";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-img";
           sha256 = "0sq9l1wgm97ppfc45w3bdcv0qq5m85ygnanv1bdcp8bxbdl4vg0q";
           name = "helm-img";
         };
@@ -25291,7 +25585,7 @@
           sha256 = "04vdin0n3514c8bycdjrwk3l6pkarrwanlklnm75315b91nkkbcp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-img-tiqav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-img-tiqav";
           sha256 = "1m083hiih2rpyy8i439745mj4ldqy85fpnvms8qnv3042b8x35y0";
           name = "helm-img-tiqav";
         };
@@ -25312,7 +25606,7 @@
           sha256 = "04ddjdia09y14gq4h6m8g6aiwkqvdxp66yjx3j5dh2xrkyxhlxpz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ispell";
           sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
           name = "helm-ispell";
         };
@@ -25333,7 +25627,7 @@
           sha256 = "1czgf5br89x192g3lh3x2n998f79hi1n2f309ll264qnl35kv14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-itunes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-itunes";
           sha256 = "15z5lgh5x1ykz5p31i994fig8v05s7ckkgw6p9jifn11sn1a39nb";
           name = "helm-itunes";
         };
@@ -25354,7 +25648,7 @@
           sha256 = "0f2psp7p82sa2fip282w152zc1rjd3l0sna1g7rgwi9x29gcsh0v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-j-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-j-cheatsheet";
           sha256 = "0lppzk60vl3ps9fqnrh020awiy5w46gwlb6d91pr889x24ryphmm";
           name = "helm-j-cheatsheet";
         };
@@ -25375,7 +25669,7 @@
           sha256 = "0vhqpcv8xi6a6q7n6xxahdzijr1x5s40fvk9nc44q55psbyv627g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-jstack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-jstack";
           sha256 = "0giix1rv2jrmdxyg990w90ivl8bvgbbvah6nkpj7gb6vbnm15ldz";
           name = "helm-jstack";
         };
@@ -25396,7 +25690,7 @@
           sha256 = "0nkmc17ggyfi7iz959mvzh6q7116j44zqwi7ydm9i8z49xfpzafy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-lobsters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-lobsters";
           sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
           name = "helm-lobsters";
         };
@@ -25417,7 +25711,7 @@
           sha256 = "129mlpx5vqxyg2scrdiajxp71phxamrvijpc054k1q1an8vgn0kv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-git";
           sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
           name = "helm-ls-git";
         };
@@ -25438,7 +25732,7 @@
           sha256 = "1msrsqiwk7bg5gry5cia8a6c7ifymfyn738hk8g2qwzzw4vkxxcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-hg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-hg";
           sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
           name = "helm-ls-hg";
         };
@@ -25454,11 +25748,11 @@
         version = "20150717.239";
         src = fetchsvn {
           url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el";
-          rev = "144800";
+          rev = "145428";
           sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-svn";
           sha256 = "08mwzi340akw4ar20by0q981mzmzvf0wz3mn738q4inn2kqgs60d";
           name = "helm-ls-svn";
         };
@@ -25479,7 +25773,7 @@
           sha256 = "05z1s01wgdj2s7qln42cg7nnjq0hmq2ji4xjldzj6w770a5nvb7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-make";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-make";
           sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
           name = "helm-make";
         };
@@ -25500,7 +25794,7 @@
           sha256 = "0gzlprf5js4y3vzkf7si2xc7ai5j97b5cqrs002hyjj5ij4f2vix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-migemo";
           sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
           name = "helm-migemo";
         };
@@ -25521,7 +25815,7 @@
           sha256 = "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mode-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mode-manager";
           sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
           name = "helm-mode-manager";
         };
@@ -25542,7 +25836,7 @@
           sha256 = "09rb8aq7fnf661w3liwbkkaczjph3dzvg26slm9cwcnl7pqnvagl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mt";
           sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
           name = "helm-mt";
         };
@@ -25555,15 +25849,15 @@
     helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-mu";
-        version = "20160104.415";
+        version = "20160124.1957";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-mu";
-          rev = "e9805abf7498d3f990da26dd3355e5af3112e29e";
-          sha256 = "0xqykxq8ys9gd269kjzhlwcd2lzsjj5j2ynijvpl2rji10w2xwkr";
+          rev = "20a2a8a43403f5ff9ee32510c78551f63d2e0e57";
+          sha256 = "0zcpdkh2ycmnv2nkv02khqp5r7za3x3vji2sj4nwz1wd86rrpbv5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mu";
           sha256 = "0pydp6scj5icaqfp3dp5h0q1y2i7z9mfyw1ll6iphsz9qh3x2bj2";
           name = "helm-mu";
         };
@@ -25584,7 +25878,7 @@
           sha256 = "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-nixos-options";
           sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
           name = "helm-nixos-options";
         };
@@ -25605,7 +25899,7 @@
           sha256 = "1wkmbc7247f209krvw4dzja3z0wyny12x5yi1cn3fnfh5nx04851";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-open-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-open-github";
           sha256 = "121sszwvihbv688nq5lhdclvsjj8759glh42h82r4pcw30lxggxb";
           name = "helm-open-github";
         };
@@ -25626,7 +25920,7 @@
           sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-orgcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-orgcard";
           sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
           name = "helm-orgcard";
         };
@@ -25647,7 +25941,7 @@
           sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-package";
           sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
           name = "helm-package";
         };
@@ -25668,7 +25962,7 @@
           sha256 = "0yngs3q6142g2nn1wwdaifylyfjjs3gmmy0jck5zh8mhmdgdqr06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pages";
           sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
           name = "helm-pages";
         };
@@ -25689,7 +25983,7 @@
           sha256 = "13wnagmgicl2mi4iksqckrjbaiz05j9ykbmvj26jy8zcbll5imfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-perldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-perldoc";
           sha256 = "0b0cl2xj5w1r71zrjhnqhrzsnz1296jv21qx5adzslra6lk55q2r";
           name = "helm-perldoc";
         };
@@ -25710,7 +26004,7 @@
           sha256 = "076yhcf447fas14k8gg67rc743x049xf66627sd9lgjv7107r8vr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-proc";
           sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
           name = "helm-proc";
         };
@@ -25731,7 +26025,7 @@
           sha256 = "0j54c1kzsjgr05qx25rg3ylawvyw6n6liypiwaas47vpyfswbxhv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-project-persist";
           sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
           name = "helm-project-persist";
         };
@@ -25752,7 +26046,7 @@
           sha256 = "1c6pfy3qghpqnng1jsnxnvqnd6sq41f2dm7kkwkgml405asqlcqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-projectile";
           sha256 = "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a";
           name = "helm-projectile";
         };
@@ -25773,7 +26067,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-prosjekt";
           sha256 = "019rya3bf13cnval8iz680wby3sqlmqg4nbn0a13l1pkhlnv9fvm";
           name = "helm-prosjekt";
         };
@@ -25794,7 +26088,7 @@
           sha256 = "01wcybzb1jdyybr7scblzxp3c16zm01ms9ci1hcpfsv2y55gbg5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pt";
           sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
           name = "helm-pt";
         };
@@ -25815,7 +26109,7 @@
           sha256 = "1hlbyw6jvh6pm3ivmhd6qvs9j7km322fki9g4yd4qw7w15a3wkyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pydoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pydoc";
           sha256 = "0cnbhjw951f8sci63cvzcc65d0ffdx3rb8l1g38qql5rzkam48fn";
           name = "helm-pydoc";
         };
@@ -25836,7 +26130,7 @@
           sha256 = "1a26r21jvgzk21vh3mf29s1dhvvv70jh860zaq9ihrpfrrl91158";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rails";
           sha256 = "1iihfsmnkpfp08pldghf3w5k8v5dlmy5ns0l4niwdwp5w8lyjcd6";
           name = "helm-rails";
         };
@@ -25857,7 +26151,7 @@
           sha256 = "1b74jsr28ldz80mrqz3d1bmykpcprdbhf3fzhc0awd5i5xdnfaid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rb";
           sha256 = "14pkrj1rpi2ihpb7c1hx6xwzvc1x7l41lwr9znp5vn7z93i034fr";
           name = "helm-rb";
         };
@@ -25878,7 +26172,7 @@
           sha256 = "0nbny1a41sy4w3k2irp7rh6663jhbssqqshxd3y82iq0hs9h2wda";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-recoll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-recoll";
           sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
           name = "helm-recoll";
         };
@@ -25899,7 +26193,7 @@
           sha256 = "05mf0021jhr4zmysy28cgilkfxyp08qmkc20v9wlykksg73l2crk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rhythmbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rhythmbox";
           sha256 = "0pnm7yvas0q3b38ch5idm7v4ih2fjyfai8217j74xhkpcc2w4g4a";
           name = "helm-rhythmbox";
         };
@@ -25920,7 +26214,7 @@
           sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-robe";
           sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
           name = "helm-robe";
         };
@@ -25941,7 +26235,7 @@
           sha256 = "0s4hb1fvwr9za5gkz8s5w1kh9qjyygz6g59w7vmrg2d8ds2an03d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rubygems-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rubygems-local";
           sha256 = "18p18bly15a8xjc34k11jbvxlmr127sll0vh5ma2p787x6a3mc7c";
           name = "helm-rubygems-local";
         };
@@ -25962,7 +26256,7 @@
           sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rubygems-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rubygems-org";
           sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
           name = "helm-rubygems-org";
         };
@@ -25983,7 +26277,7 @@
           sha256 = "0qm5wlqklwf0y8grqhl2hfyfbkyj8200cdmbcf9cfr51lrh3cn8v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-safari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-safari";
           sha256 = "0lvwghcl5w67g0lc97r7hfvca7ss0mysy2mxj9axxbpyiq6fmh0y";
           name = "helm-safari";
         };
@@ -26004,7 +26298,7 @@
           sha256 = "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-sage";
           sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
           name = "helm-sage";
         };
@@ -26025,7 +26319,7 @@
           sha256 = "00wnqcgpf4hqdnqj5zrizr4s0pffb93xwya8k5c3rp4plncrcdzx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-sheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-sheet";
           sha256 = "0lx70l5gq43hckgdfna8s6wx287sw5ms9l1z3n6vg2x8nr9m61kc";
           name = "helm-sheet";
         };
@@ -26046,7 +26340,7 @@
           sha256 = "0sw7g1zcs1jfqcpprxwjq97lsk4qfngwamkj3q8jhm77zh7kfa3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-spaces";
           sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
           name = "helm-spaces";
         };
@@ -26067,7 +26361,7 @@
           sha256 = "133dcqk42nq5gh5qlcbcmx3lczisfgymcnypnld318jvjgd2ma8a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-spotify";
           sha256 = "1rzvxnaqh8bm78qp0rhpqs971pc855qrq589r3s8z3gpqzmwlnmf";
           name = "helm-spotify";
         };
@@ -26080,15 +26374,15 @@
     helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-swoop";
-        version = "20151022.1950";
+        version = "20160131.733";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
           repo = "helm-swoop";
-          rev = "d953ad605c989c40da5bc0fcb2953104ea7210e6";
-          sha256 = "1dixg0yik08ad9qwcfis9vkg1h7zwqsisfr1zlgzabpzzm822mmd";
+          rev = "002338d9685d82ef10aaf97d2e8084e61dfc94b4";
+          sha256 = "0n7fma8zp6shyz814mxfljj8x23gcwnkrbghkmfjp87cr1zkmw41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-swoop";
           sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
           name = "helm-swoop";
         };
@@ -26109,7 +26403,7 @@
           sha256 = "0a9h6rmjc6c6krkvxbgrzv35if260d9ma9a2k47jzm9psnyp9s2w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-themes";
           sha256 = "1j64w6dnxmq0rfycci9wfy2z5lbddsggf486pknxfgwwqgvns90l";
           name = "helm-themes";
         };
@@ -26130,7 +26424,7 @@
           sha256 = "1ypnsbx623gg3q07gxrbkn82jzy38sj4p52hj1wcb54qjqzyznkg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-unicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-unicode";
           sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4";
           name = "helm-unicode";
         };
@@ -26151,7 +26445,7 @@
           sha256 = "0xlz9rxx7y9pkrzvxmv42vgys5iwx75zv9g50k8ihwc08z80dhcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-w32-launcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-w32-launcher";
           sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
           name = "helm-w32-launcher";
         };
@@ -26172,7 +26466,7 @@
           sha256 = "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-w3m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-w3m";
           sha256 = "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz";
           name = "helm-w3m";
         };
@@ -26185,15 +26479,15 @@
     helm-wordnet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-wordnet";
-        version = "20150921.1633";
+        version = "20160128.907";
         src = fetchFromGitHub {
           owner = "raghavgautam";
           repo = "helm-wordnet";
-          rev = "71fe718cccdb172614b5e2e55192301a44f6d7d4";
-          sha256 = "0jaj513nnmbmlj8if84k5k0k7a6b24hzpzi0kbzj5vbr010cwnjd";
+          rev = "a36dbc6fcb570b812870bc1e190f203e0a0042fc";
+          sha256 = "03a5hzgqak8wg6i2h2p3fr9ij55lqarcsblml8qrnrj27ghcvzzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-wordnet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-wordnet";
           sha256 = "0di8gxsa9r8mzja4akhz0wpgrhlidqyn1s1ix5szplwxklwf2r2f";
           name = "helm-wordnet";
         };
@@ -26214,7 +26508,7 @@
           sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-words";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-words";
           sha256 = "0l9mb7g3xzasna1bw2p7vh2wdg1hmjkff40p8kpqvwwzszdm9v76";
           name = "helm-words";
         };
@@ -26235,7 +26529,7 @@
           sha256 = "1yqr5z5sw7schvaq9pmwg79anp806gikm28s6xvrayzyn4idz2n6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-xcdoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-xcdoc";
           sha256 = "1ikphlnj053i4g1l8r2pqaljvdqglj1yk0xx4vygnw98qyzdsx4v";
           name = "helm-xcdoc";
         };
@@ -26256,7 +26550,7 @@
           sha256 = "11fznbfcv4rac4h50mkax1g66wd2f91f5dw2v4jxjq2f5y4h4w0g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-zhihu-daily";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-zhihu-daily";
           sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
           name = "helm-zhihu-daily";
         };
@@ -26274,7 +26568,7 @@
           sha256 = "00x3ln7x4d6r422x845smf3h0x1z85l5jqyjkrllqcs7qijcrk5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/help-fns+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/help-fns+";
           sha256 = "10vz7w79k3barlcs3ph3pc7914xdhcygagdk2wj3bq0wmwxa1lia";
           name = "help-fns-plus";
         };
@@ -26292,7 +26586,7 @@
           sha256 = "0qmf81maq6yvs68b8vlbxwkjk72qldamq75znrma9mhvlv8igrgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/help-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/help-mode+";
           sha256 = "1pmb845bxa5kazjpdxm12rm2wcshmv2cmisigs3kyva1pmi1shra";
           name = "help-mode-plus";
         };
@@ -26310,7 +26604,7 @@
           sha256 = "1r7kf9plnsjx87bhflsdh47wybvhis7gb10izqa1p6w0aqsg178s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/help+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/help+";
           sha256 = "1jx0wa4md1mvdsvjyx2yvi4hhm5w061qqcafsrw4axsz7gjpd4yi";
           name = "help-plus";
         };
@@ -26331,7 +26625,7 @@
           sha256 = "178dvigiw162m01x7dm8pf61w2n3bq51lvk5q7jzpb9s35pz1697";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hemisu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hemisu-theme";
           sha256 = "0byzrz74yvk12m8dl47kkmkziwrrql193q72qx974zbqdj8h2sph";
           name = "hemisu-theme";
         };
@@ -26352,7 +26646,7 @@
           sha256 = "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/heroku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/heroku";
           sha256 = "1kadmxmqhc60cb5k14943rad1gbril2hlcnqxnsy4h3j2ykmcdyy";
           name = "heroku";
         };
@@ -26373,7 +26667,7 @@
           sha256 = "15hk0v6ck076mahsz4spq75jcnv587fx4d3w50c7bdh423fl0xvx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/heroku-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/heroku-theme";
           sha256 = "0mchh9y3pqwamry6105qrv1bp1qg1g0jmz7rzc5svz9giynypwf9";
           name = "heroku-theme";
         };
@@ -26391,7 +26685,7 @@
           sha256 = "0rqjidjxa5j6rjknklfks743lczbq3qsyiranrf2z3ghzi0gf7fd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hexrgb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hexrgb";
           sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06";
           name = "hexrgb";
         };
@@ -26412,7 +26706,7 @@
           sha256 = "06hm98aq87l91fhb2bqz8jw427k8fb280ygz5g44fy6sqc6js7v0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hgignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hgignore-mode";
           sha256 = "0ja71l3cghhn1c6w2pff80km8h8xgzf0j9gcldfyc72ar6ifhjkj";
           name = "hgignore-mode";
         };
@@ -26433,7 +26727,7 @@
           sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hi2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hi2";
           sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
           name = "hi2";
         };
@@ -26451,7 +26745,7 @@
           sha256 = "1l5jvgjgd0kzv1sn6h467fbnl487hma4h4pkwq4x1dhbc26yvfpz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hide-comnt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hide-comnt";
           sha256 = "181kns2rg4rc0pyyxw305qc06d10v025ad7v2m037y72vfwb0igx";
           name = "hide-comnt";
         };
@@ -26469,7 +26763,7 @@
           sha256 = "1q87yp1pr62cza3pqimqd09a39yyij4c7pncdww84zz7cii9qrn2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hide-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hide-lines";
           sha256 = "146sgvd88w20rqvd8y8kc76cb1nqk6dvqsz9rgl4rcrf0xfqvp7q";
           name = "hide-lines";
         };
@@ -26487,7 +26781,7 @@
           sha256 = "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hide-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hide-region";
           sha256 = "0nsc6m3yza658xsxvjz8766vkp71rcm6vwnvcv225r2pr94mq7vm";
           name = "hide-region";
         };
@@ -26508,7 +26802,7 @@
           sha256 = "1dr06b9njzih8z97k62l9w3x0a801x4bp043zvk7av9qkz8izl2r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hideshow-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hideshow-org";
           sha256 = "1bzx5ii06r64nra92zv1dvw5zv3im7la2dd3md801hxyfrpb74gc";
           name = "hideshow-org";
         };
@@ -26526,7 +26820,7 @@
           sha256 = "15ax1j3j7kylyc8a91ja825sp4mhbdgx0j4i5kqxwhvmwvpmyrv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hideshowvis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hideshowvis";
           sha256 = "1ajr71fch3v5g8brb83kwmlakcam5w21i3yr8df00c5j2pnc6v1f";
           name = "hideshowvis";
         };
@@ -26544,7 +26838,7 @@
           sha256 = "15s4463damlszd5wqi22a6w25i8l0m5rvqdg73k3yp01i65jc29z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight";
           sha256 = "0clv4mzy9kllcvc0cgsbx3a9anw68dc2c7vzwbrv13sw5gh9skc0";
           name = "highlight";
         };
@@ -26565,7 +26859,7 @@
           sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-blocks";
           sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
           name = "highlight-blocks";
         };
@@ -26583,7 +26877,7 @@
           sha256 = "18y6cw43mhizccvwfydv6g2kz8w7vff0n3k9sq5ghwq3rb3z14b2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-chars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-chars";
           sha256 = "19jawbjvqx1hsjbynx0jgpziap3r64k8s1xfckajrx8aq8m4c6i0";
           name = "highlight-chars";
         };
@@ -26601,7 +26895,7 @@
           sha256 = "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-cl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-cl";
           sha256 = "164h3c3rzriahb7v5hk2pw4i0gk2vk5ak722bai6x4zx4l1xp20w";
           name = "highlight-cl";
         };
@@ -26620,7 +26914,7 @@
           sha256 = "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-current-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-current-line";
           sha256 = "01bga6is3frzlzfajpvpgz224vhl0jnc2bl2ipvlygdcmv4h8973";
           name = "highlight-current-line";
         };
@@ -26641,7 +26935,7 @@
           sha256 = "1l10xnjyvcbv1v8xlldaca7z3fk5qav7nsbhfnjxxd0bgh5v9by2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-defined";
           sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
           name = "highlight-defined";
         };
@@ -26662,7 +26956,7 @@
           sha256 = "0rs8zyjz5mh26n8bdxn6fmyw2809nihz1vp7ih59dq11lx3mf9az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-escape-sequences";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-escape-sequences";
           sha256 = "0938b29cqapid9v9q4w2jwh8kdb0p70qwzy9xm2nxaairm7436d6";
           name = "highlight-escape-sequences";
         };
@@ -26683,7 +26977,7 @@
           sha256 = "10m1cr5plzsxbq08lck4c2w0whcdrnl9h2qm4bbr9srhnpry7fxj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-indent-guides";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-indent-guides";
           sha256 = "00ghp677qgb5clxhdjarfl8ab3mbp6v7yfsldm9bn0s14lyaq5pm";
           name = "highlight-indent-guides";
         };
@@ -26704,7 +26998,7 @@
           sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-indentation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-indentation";
           sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
           name = "highlight-indentation";
         };
@@ -26725,7 +27019,7 @@
           sha256 = "1vy6j63jp83ljdqkrqglpys74yfh7p61sd0lqiwczgr5nqyc60rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-leading-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-leading-spaces";
           sha256 = "0h2ww2vqmarghf4zg0wbwn0wgndmkcjy696mc885rwavck2dav4p";
           name = "highlight-leading-spaces";
         };
@@ -26746,7 +27040,7 @@
           sha256 = "0ffhc5s0h34064bix4qyiiyx30m4hpv0phmxwcrwiyvanj9ggfai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-numbers";
           sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
           name = "highlight-numbers";
         };
@@ -26767,7 +27061,7 @@
           sha256 = "0kzqx1y6rr4ryxi2md9087saad4g4bzysckmp8272k521d46xa1r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-parentheses";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-parentheses";
           sha256 = "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k";
           name = "highlight-parentheses";
         };
@@ -26784,11 +27078,11 @@
         src = fetchFromGitHub {
           owner = "Fanael";
           repo = "highlight-quoted";
-          rev = "ec9108486cf7f21f9a0b13f81369849b3b525f1f";
-          sha256 = "0vqkadhzszlxiqb4ysr7p86hhmi4z1j95llxa680xn6md8x2sj8a";
+          rev = "24103478158cd19fbcfb4339a3f1fa1f054f1469";
+          sha256 = "1gq8inxfni9zgz2brqm4nlswgr8b0spq15wr532xfrgr456g10ks";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-quoted";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-quoted";
           sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
           name = "highlight-quoted";
         };
@@ -26809,7 +27103,7 @@
           sha256 = "0gnr1dqkcmc9gfzqjaixh76g1kq7xp20mg1h6vl3c4na7nk6a3fg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-stages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-stages";
           sha256 = "0r4kmjmrpi38q3y0q9h5xkxh7x728ha2nbnc152lzw6zfsxnm4x4";
           name = "highlight-stages";
         };
@@ -26830,7 +27124,7 @@
           sha256 = "19cgyk0sh8nsmf3jbi92i8qsdx4l4yilfq5jj9zfdbj9p5gvwx96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-symbol";
           sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
           name = "highlight-symbol";
         };
@@ -26848,7 +27142,7 @@
           sha256 = "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-tail";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-tail";
           sha256 = "187kv3n262l38jdapi9bwcafz8fh61pdq2zliwiz7m7xdspp2iws";
           name = "highlight-tail";
         };
@@ -26869,7 +27163,7 @@
           sha256 = "01cx05dkrshcpddciiqvbfcc0zg0awbvg3r2n1v44kiixyfdpdwr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-thing";
           sha256 = "0rvdb1lx9xn9drqw0sw9ih759n10g7k0af39w6n8g0wfr67p96w1";
           name = "highlight-thing";
         };
@@ -26890,7 +27184,7 @@
           sha256 = "0hhc2l4pz6q8injpplv6b5l08l8q2lnjdpwabp7gwmhraq54rhjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-unique-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-unique-symbol";
           sha256 = "0lwl8pkmq0q4dvyflarggnn8vzpvk5hhcnk508r6xml2if1sg9zx";
           name = "highlight-unique-symbol";
         };
@@ -26911,7 +27205,7 @@
           sha256 = "06nnqry36ncqacfzd8yvc4q59bwk3vgf9a14rkpph2hk2rfvq2m6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight2clipboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight2clipboard";
           sha256 = "19r7abbpm31b0azf2v3xn0rjagg9h01i8g72qapp8dhqb4d9n9r0";
           name = "highlight2clipboard";
         };
@@ -26932,7 +27226,7 @@
           sha256 = "1phyaf6fwaxi2plq38m09cfb5ls401ay8jw0yf5rix8nyvm8nrn9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hindent";
           sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
           name = "hindent";
         };
@@ -26950,7 +27244,7 @@
           sha256 = "1jkjg7zxpc06plzlyvj1a8dcvj8ijqzhkxwlsd12cgkymvp411yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-exp-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-exp-ext";
           sha256 = "14py5hz523847f7bhw67v81x5cfhzz5la15mrqavc4z4yicy63iq";
           name = "hippie-exp-ext";
         };
@@ -26971,7 +27265,7 @@
           sha256 = "1l76r8hzhaapx76f6spm5jmjbrrm5zf79cpd5024xw3hpj1jbkjp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-expand-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-expand-slime";
           sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
           name = "hippie-expand-slime";
         };
@@ -26992,7 +27286,7 @@
           sha256 = "0b5wrid428s11afc48d6mdifmd31gmzyrj9zcpd3jwk63ydiihdc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-namespace";
           sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
           name = "hippie-namespace";
         };
@@ -27013,7 +27307,7 @@
           sha256 = "17dcpwx2y464g8qi3ixlsf3la8dn0bkxax296bhfg4vh73dxccl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hipster-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hipster-theme";
           sha256 = "1xrgpqlzp4lhh5h3sv7pg1nqzc9wcv1hs6ybv2h4x6jangicwfl2";
           name = "hipster-theme";
         };
@@ -27034,7 +27328,7 @@
           sha256 = "1dmrg39g0faqqkgrpcbybjbb91vcpkwawxsplckkj92y59zanq3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/history";
           sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
           name = "history";
         };
@@ -27055,7 +27349,7 @@
           sha256 = "1y275fchhx0n6dv038hsr44a3bjghqdhc8j1dcpm2rvs8chgm8g0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/historyf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/historyf";
           sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
           name = "historyf";
         };
@@ -27076,7 +27370,7 @@
           sha256 = "097lrj9lgfa7szww324hlqywwkbi31n1pxfqyg0zbfj45djkp9bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hive";
           sha256 = "1marz8gmk824hb0nkhaw48d4qw1xjk1aad27gviya7f5ilypxrya";
           name = "hive";
         };
@@ -27097,7 +27391,7 @@
           sha256 = "177blksgncxpxd1zi9kmbcfjnpd3ll1szjxiyc4am8a6hs1dyyqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hiwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hiwin";
           sha256 = "0klhxwxsz7xan2vsknw79r1dj4qhhjbfpddr67mk9qzccp8q0w8g";
           name = "hiwin";
         };
@@ -27118,7 +27412,7 @@
           sha256 = "0889dzrwizpkyh3wms13k8zx27ipsrsxfa4j4yzk4cwk3aicckcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-anything";
           sha256 = "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k";
           name = "hl-anything";
         };
@@ -27136,7 +27430,7 @@
           sha256 = "170sz6hjd85cw1x0y2g81ks3x3niib4f7y2xz6k8x0dpw357ggv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-defined";
           sha256 = "1y7vbhvpwxz70kja5hfm4i57mdd1cv43m4y9fr978y3nk265p8xx";
           name = "hl-defined";
         };
@@ -27157,7 +27451,7 @@
           sha256 = "17apqs7yqd89mv5283kmwp7byaaimj7j0vis0z1d89jlmp8i6zbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-indent";
           sha256 = "1z42kcwcyinjay65mv042ijh4xfaaiyri368g0sjw0fflsg0ikcr";
           name = "hl-indent";
         };
@@ -27175,7 +27469,7 @@
           sha256 = "1kxq79pfs83gp12p2g093m6shsf25q88mi29bvhapxx77ahmxpkn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-line+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-line+";
           sha256 = "13yv2nmx1wb80z4yifnh6d67rag17wirmp7z8ssq3havjl8lbpix";
           name = "hl-line-plus";
         };
@@ -27196,7 +27490,7 @@
           sha256 = "0pjfbm8p077frk475bx8xkygn8r4vdsvnx4rcqbjlpjawj0ndgxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-sentence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-sentence";
           sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
           name = "hl-sentence";
         };
@@ -27217,7 +27511,7 @@
           sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-sexp";
           sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
           name = "hl-sexp";
         };
@@ -27235,7 +27529,7 @@
           sha256 = "0m84d1rdsp9r5ip79jlrp69pf1daw0ch8c378q3kc328606i3p2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-spotlight";
           sha256 = "1166g27fp2pj4j3a8904pzvp5idlq4l22i0w6lbk5c9zh5pqyyf3";
           name = "hl-spotlight";
         };
@@ -27256,7 +27550,7 @@
           sha256 = "0lwcvwnkbfpjw92k4qfj57nlhv8xbl614p5dfi8qy76y8bs71cvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
           name = "hl-todo";
         };
@@ -27277,7 +27571,7 @@
           sha256 = "02mkfrs55d32948x739f94v35343gw6a0f7fknbcigbz56mzsvsp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hlint-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hlint-refactor";
           sha256 = "1311z6y7ycwx0mj67bya7a39j5hiypg72y6yg93dhgpk23wk7frq";
           name = "hlint-refactor";
         };
@@ -27298,7 +27592,7 @@
           sha256 = "0yw89kxvz53i9rbq3lsbp5xkgfl1986s23vyra5pipakfv85gmq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hlinum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hlinum";
           sha256 = "04b6m0njr7yrbcbpkhqz4hmqpfacmyca3lw75dyw3vpjpsj2g0iv";
           name = "hlinum";
         };
@@ -27318,7 +27612,7 @@
           sha256 = "bf4056192044808554a5dfd537512ec939cbcf628a9becd61736d6409f7e7ce8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hoa-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hoa-mode";
           sha256 = "06rfqn7sqvmgpvwhfmk17qqs4q0frfzhm597z3p1q7kys2035kiv";
           name = "hoa-mode";
         };
@@ -27339,7 +27633,7 @@
           sha256 = "0g2r4d0ivbadqw1k8jsv0jwv8krpfahsg0qmzyi909p2yfddqk1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hoa-pp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hoa-pp-mode";
           sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
           name = "hoa-pp-mode";
         };
@@ -27360,7 +27654,7 @@
           sha256 = "1sj8pz48cilk8l6zn47fv1wkv833wrkvrf2mrmbdkvj3lqjrz0b3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/homebrew-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/homebrew-mode";
           sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
           name = "homebrew-mode";
         };
@@ -27381,7 +27675,7 @@
           sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hookify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hookify";
           sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
           name = "hookify";
         };
@@ -27402,7 +27696,7 @@
           sha256 = "1gm5nczq5lsxqkfb38ajffg65zwxkfqvqhk33bwnnd00rpa1ix6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hound";
           sha256 = "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v";
           name = "hound";
         };
@@ -27423,7 +27717,7 @@
           sha256 = "0vygbdjy2dv7n50vrkcnqyswq48sgas0zzjfsac8x5g9vhxjkawj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/how-many-lines-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/how-many-lines-in-project";
           sha256 = "145zmfmsxcbmfh9s0mvxxgfh1d51q66396zc29k1c0hw94ffhkdd";
           name = "how-many-lines-in-project";
         };
@@ -27444,7 +27738,7 @@
           sha256 = "01sj9c8mxqaif8wh6zz9v2czjaq7vcdi66drldyjmifkln6rg2v8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/howdoi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/howdoi";
           sha256 = "12vgbypawxhhrnjp8dgh0wrcp7pvjccfaxw4yhq7msai7ik3h83b";
           name = "howdoi";
         };
@@ -27465,7 +27759,7 @@
           sha256 = "17x5w5kzam8cgaphyasnqzm2yhc0hwm38azvmin7ra4h912vlisd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ht";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ht";
           sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
           name = "ht";
         };
@@ -27478,15 +27772,15 @@
     html-check-frag = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "html-check-frag";
-        version = "20160116.214";
+        version = "20160130.2335";
         src = fetchFromGitHub {
           owner = "TobiasZawada";
           repo = "html-check-frag";
-          rev = "cc8b099154d5bde23af88f61adb05a80c03d08a8";
-          sha256 = "1nvvd81xsadqfa60h86c61800cn7a1nhp6hw8cyc8dh0bsx1pxx5";
+          rev = "feb89765eafd69dfcf07afeebded8985dc456e7c";
+          sha256 = "10lbxf56gvy26grzrhhx2p710fzs0h866jd2zmmgkisvyb0vaiay";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/html-check-frag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/html-check-frag";
           sha256 = "0drancb9ryifiln44b40l6cal0c7nyp597a6q26288s3v909yk2a";
           name = "html-check-frag";
         };
@@ -27507,7 +27801,7 @@
           sha256 = "0k9ga0qi6h33akip2vrpclfp4zljnbw5ax40lxyxc1813hwkdrmh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/html-script-src";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/html-script-src";
           sha256 = "1pin1x6g68y75pa3vz2i9h5pmhjamh5rd5ladb1z3flcavsls64j";
           name = "html-script-src";
         };
@@ -27528,7 +27822,7 @@
           sha256 = "09n3zm9ivln8ng80fv5vwwzh9mj355ni685axda3m85xfxgai8gi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/html-to-markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/html-to-markdown";
           sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
           name = "html-to-markdown";
         };
@@ -27547,7 +27841,7 @@
           sha256 = "8afaf87b30628afd8d376965247a6b2791129339ad7238c5529f4b173f908251";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/htmlize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/htmlize";
           sha256 = "15pym76iwqb1dqkbmkgc1yar450g2xinfl89fyss2ifyi4am1nxp";
           name = "htmlize";
         };
@@ -27557,22 +27851,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    http = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    http = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "http";
-        version = "20150716.959";
+        version = "20160126.2225";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "http.el";
-          rev = "3984230ea8b413bc634fb72d097c7f3b8c92b988";
-          sha256 = "0k9ksbpcdx5asjcvnivm8hpkm55qjz348gb8ihx5q5448h89ksrz";
+          rev = "d563751d46e30ed5b5eda6d87ab2793b9b206c66";
+          sha256 = "1i0r677zwnl5xl64cqk47y0gfd87vw49nf6ry5v2imbc95ni56wc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/http";
           sha256 = "1176jhm8m7s1pzp0zv1sqawcgn4m5zvxghypmsrjyyb5p7m6dalm";
           name = "http";
         };
-        packageRequires = [ cl-lib emacs request ];
+        packageRequires = [ emacs request ];
         meta = {
           homepage = "http://melpa.org/#/http";
           license = lib.licenses.free;
@@ -27586,7 +27880,7 @@
           sha256 = "1wp2rwc1hgd5c3yr6b96yzzakd1qmy5d95mhc6q4f6lx279nx0my";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/http-post-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/http-post-simple";
           sha256 = "1b2fh0hp5z3712ncgc5ns1f3sww84khkq7zb3k9xclsp1p12a4cf";
           name = "http-post-simple";
         };
@@ -27607,7 +27901,7 @@
           sha256 = "008iq5fhsw4qklw2l457a1cfqq8diadpnf1c1di5p07sc0za5562";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/http-twiddle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/http-twiddle";
           sha256 = "153qavpcwvk2g15w5a814xjsnsv54xksx4iz6yjffvvzq14a08ry";
           name = "http-twiddle";
         };
@@ -27628,7 +27922,7 @@
           sha256 = "02jz8qwxl69zhwvpmlqc15znr8x4f30paqszmm7xrrrz5x1c1rn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/httpcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/httpcode";
           sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
           name = "httpcode";
         };
@@ -27649,7 +27943,7 @@
           sha256 = "0wd4wmy99mx677x4sdbp57bxxll1fsnnf8hk97r85xdmmjsmrkld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/httprepl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/httprepl";
           sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
           name = "httprepl";
         };
@@ -27670,7 +27964,7 @@
           sha256 = "1vy521ljn16a1lcmpj09mr9y0m15lfjhl6xk04sb7nisps3vljyl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hungry-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hungry-delete";
           sha256 = "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz";
           name = "hungry-delete";
         };
@@ -27691,7 +27985,7 @@
           sha256 = "16z43mpj839bzafhyzpcbw6bmv4ckrf9ryslvg6z6q4g93k64q2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hy-mode";
           sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m";
           name = "hy-mode";
         };
@@ -27712,7 +28006,7 @@
           sha256 = "0d3kdpwzr1gs0q986pkj8b9av9knzbh1ax9ybhn0k66hi55hn7bc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hyai";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hyai";
           sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
           name = "hyai";
         };
@@ -27725,15 +28019,15 @@
     hydandata-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydandata-light-theme";
-        version = "20160113.1617";
+        version = "20160122.1953";
         src = fetchFromGitHub {
           owner = "hydandata";
           repo = "hydandata-light-theme";
-          rev = "e78f4e106d22ac8ed269d3481eebdc1668ea492f";
-          sha256 = "1wd3fd9mqzg9420p2l7k2j433kb5yjin6hq0ajyy5q5w4a63s64l";
+          rev = "3b9bb5f213029a8331818b1d670194ef26d9505a";
+          sha256 = "11vgz64f8vs8vqp4scj9qvrfdshag7bs615ly9zvzzlk68jivdya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hydandata-light-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hydandata-light-theme";
           sha256 = "0jw43m91m10ifqg335y6d52r6ri77hcmxkird8wsyrpsnk3cfb60";
           name = "hydandata-light-theme";
         };
@@ -27754,7 +28048,7 @@
           sha256 = "14gxbza26ccah8jl0fm7ksvaag0mv3c348bgqjy88dqq2qlwcrav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hyde";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hyde";
           sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
           name = "hyde";
         };
@@ -27767,15 +28061,15 @@
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "20151214.617";
+        version = "20160126.257";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "7f022f7f1a7833618c1bf4d38a4854d2bae06199";
-          sha256 = "0dp1ablyih2m3q5224xnkwxqm8pgblkdfcwls81r0qsaav7ag3fj";
+          rev = "04cd3e4270ff5d0d51e783c86e87314054f1a018";
+          sha256 = "13ghz8mvnqn59m9alwcrxlml1k4cbw4a9wwwgf211ap4q618qjqs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hydra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hydra";
           sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
           name = "hydra";
         };
@@ -27796,7 +28090,7 @@
           sha256 = "17k41rah17l9kf7bvlm83x71nzz4aizgn7254cl5sb59mdhcm8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/i2b2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/i2b2-mode";
           sha256 = "172qnprmfliic3rszzg3g7q015i3dchd23skrbdikg0kxj5c57lf";
           name = "i2b2-mode";
         };
@@ -27817,7 +28111,7 @@
           sha256 = "1gl21li9vqfjvls4ffjw8a4bicas2c7hmaa621k3hpllgpy6qdg5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iasm-mode";
           sha256 = "09xh41ayaha07fi5crk3c6pn17gwm3samsf6h71ldkywvz74kipv";
           name = "iasm-mode";
         };
@@ -27838,7 +28132,7 @@
           sha256 = "1s5qvlf310b0z7q9k1xhcf4qmyfqd37jpqd67ciahaxk7cp224rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-git";
           sha256 = "048888y07bzmi9x5i43fg6bgqbzdqi3nfjfnn6zr29jvlx366r5z";
           name = "ibuffer-git";
         };
@@ -27859,7 +28153,7 @@
           sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-projectile";
           sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
           name = "ibuffer-projectile";
         };
@@ -27880,7 +28174,7 @@
           sha256 = "15lapyj7qkkw1i1g1aizappm7gxkfnxhvd4fq66lghkzb76clz2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-rcirc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-rcirc";
           sha256 = "1y6pyc6g8j42hs103yynjsdkkxvcq0q4xsz4r93rqwsr3za3wcmc";
           name = "ibuffer-rcirc";
         };
@@ -27901,7 +28195,7 @@
           sha256 = "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-tramp";
           sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32";
           name = "ibuffer-tramp";
         };
@@ -27922,7 +28216,7 @@
           sha256 = "0fwxhkx5rkyv3w5vs2swhmly9siahlww2ipsmk7v8xmvk4a63bhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-vc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-vc";
           sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
           name = "ibuffer-vc";
         };
@@ -27934,13 +28228,13 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20151231.1715";
+        version = "20160131.1203";
         src = fetchurl {
           url = "http://www.emacswiki.org/emacs/download/icicles.el";
           sha256 = "16fsxw7w0l4dxgdi71q2izcki9ykqbjxaffsjh4k0zl7nxyyvv6q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/icicles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/icicles";
           sha256 = "15h2511gm38q14avsd86j5mnxhsjvcdmwbnhj66ashj5p5nxhr92";
           name = "icicles";
         };
@@ -27958,7 +28252,7 @@
           sha256 = "0z7v4pj0m6pwrjzyzz2xmwf6a53kmka9hxlzd1dxcpzx47pyvz3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/icomplete+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/icomplete+";
           sha256 = "0gxqkj4bjrxb046qisfz22wvanxx6bzl4hfv91rfwm78q3484slx";
           name = "icomplete-plus";
         };
@@ -27979,7 +28273,7 @@
           sha256 = "0bzbp0vgnzvd1m3lhbcrxmknpi0cjisff6jd49f1nvkdx3p2ks40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/id-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/id-manager";
           sha256 = "13g5fi06hvx0x2wn1d1d8rkfq5n6wbk9g5bhx2b5sar2yw0akmwm";
           name = "id-manager";
         };
@@ -27992,15 +28286,15 @@
     idea-darkula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "idea-darkula-theme";
-        version = "20160104.1557";
+        version = "20160121.1540";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "idea-darkula-theme";
-          rev = "37854cee8f8714d5d388681158df5771664e6043";
-          sha256 = "0yvrb5a0ajnbvdzzqhhmswm6irlr3xjimpddfyjgdkl5l7d7iln5";
+          rev = "45c077eaa32e5784cb15b66d3b40c76ef642b2d6";
+          sha256 = "08wr379dslh3sjg81p20vpqj218wgw0cf3lxn3n4cbzsy0hifh81";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idea-darkula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idea-darkula-theme";
           sha256 = "0lanhwlhd7pbzjc047vd5sgsmi2bx66gr3inr8y57swgrfw3l8sk";
           name = "idea-darkula-theme";
         };
@@ -28021,7 +28315,7 @@
           sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/identica-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/identica-mode";
           sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
           name = "identica-mode";
         };
@@ -28042,7 +28336,7 @@
           sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idle-highlight-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idle-highlight-mode";
           sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
           name = "idle-highlight-mode";
         };
@@ -28063,7 +28357,7 @@
           sha256 = "0f8rxvc3dk2hi4x524l18fx73xrxy0qqwbybdma4ca67ck9n6xam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idle-require";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idle-require";
           sha256 = "1lr330bqj4rfh2jgn3562sliani4yw5y4j2hr6cq9cfjjp18qgsj";
           name = "idle-require";
         };
@@ -28084,7 +28378,7 @@
           sha256 = "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-at-point";
           sha256 = "0jpgq2iiwgqifwdhwhqv0cd3lp846pdqar6rxqgw9fvvb8bijqm0";
           name = "ido-at-point";
         };
@@ -28105,7 +28399,7 @@
           sha256 = "14nmldahr0pj2x4vkzpnpx0bsxafmiihgjylk5j5linqvy8q6wk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-clever-match";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-clever-match";
           sha256 = "081i6cjvqyfpgj0nvzc94zrl2v3l6nv6mhfda4zf7c8qqbvx1m8m";
           name = "ido-clever-match";
         };
@@ -28126,7 +28420,7 @@
           sha256 = "1aih8n10lcrw0bdgvlrkxzhkpxpmphw07cvbp6zd27ia25037fzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-complete-space-or-hyphen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-complete-space-or-hyphen";
           sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
           name = "ido-complete-space-or-hyphen";
         };
@@ -28147,7 +28441,7 @@
           sha256 = "0aqx69pvpz4bdhzg3awjpd7xn3h34pygip75dqjwpd6jp350g8r0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-completing-read+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-completing-read+";
           sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
           name = "ido-completing-read-plus";
         };
@@ -28164,11 +28458,11 @@
         src = fetchFromGitHub {
           owner = "danil";
           repo = "ido-describe-bindings";
-          rev = "5b2e1c8d685b4d022c8f56f45053a9f2229960ef";
-          sha256 = "1pp8djlyvaly55jshwwzx06mgb78hhaqm0mxbjasc3bg2x3d4y9n";
+          rev = "1f5c78bf56f2cab137a323ec426e906f2215bf7f";
+          sha256 = "0055dda1la7yah33xsi19j4hcdmqp17ily2dvkipm4y6d3ww8yqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-describe-bindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-describe-bindings";
           sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
           name = "ido-describe-bindings";
         };
@@ -28189,7 +28483,7 @@
           sha256 = "1s93q47cadanynvm1y4y08s68yq0l8q8vfasdk7w39vrjsxxsj3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-exit-target";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-exit-target";
           sha256 = "17vmg47xwk6yjlbcsswirl8s2q565k291ajzjglnz7qg2fwx6spi";
           name = "ido-exit-target";
         };
@@ -28210,7 +28504,7 @@
           sha256 = "0ifdwd5vnjv2iyb5bnz8pij35lc0ymmyx8j8zhpkbgjigz8f05ip";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-gnus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-gnus";
           sha256 = "14ijb8q4s846984h102h72ij713v5bj3k2vfdvr94gw1f0iya2yg";
           name = "ido-gnus";
         };
@@ -28223,15 +28517,15 @@
     ido-grid-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-grid-mode";
-        version = "20151127.1135";
+        version = "20160122.539";
         src = fetchFromGitHub {
           owner = "larkery";
           repo = "ido-grid-mode.el";
-          rev = "34a7412c30840c1131464781dddfb1602355766b";
-          sha256 = "051rzjxk73h8apkmn4w39bl0pz1c9gna4w3lq7j3a6fiplb0jn23";
+          rev = "7cfca3988a6dc3ad18e28abe114218095ff2366f";
+          sha256 = "1ip8g0r0aimhc4a1f06m711zmbs0krxn8hmayk99gk5kkz12igkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-grid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-grid-mode";
           sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
           name = "ido-grid-mode";
         };
@@ -28252,7 +28546,7 @@
           sha256 = "01p4az128k1jvd9i1gshgg87z6048cw9cnm57l8qdlw01c3h6dkx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-hacks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-hacks";
           sha256 = "05f9pdkqppnp7wafka2d2yj84gqchjd7vnrl5rcywy1l47gbxiw0";
           name = "ido-hacks";
         };
@@ -28273,7 +28567,7 @@
           sha256 = "0l69sr3g1n2x61j6sv6hnbiyk8a2qra6y2kh413qp0sfpx4fzchv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-load-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-load-library";
           sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
           name = "ido-load-library";
         };
@@ -28294,7 +28588,7 @@
           sha256 = "15iajhrgy989pn91ijcd1mq2015bkaacaplm79rmb0ggxhh8vq38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-migemo";
           sha256 = "02hbwchwx2bcwdxz7gz555699l7n9wisfikax1j6idn167n4wdpi";
           name = "ido-migemo";
         };
@@ -28315,7 +28609,7 @@
           sha256 = "0zlkq29wxd3a4vg0w6ds2jad5h1pja7ccd3l6ppl0kz1b1517qlr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-occasional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-occasional";
           sha256 = "1vdh5i9qznzd9r148a6jw9v47swf7ykwyciqfzc3ismv5q909bl2";
           name = "ido-occasional";
         };
@@ -28332,11 +28626,11 @@
         src = fetchFromGitHub {
           owner = "danil";
           repo = "ido-occur";
-          rev = "247ee110dc085f9f5577aa02241c3ad66164b455";
-          sha256 = "1qvx1v5xrfv1id6lfn767b667m2hn4rsw2nmb61j1i81csdiqjds";
+          rev = "7d2e42bf239cacb90e6240b8014e6b20b24e89cf";
+          sha256 = "0j12li001yq08vzwh1b25qyq09llizrkgaay9k07g9pvfxlx6zb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-occur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-occur";
           sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
           name = "ido-occur";
         };
@@ -28357,7 +28651,7 @@
           sha256 = "0qvf3h2ljlbf3z36dhywzza62mfi6mqbrfc0sqfsbyia9bn1df4f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-select-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-select-window";
           sha256 = "03xqfpnagy2sk67yq7n7s6ma3im37d558zzx8sdzd9pbfxy9ij23";
           name = "ido-select-window";
         };
@@ -28378,7 +28672,7 @@
           sha256 = "149cznbybwj0gkjyvpnh4kn258kxw449m7cn95n9jbh1r45vljvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-skk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-skk";
           sha256 = "1fyzjkw9xp126bzfv1254bvyakh323iw3wdzrkd9gb4ir39k5jzw";
           name = "ido-skk";
         };
@@ -28399,7 +28693,7 @@
           sha256 = "0w3cr2yf8644i0g8w6r147vi9wanibn41sg7dzws51yb9q0y92vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-sort-mtime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-sort-mtime";
           sha256 = "1dkny9y3x49dv1vjwz78x2qhb6kdq3fa8qh1xkm30jyapvgiwdg2";
           name = "ido-sort-mtime";
         };
@@ -28420,7 +28714,7 @@
           sha256 = "14py5amh66jzhqyqjz5pxq0g19vzlmqnrr5wij1ix64xwfr3xdy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-springboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-springboard";
           sha256 = "04jqnag8jiyfbwvc3vd9ikrsmf6cajld7dz2gz9y0zkj1k4gs7zv";
           name = "ido-springboard";
         };
@@ -28441,7 +28735,7 @@
           sha256 = "0aqx69pvpz4bdhzg3awjpd7xn3h34pygip75dqjwpd6jp350g8r0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-ubiquitous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-ubiquitous";
           sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
           name = "ido-ubiquitous";
         };
@@ -28462,7 +28756,7 @@
           sha256 = "1vl87phswkciijq0j07lqlgmha5dmff8yd4j4jn7cfrkrdjp6jbx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-vertical-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-vertical-mode";
           sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
           name = "ido-vertical-mode";
         };
@@ -28483,7 +28777,7 @@
           sha256 = "0zqjmi1pbvpby84g1nsrmwcv7w5k0nl3hmkqj0fvhdsmayxqc6j8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-yes-or-no";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-yes-or-no";
           sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
           name = "ido-yes-or-no";
         };
@@ -28504,7 +28798,7 @@
           sha256 = "1vx2g1xgxpcabr49mkl6ggzrpa3k2zhm479j6262vb64swzx33jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idomenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idomenu";
           sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
           name = "idomenu";
         };
@@ -28525,7 +28819,7 @@
           sha256 = "16gk7ry4yiaxk9dp6s2m4g79klw344yvr86d7hr0qdjkkf229m56";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idris-mode";
           sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
           name = "idris-mode";
         };
@@ -28546,7 +28840,7 @@
           sha256 = "1k7h1795kaczmhd21hzqgns7blqc6zjh2xg4w3rj986ll8lb9fpr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ids-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ids-edit";
           sha256 = "0jzmcynr6lvsr36nblqzrjwxawyqcdz972zsv4rqkihdydpqfz7m";
           name = "ids-edit";
         };
@@ -28567,7 +28861,7 @@
           sha256 = "1n2yz6jzbminrviadhd3h42fwvfrdy0v2nw7sk5plkzc8zrs3x25";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iedit";
           sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
           name = "iedit";
         };
@@ -28588,7 +28882,7 @@
           sha256 = "0b86x675g95yrlc0alffx0z9fmficlwv3gpy5cy86z1xvvyh3nzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ietf-docs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ietf-docs";
           sha256 = "0wnk36z9g7lksmynd04hb2m6rx45wpxnxj1lhrlpjnzsrknhf4k3";
           name = "ietf-docs";
         };
@@ -28609,7 +28903,7 @@
           sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iflipb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iflipb";
           sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
           name = "iflipb";
         };
@@ -28630,7 +28924,7 @@
           sha256 = "161algqrrjbc1ja08416q5wzz34rrg6shr2sim7vba0j3svyggnf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ignoramus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ignoramus";
           sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
           name = "ignoramus";
         };
@@ -28648,7 +28942,7 @@
           sha256 = "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/igrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/igrep";
           sha256 = "1vyhrziy29q6w8w9vvanb7d29r1n7nfkznbcd62il991n48d08i3";
           name = "igrep";
         };
@@ -28667,7 +28961,7 @@
           sha256 = "cefc95ead9e5d425d3763f8d63afa10dea416493cafd7144f4d3cdeee0d0fa86";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/igv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/igv";
           sha256 = "01igm3cb0lncmcyy72mjf93byh42k2hvscqhg8r7iljbxm58460z";
           name = "igv";
         };
@@ -28680,15 +28974,15 @@
     image-archive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "image-archive";
-        version = "20150219.18";
+        version = "20150620.2032";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-image-archive";
-          rev = "ff33f64d09432a8f5bf1714d4cf750c01626fe98";
-          sha256 = "0hacg0549vpgx7yyyc748i44zw5y825w1v7nb440wx7sdxp855nb";
+          rev = "8d29535bd832329ffeeac780aae7aa8919af1175";
+          sha256 = "068z3ygq9p139ikm04xqhhqhc994an5isba5c7kpqs009y09xw3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image-archive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image-archive";
           sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
           name = "image-archive";
         };
@@ -28709,7 +29003,7 @@
           sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image-dired+";
           sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
           name = "image-dired-plus";
         };
@@ -28730,7 +29024,7 @@
           sha256 = "0v66wk9nh0raih4jhrzmmyi5lbysjnmbv791vm2230ffi2hmwxnd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image+";
           sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
           name = "image-plus";
         };
@@ -28751,7 +29045,7 @@
           sha256 = "0f3xdqhq9nprvl8bnmgrx20h08ddkfak0is29bsqwckkfgn7pmqp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imakado";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imakado";
           sha256 = "18mj0vpv3dybfpa8hl9jwlagsivbhgqgz8lwb8cswsq9hwv3jgd3";
           name = "imakado";
         };
@@ -28764,15 +29058,15 @@
     imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-anywhere";
-        version = "20151030.1327";
+        version = "20160131.412";
         src = fetchFromGitHub {
           owner = "vitoshka";
           repo = "imenu-anywhere";
-          rev = "b486c1e80c667504b243a84351cc8751710248e9";
-          sha256 = "1mi45vb3f2ka9xgz5gbgq77nirl4dnrjxkar3d5m3xvax0bicv6i";
+          rev = "15e080254b4a55e5613493583c9624feb3ef9b5d";
+          sha256 = "15vh09d91l6r8zlyps1mg7i0pygdzqi8w01grk1ka25ak7378c2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu-anywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu-anywhere";
           sha256 = "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8";
           name = "imenu-anywhere";
         };
@@ -28785,15 +29079,15 @@
     imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-list";
-        version = "20150911.446";
+        version = "20160203.807";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "imenu-list";
-          rev = "0c725825ad13fca6b1eea2d28c42ffb172fa6de9";
-          sha256 = "0hlrhnv0n9i1jl20k6hly4py9d98vpqdb9wgzx8573srxqpv541k";
+          rev = "ee4f38dc9d590808d627789102afe4b12c20f5e6";
+          sha256 = "0ay008mivxyn23bncnc8qbs91w26i0ym7c57nd5z16kwg1gnh4a7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu-list";
           sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
           name = "imenu-list";
         };
@@ -28811,7 +29105,7 @@
           sha256 = "00w88d37mg2hdrzpw5cxrgqz5jbf7rylmir95hs8j1cm8fk787bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu+";
           sha256 = "1v2h3xs5pnv7z5qphkn2y5pa1p8pivrknkw7xihm5yr4a4dqjv5d";
           name = "imenu-plus";
         };
@@ -28832,7 +29126,7 @@
           sha256 = "0wi346m05b18i14xxih4qvwdrfcgv30gdvxjjcn6vd7gr0wdk2ns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenus";
           sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
           name = "imenus";
         };
@@ -28853,7 +29147,7 @@
           sha256 = "1q53r3f3x0hpzryxd1v1w3qgs54p384q0azi7xj2gppi1q49sa42";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imgix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imgix";
           sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
           name = "imgix";
         };
@@ -28874,7 +29168,7 @@
           sha256 = "0nzgfj083im8lc62ifgsh1pmbw0j9wivimjgih7k6ny3jgw834rs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imgur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imgur";
           sha256 = "0hr2zz7nq65jig2036g5sa8q2lhb42jv40ijikcz8s4f5v3y14i7";
           name = "imgur";
         };
@@ -28895,7 +29189,7 @@
           sha256 = "0rbamm9qvipgswxng8g1d7rbdbcj7sgwrccg7imcfapwwq7xhj4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/immutant-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/immutant-server";
           sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
           name = "immutant-server";
         };
@@ -28916,7 +29210,7 @@
           sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/impatient-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/impatient-mode";
           sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg";
           name = "impatient-mode";
         };
@@ -28933,11 +29227,11 @@
         src = fetchFromGitHub {
           owner = "trotzig";
           repo = "import-js";
-          rev = "e56623506bde5767161d048b63b897a22fd12d41";
-          sha256 = "0psa9jg0m7dkq2v4ybsbqhpbzvq6zvyc59f3rhycqwfpw2an4n64";
+          rev = "00d5178c247fabe1574a5239f2b134942cfadbd6";
+          sha256 = "1d79vvrxi0mxgr6wm3cjbqkgryh74jcjc1fkxpln8wyhjcddphzf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/import-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/import-js";
           sha256 = "1grvzy378qj14wlbmhb3j7fx2zkl9wp65b5g0brjimav08nz7bls";
           name = "import-js";
         };
@@ -28958,7 +29252,7 @@
           sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/import-popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/import-popwin";
           sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
           name = "import-popwin";
         };
@@ -28979,7 +29273,7 @@
           sha256 = "1p54w9dwkc76nvc4m0q9a0lh4bdxp4ad1wzscadayqy8qbrylf97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/indent-guide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/indent-guide";
           sha256 = "029fj9rr9vfmkysi6lzpwra92j6ppw675qpj3sinfq7fqqlicvp7";
           name = "indent-guide";
         };
@@ -29000,7 +29294,7 @@
           sha256 = "1zsw68zzvjjh93cldc0w83k67hzcgi226vz3d0nzqc9sczqk8civ";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/indicators";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/indicators";
           sha256 = "1rhmz8sfi2gnv72sbw6kgyzidk43mnp05wnscw9vjvz9v0vwirss";
           name = "indicators";
         };
@@ -29021,7 +29315,7 @@
           sha256 = "0kv0aj444i2rzksvcfz8sw0yyig3ca3m05agnhw9jzr01y05yl1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/indy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/indy";
           sha256 = "118n3n07h1vx576fdv6v5a94aa004q0gmy9hlsnrswpxa30ahnw7";
           name = "indy";
         };
@@ -29034,15 +29328,15 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20160117.1257";
+        version = "20160201.1147";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "aa93684c0d88cb72b106ae1cea000f501044d564";
-          sha256 = "18fsd02fw74dgyc7dv6rn51nczwhpr3784hpqp64sz4w5fjvn8d6";
+          rev = "a246bf3f6d286f7bcbc6dbc091e7c67876a3e8e8";
+          sha256 = "18sg9lq6wxjk9jiyid9l67b5y4hwrljz1gh3w59rdy59f2fcmnav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-clojure";
           sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
           name = "inf-clojure";
         };
@@ -29063,7 +29357,7 @@
           sha256 = "14kf3zvms1w8cbixhpgw3m2xxc2r87i57gmx00jwh89282i6kgsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-mongo";
           sha256 = "09hf3jmacsk4hl0rxk35cza8vjl0xfmv19dagb8h8fli97fb65hh";
           name = "inf-mongo";
         };
@@ -29084,7 +29378,7 @@
           sha256 = "1z5ns94xgj2dkv2sc2ckax6bzwdxsm19pkvni24ys2w7d5nhajzr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-php";
           sha256 = "011sc6f0ka7mmik8z0df8qk24mf6ygq22jy781f2ikhjh94gy83d";
           name = "inf-php";
         };
@@ -29105,7 +29399,7 @@
           sha256 = "0rg7md4b8chqfh565l9dhsjyiiqrbhm2xcaf88h2zian2rp0p1wh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-ruby";
           sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
           name = "inf-ruby";
         };
@@ -29126,7 +29420,7 @@
           sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inflections";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
           name = "inflections";
         };
@@ -29144,7 +29438,7 @@
           sha256 = "068y1p44ynimxfrqgrrhrj4gldf661dr0kbc9p7dqm1mw928hxmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/info+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/info+";
           sha256 = "0flpmi8dsaalg14xd86xcr087j51899sm8ghsa150ag4g4acfggr";
           name = "info-plus";
         };
@@ -29164,7 +29458,7 @@
           sha256 = "3c00805529518edba788671fed0c3e56810d1dbec2a0dbd3cb42f42991326ca6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inform7-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inform7-mode";
           sha256 = "1kbyl69vwhp1wdivr3ijmj7mghdnjaw7adk8az7bwyzjvpq73171";
           name = "inform7-mode";
         };
@@ -29185,7 +29479,7 @@
           sha256 = "1zykh80k2sy0as1rn7qaa2hyvkagcvzzmxik4jpb0apw0ha1bf6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/init-loader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/init-loader";
           sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
           name = "init-loader";
         };
@@ -29206,7 +29500,7 @@
           sha256 = "0xk7lyhd9pgahbscqwa2qkh2vgnbs5yz78am3zh930k4ig9lbmjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/init-open-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/init-open-recentf";
           sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
           name = "init-open-recentf";
         };
@@ -29227,7 +29521,7 @@
           sha256 = "1qvkxpxdv0n9qlzigvi25iw485824pgbpb10lwhh8bs2074dvrgq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/initsplit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/initsplit";
           sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
           name = "initsplit";
         };
@@ -29248,7 +29542,7 @@
           sha256 = "063v3a783si5fi8jrnysss60qma1c3whvyb48i10qbrrrx750cmv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inkpot-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inkpot-theme";
           sha256 = "0w4q74w769n88zb2q7x326cxji42278lf95wnpslgjybnaxycgw7";
           name = "inkpot-theme";
         };
@@ -29269,7 +29563,7 @@
           sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inline-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inline-crypt";
           sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
           name = "inline-crypt";
         };
@@ -29290,7 +29584,7 @@
           sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inlineR";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inlineR";
           sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
           name = "inlineR";
         };
@@ -29311,7 +29605,7 @@
           sha256 = "1np3ih2bz9831p97rx5bssq78grjxj7f9241z372l6ggimrqhkbx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/insert-shebang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/insert-shebang";
           sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
           name = "insert-shebang";
         };
@@ -29332,7 +29626,7 @@
           sha256 = "112s3c0ii8zjc6vlj2im2qd2pl3hb95pq4zibm86gjpw428wd8iy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/insfactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/insfactor";
           sha256 = "0c6q1d864qc78sqk9iadjpd01xc7myipgnf89pqa2z75yprndvyn";
           name = "insfactor";
         };
@@ -29352,7 +29646,7 @@
           sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/instapaper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/instapaper";
           sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
           name = "instapaper";
         };
@@ -29373,7 +29667,7 @@
           sha256 = "0jdm4xjzpl5dr5s8n2hhd5md6hfl6m6v10nwd1n54pb7bv98aqsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interaction-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interaction-log";
           sha256 = "1r9qbvgssc2zdwgwmmwv5kapvmg1y3px7268gkiakkfanw3kqk6j";
           name = "interaction-log";
         };
@@ -29394,7 +29688,7 @@
           sha256 = "13bsszx4rsq3awg6zgzfdwgflkldw38nihkc9nldfixzvw1gdqqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interleave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interleave";
           sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
           name = "interleave";
         };
@@ -29415,7 +29709,7 @@
           sha256 = "1zv6m24ryls9hvla3hf8wzp6r7fzbxa1lzr1mb0wz0s292l38wjz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interval-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interval-list";
           sha256 = "0926z3lxkmpxalpq7hj355cjzbgpdiw7z4s8xdrpa1pi818d35zf";
           name = "interval-list";
         };
@@ -29436,7 +29730,7 @@
           sha256 = "0fqnn9xhrc9hkaiziafjgg288l6m05416z9kz8l5845fnqsb7pb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interval-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interval-tree";
           sha256 = "13zynac3h50x68f1ja72kqdrapjks2zmgqd4g7qwscq92mmh60i9";
           name = "interval-tree";
         };
@@ -29457,7 +29751,7 @@
           sha256 = "10xpxmbzhmi0lmby2rpmxrbr3qf1vlbif2inmfsvkj85wyh8a7rp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/io-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/io-mode";
           sha256 = "1fpiml7lvbl4s2xw4wk2y10iifvfza24kd9j8qvi1bgd85qkx42q";
           name = "io-mode";
         };
@@ -29478,7 +29772,7 @@
           sha256 = "1ard88kc13c57y9zdkyr012w8rdrwahz8a3fb5v6hwqymg16m20s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/io-mode-inf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/io-mode-inf";
           sha256 = "0hwhvf1qwkmzzlzdda1flw6p1jjh9rzxsfwm2sc4795ac2xm6dhc";
           name = "io-mode-inf";
         };
@@ -29499,7 +29793,7 @@
           sha256 = "1rz5wf19lg1lnm0h73ynhb0vl3c99k7vpipay2f8jls24pv60bra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ioccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ioccur";
           sha256 = "1a9iy6x4lkm4wgkcb0pv86c2kvpq8ymrc4ssp109r67kwqw7lrr6";
           name = "ioccur";
         };
@@ -29520,7 +29814,7 @@
           sha256 = "14zfxa8fc7h4rkz1hyplwf4q2lga3l5dd7a2xq5kk0kvf2fs4mk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iodine-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iodine-theme";
           sha256 = "05mnq0bgcla0pxsgywpvcdgd4sk2xr7bjlp87l0dx8j121vqripj";
           name = "iodine-theme";
         };
@@ -29541,7 +29835,7 @@
           sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iplayer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iplayer";
           sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
           name = "iplayer";
         };
@@ -29562,7 +29856,7 @@
           sha256 = "0skyd9c7pz68v17aj3h47ralszbmc4gqg552q8jpimcjd1lacc7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ipretty";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ipretty";
           sha256 = "1zysip6cb8s4nzsxiwk052gq6higz2xnd376r9wxmgj7w8him2c4";
           name = "ipretty";
         };
@@ -29583,7 +29877,7 @@
           sha256 = "1cy9xwhswj9vahg8zr16r2crm2mm3vczqs73gc580iidasb1q1i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ir-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ir-black-theme";
           sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
           name = "ir-black-theme";
         };
@@ -29604,7 +29898,7 @@
           sha256 = "1ch610b3d0x3nxglp749305syliivamc108rgv9if4ihb67gp8b5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iregister";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iregister";
           sha256 = "0iq1nlj5czi4nblrszfv3grkl1fni7blh8bhcfccidms8v9r3mdm";
           name = "iregister";
         };
@@ -29622,7 +29916,7 @@
           sha256 = "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/irfc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/irfc";
           sha256 = "0186l6zk5l427vjvmjvi0xhwk8a4fjhsvw9kd0yw88q3ggpdl25i";
           name = "irfc";
         };
@@ -29635,15 +29929,15 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20160106.1423";
+        version = "20160203.1407";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "34a3f19c79c65ef52b14699faf9b00dac2d0d4e8";
-          sha256 = "1s6xvn5zmp26rmm57cpmhqrv331v2nrj8f60v065qabqpbsdpyl3";
+          rev = "7ff87b256650b553dcb0fdd3708d7e3b3531e3c1";
+          sha256 = "11mwl22i4r9an992xprzyi24rc3ci3l13s461yjavkgl3nbnlf7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/irony";
           sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
           name = "irony";
         };
@@ -29664,7 +29958,7 @@
           sha256 = "01fjpfixfcca01a5fnnpd2wga4j30p0kwhbai25prvib4qcp1kqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/irony-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/irony-eldoc";
           sha256 = "03m0h13jd37vfvn4mavaq3vbzx4x0lklbs0mbc29zaz8pwqlcwz6";
           name = "irony-eldoc";
         };
@@ -29685,7 +29979,7 @@
           sha256 = "17d0816awadvsw1qc7r0p6ira75jmgxaj9hsk9ypayxsaf6ynyrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch-dabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isearch-dabbrev";
           sha256 = "1hl7zl5vjcsk3z452874g4nfcnmna8m2242dc9cgpl5jddzwqa7x";
           name = "isearch-dabbrev";
         };
@@ -29697,13 +29991,13 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20160118.1030";
+        version = "20160128.1005";
         src = fetchurl {
           url = "http://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "176krgrrjvj6r6iahr53ncxm2hrc4nmkyz43lc2rbnpivih4z9i6";
+          sha256 = "1l269vc92jxrw3snhjykxb28xdg672cj43q35lk61yg4fl2ny9bc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isearch+";
           sha256 = "1rzlsf08nmc3p3vhpwbiy8cgnnl2c10xrnsr2rlpv0g2kxkrd69r";
           name = "isearch-plus";
         };
@@ -29721,7 +30015,7 @@
           sha256 = "1i1ypganr2ivwgi0vgjihgk1s4yglwj8nbqnqjiiwdywf8g5hcmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch-prop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isearch-prop";
           sha256 = "1z9y88b23m4ffil8p3wcq61q1fiyqjxphyd3wacs5fnc53mdzad9";
           name = "isearch-prop";
         };
@@ -29742,7 +30036,7 @@
           sha256 = "09z49850c32x0rchxg203cxg504xi2b6cjgnd0i4axcs5fmq7gv9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch-symbol-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isearch-symbol-at-point";
           sha256 = "0j5fr7qdvpd5b096h5a83fz8sh9wybdnsgix6v94gv8lkzdsqkr8";
           name = "isearch-symbol-at-point";
         };
@@ -29763,7 +30057,7 @@
           sha256 = "022j39r2vvppnh3p5rp9i4cgc3lg24ksjcmcjmbmna1vf624izn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isend-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isend-mode";
           sha256 = "0sk80a08ny9vqw94klqfgii297qm633000wlcldha76ip8viikdv";
           name = "isend-mode";
         };
@@ -29784,7 +30078,7 @@
           sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isgd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isgd";
           sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
           name = "isgd";
         };
@@ -29805,7 +30099,7 @@
           sha256 = "0992lzgar0kz9i1sk5vz17q9qzfgl8fkyxa1q0hmhgnpjf503cnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iss-mode";
           sha256 = "1my4vi1x07hg0dva97i685lx6m6fcbfk16j1zy93zriyd7z5plkc";
           name = "iss-mode";
         };
@@ -29826,7 +30120,7 @@
           sha256 = "1az986mk8j8hyvr1mi9hirixwcd73jcqkjsw4xy34vjbwxi122r9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/itail";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/itail";
           sha256 = "0mcyly88a3c15hl3wll56agpdsyvd26r501h0v64lasfr4k634m7";
           name = "itail";
         };
@@ -29847,7 +30141,7 @@
           sha256 = "08gagq74702x65dy75n2f53fsh806nppnidim9z6ycp8qw1ibyfp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iterator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iterator";
           sha256 = "17q10fw6y0icsv6vv9n968bwmbjlihrpkkyw62d1kfxhs9yw659z";
           name = "iterator";
         };
@@ -29868,7 +30162,7 @@
           sha256 = "12nqpzcmz724wpk8p16lc3z26rxma3wp6pf6dvrsqagnlixrs9si";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ivariants";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ivariants";
           sha256 = "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw";
           name = "ivariants";
         };
@@ -29889,7 +30183,7 @@
           sha256 = "1926pyfsbr6j7cn3diq8ibs0db94rgsf0aifvbqrqp4grs85pkva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ivs-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ivs-edit";
           sha256 = "0gzhvzrfk17j2vwlg82f5ifk4dcfc1yv7barcij38ckran8cqmb2";
           name = "ivs-edit";
         };
@@ -29910,7 +30204,7 @@
           sha256 = "069alh9vs6is3hvbwxbwr9g8qq9md5c92wg5bfswi99yciqdvc4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ix";
           sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
           name = "ix";
         };
@@ -29928,7 +30222,7 @@
           sha256 = "19l9d5gp1xj40iyy35r8hh7v6bjnzjx7pb8dvwrmndzg0rlsp7mi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iy-go-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iy-go-to-char";
           sha256 = "055qj2pc32l824vyjl2w2j8c3rpd9g4x0sazi8svqf923lgcs5s8";
           name = "iy-go-to-char";
         };
@@ -29949,7 +30243,7 @@
           sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/j-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/j-mode";
           sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
           name = "j-mode";
         };
@@ -29962,14 +30256,14 @@
     jabber = callPackage ({ fetchgit, fetchurl, fsm, lib, melpaBuild }:
     melpaBuild {
         pname = "jabber";
-        version = "20151025.1804";
+        version = "20160124.752";
         src = fetchgit {
           url = "git://git.code.sf.net/p/emacs-jabber/git";
-          rev = "d5bfa1c62e6474a997e73a836524fdd322c0af44";
-          sha256 = "1a0f7c2154f863dbefc732a2057d0f7416cb4cd5764bdfa01cbf9e221a3abcb3";
+          rev = "98dc8e429ba6f79065f1c9fc3878d92314d4b510";
+          sha256 = "994d5c2d917a2874c660ec30827d041ee1f1be55b4d8130cb7a780d60c90158d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jabber";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jabber";
           sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
           name = "jabber";
         };
@@ -29990,7 +30284,7 @@
           sha256 = "0yv86nadp6dfzl05vhk8c1kahg2pcrhfmd3mnfjrngp7ksac5lyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jabber-otr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jabber-otr";
           sha256 = "114z5bwhkza03yvfa4nmicaih2jdq83lh6micxjimpddsc8fjgi0";
           name = "jabber-otr";
         };
@@ -30010,7 +30304,7 @@
           sha256 = "7036a0eddf25a2274a6fd1584ff497d2b8078869fa6cc9d61504e6540ff863a8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jack-connect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jack-connect";
           sha256 = "1ssl126wihaf8m2f6ms0l5ai6pz5wn348a09k6l0h3jfww032g1q";
           name = "jack-connect";
         };
@@ -30031,7 +30325,7 @@
           sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jade-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jade-mode";
           sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
           name = "jade-mode";
         };
@@ -30052,7 +30346,7 @@
           sha256 = "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jammer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jammer";
           sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
           name = "jammer";
         };
@@ -30073,7 +30367,7 @@
           sha256 = "1mwm9wpnxqq3nw7fl0jf40a92ha51yd95vvr58zllhbxdpy3q9pv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/japanese-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/japanese-holidays";
           sha256 = "0pxpkikkn2ys0kgf3lbrdxv8iym50h5ik2xzza0qk7cw1v93jza9";
           name = "japanese-holidays";
         };
@@ -30083,22 +30377,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    japanlaw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    japanlaw = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "japanlaw";
-        version = "20150621.2341";
+        version = "20160129.220";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "japanlaw.el";
-          rev = "d90b204b018893d5d75286c92948c0bddf94cce2";
-          sha256 = "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h";
+          rev = "c160e195cda0e02a709a2d39c62bc2a1ed39a09a";
+          sha256 = "1lrsm282lhp7pf0gwr3aad2228lvpqnqs1qdv2xk0zljqnqc0bhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/japanlaw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/japanlaw";
           sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
           name = "japanlaw";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/japanlaw";
           license = lib.licenses.free;
@@ -30115,7 +30409,7 @@
           sha256 = "0xmv7gw5xms6nhjcl51cw33yvjgw0c6bpnlyca3195x7g34sg1zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jape-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jape-mode";
           sha256 = "1gd685r86h0kr36msw81gfgwv7d35hihz6h0jkc6vd22wf6qc3ly";
           name = "jape-mode";
         };
@@ -30136,7 +30430,7 @@
           sha256 = "0nydj0y58yhfh16492q5gzkkz7qrxbdhp4gh2xbiykcbynygj2mq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jar-manifest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jar-manifest-mode";
           sha256 = "0kx358m3p23r8m7z45454i62ijmdlf4mljlbqc20jkihfanr6wqd";
           name = "jar-manifest-mode";
         };
@@ -30157,7 +30451,7 @@
           sha256 = "1zcrxijcwqfs6r1cd6w4jq8g3ly0a69nf0cbx93w5v86x2kjpz0l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jasminejs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jasminejs-mode";
           sha256 = "1a70j3aglrwmaw9g8m99sxad2vs53y4swxh97gqjsgx1rrx03g52";
           name = "jasminejs-mode";
         };
@@ -30178,7 +30472,7 @@
           sha256 = "1bv0al89wlwdv3bhasxnwhsv84phgnixclgrh4l52385rjn8v53f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jaunte";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jaunte";
           sha256 = "0chqiai7fv1idga71gc5dw4rdv1rblg5rrbdijh3glyi8yfr4snf";
           name = "jaunte";
         };
@@ -30191,15 +30485,15 @@
     java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
     melpaBuild {
         pname = "java-imports";
-        version = "20160105.1833";
+        version = "20160127.929";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "emacs-java-imports";
-          rev = "275f354c245df741b45e88d085660722e81a12be";
-          sha256 = "1bngn6v6w60qb3zz7s3px7v3wk99a3hfvzrg9l06dz1q7xgyvsi1";
+          rev = "42e1f92dd60d3adb69d6fac4c59af49d6ab2ccfe";
+          sha256 = "0d8r7pw6v2b3b6brspkpra7q7fmmjh6zm23gmnhdrk72f37fgzdz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/java-imports";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/java-imports";
           sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98";
           name = "java-imports";
         };
@@ -30220,7 +30514,7 @@
           sha256 = "09pa1hmk0dyh7vw0lb9awyrvdarakgaxn66gag5fzbg5vgdfz32i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/java-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/java-snippets";
           sha256 = "0bsmp6sc3khdadkmwqy8khz8kzqijcsv70gimm2cs1kwnbyj6pfp";
           name = "java-snippets";
         };
@@ -30241,7 +30535,7 @@
           sha256 = "0ljpqgp2w3lr61n2vr748n3wyshlqnnbin0643jffa319l99z35r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/javadoc-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/javadoc-lookup";
           sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
           name = "javadoc-lookup";
         };
@@ -30262,7 +30556,7 @@
           sha256 = "070r4mg4v937n4h2bmzdbn3vsmmq7ijz69nankqs761jxv5gcwlg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/javap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/javap-mode";
           sha256 = "19p39l4nwgxm52yimy4j6l43845cpk8g5qdrldlwfxd7dvay09ay";
           name = "javap-mode";
         };
@@ -30283,7 +30577,7 @@
           sha256 = "1430xwd86fdlv1gzkdlp9a0x3w4blbplw24z0m7y8b0j9rhl4fka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jaword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jaword";
           sha256 = "05pzh99zfl8n3p6lxdd9abr52m24hqcb105458i1cy0ra840bf4d";
           name = "jaword";
         };
@@ -30304,7 +30598,7 @@
           sha256 = "00havgs6xc44plnr3vbs13xxiwygr93izm6nx4y98zhcv389ajb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jazz-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jazz-theme";
           sha256 = "0ad8kvrmd3gyb8wfghcl4r3kwzplk5gxlw3p23wsbx6c2xq6xr7g";
           name = "jazz-theme";
         };
@@ -30325,7 +30619,7 @@
           sha256 = "0yx64jrq1br0aylfn4mm26f71gyyw6kad97kv40sb0ashm3di96h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jbeans-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jbeans-theme";
           sha256 = "0y7ccycfnpykgzr88968w7dl45qazf8b9zlf7ydw3ghkl4f6lbwl";
           name = "jbeans-theme";
         };
@@ -30338,15 +30632,15 @@
     jdee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jdee";
-        version = "20160116.1538";
+        version = "20160130.1630";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "54222ea1bccf8bea9757858213fc13f81e3bfd40";
-          sha256 = "1hsx0xfadwwsacs3bad580mns01xyn62j5da0mcmswprxfhc8zx9";
+          rev = "d676043d9b25af39961ceec4428bbada52922b64";
+          sha256 = "0kxqdz8w7lyvl8nyba3c7m0l6nncraml3yyzn250mfbsvbijn1hd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jdee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jdee";
           sha256 = "1yn8vszj0hs2jwwd4x55f11hs2wrxjjvxpngsj7lkcwax04kkvq3";
           name = "jdee";
         };
@@ -30367,7 +30661,7 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi";
           sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
           name = "jedi";
         };
@@ -30388,7 +30682,7 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi-core";
           sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
           name = "jedi-core";
         };
@@ -30409,7 +30703,7 @@
           sha256 = "1pgi5vnwz5agrpvy7nwg3gv2nfbbmimhk8dxkg81k6yf1iiqxcap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi-direx";
           sha256 = "1y4n4c2imnm3f1q129bvbi4gzk0iazd8qq959gvq9j9fl1aziiz1";
           name = "jedi-direx";
         };
@@ -30430,7 +30724,7 @@
           sha256 = "0rx72rid7922mhw21j85kxmx0fhpkmkv9jvxmj9izy01xnjbk00c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jekyll-modes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jekyll-modes";
           sha256 = "1305f1yg1mamyw3bkzrk5q3q58ihs8f5k9vjknsww5xvrzz3r1si";
           name = "jekyll-modes";
         };
@@ -30451,7 +30745,7 @@
           sha256 = "08ywfmsjv3vjqy95hx095kasy8knh3asl7mrlkgmv9wjwnxw45zs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jenkins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jenkins";
           sha256 = "0ji42r7p3f3hh643839xf74gb231vr7anycr2xhkga8qy2vwa53s";
           name = "jenkins";
         };
@@ -30472,7 +30766,7 @@
           sha256 = "0jayhv8j7b527dimhvcs0d7ax25x7v50dk0k6apisqc23psvkq66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jenkins-watch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jenkins-watch";
           sha256 = "0brgjgbw804x0gf2vq01yv6bd0ilp3x9kvr1nnsqxb9c03ffmb2m";
           name = "jenkins-watch";
         };
@@ -30492,7 +30786,7 @@
           sha256 = "a7aa00b03d474549a25faec9ae0394f9d1065c05049268dea507409f84c801a1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jg-quicknav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jg-quicknav";
           sha256 = "1v46ck9imffhrmx6s4c3kbi5g5spf2mn2axy5nfpn7q8sc8bf0s3";
           name = "jg-quicknav";
         };
@@ -30513,7 +30807,7 @@
           sha256 = "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jinja2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jinja2-mode";
           sha256 = "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx";
           name = "jinja2-mode";
         };
@@ -30531,7 +30825,7 @@
           sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jira";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jira";
           sha256 = "0cf5zgkxagvka5v6scgyxqx4mz1n7lxbynn3gl2a4s9s64jycsy6";
           name = "jira";
         };
@@ -30552,7 +30846,7 @@
           sha256 = "1ack7dmapva3wc2gm22prd5wd3cmq19sl4xl9f04a3nk2msr6ksx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jira-markup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jira-markup-mode";
           sha256 = "0f3sw41b4wl0aajq0ap66942rb2015d9iks0ss016jgzashw7zsp";
           name = "jira-markup-mode";
         };
@@ -30573,7 +30867,7 @@
           sha256 = "0mh7990zqrprsa1g9jzpqm666pynlqd2nh9z236zyzykf8d8il8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jist";
           sha256 = "11m9li1016cfkm4931h69d7g1dc59lwjl83wy3yipswdg3zlw0ar";
           name = "jist";
         };
@@ -30594,7 +30888,7 @@
           sha256 = "1idby2rjkslw85593qd4zy6an9zz71yzwqc6rck57r54xyfs8mij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jknav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jknav";
           sha256 = "0c0a8plqrlsw8lhmyj9c1lfkj2b48cjkbw9pna8qcizvwgym9089";
           name = "jknav";
         };
@@ -30615,7 +30909,7 @@
           sha256 = "1a0091r1xs3fpvg1wynh53xibdsiaf2khz1gp6s8dc45z8r0bclx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jonprl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jonprl-mode";
           sha256 = "0763ad65dmpl2l5lw91mlppfdvrjg6ym45brhi8sdwwri1xnyv9z";
           name = "jonprl-mode";
         };
@@ -30636,7 +30930,7 @@
           sha256 = "014qfzl0qc23pa9w9f3v4yi80jr7nxpd0pz6d615x5mq3zi6l0gp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jq-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jq-mode";
           sha256 = "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin";
           name = "jq-mode";
         };
@@ -30657,7 +30951,7 @@
           sha256 = "0gh2bgmsbi9lby89ssvl49kpz07jqrfnyg47g6b9xmf5rw42s1z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jquery-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jquery-doc";
           sha256 = "0pyg90izdrb9mvpbz9nx21mp8m3svqjnz1jr8i7wqgfjxsxdklxj";
           name = "jquery-doc";
         };
@@ -30678,7 +30972,7 @@
           sha256 = "0hh49j4ngnw7zkp31nm7bckkic3ya3xwzrsz4ksj2ws4fyjkqc9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js-comint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
           name = "js-comint";
         };
@@ -30699,7 +30993,7 @@
           sha256 = "1d2jy71iw1v7l0jrvszmr3qdls5mak6kjvyvk0n9895z87lhgm8g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js-doc";
           sha256 = "0nafqgb4kf8jgrb7ijfcvigq8kf043ki89h61izda4hccm3c42pk";
           name = "js-doc";
         };
@@ -30720,7 +31014,7 @@
           sha256 = "0105vx7bc681q9v2x6wj2r63pwp7g0cjjgpg7k4r852zmndfbzsc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-closure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-closure";
           sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
           name = "js2-closure";
         };
@@ -30741,7 +31035,7 @@
           sha256 = "1gad5a18m3jfhnklsj0ka3p2wbihh1yvpcn7mwlmm7cjjxcaly9g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-highlight-vars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-highlight-vars";
           sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
           name = "js2-highlight-vars";
         };
@@ -30754,15 +31048,15 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20160109.348";
+        version = "20160124.1332";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "b57d129c2f156eda96f7aea004472a7f6d70334a";
-          sha256 = "06lfpj4n5f1g657amyfd8ndr8w94a0bjlp9xic614w0z9a2l3ak6";
+          rev = "7b430a37d2a77c8bc0f384e11e061e914f2d31de";
+          sha256 = "09hwxh353w6wk47sqx871fn59la7kncqlskxdrz316jyps6kj890";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-mode";
           sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
           name = "js2-mode";
         };
@@ -30783,7 +31077,7 @@
           sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-refactor";
           sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
           name = "js2-refactor";
         };
@@ -30804,7 +31098,7 @@
           sha256 = "137lypg6jwsisn2g5h0wiqh57icj46zv3albxjf2q1k5isszhy1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js3-mode";
           sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
           name = "js3-mode";
         };
@@ -30825,7 +31119,7 @@
           sha256 = "1bqsv2drhcs8ia7nxss33f80p2mhcl4mr1nalphzw6s1f4mq2sgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jscs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jscs";
           sha256 = "1yw251f6vpj2bikjw79arywprk8qnmmfcki99mvwnqhsqlv1a8iv";
           name = "jscs";
         };
@@ -30846,7 +31140,7 @@
           sha256 = "0h9gx5cl3lashk0n8pv9yzb0mm8dyziddfbwfqfm70638p93ylhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jsfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jsfmt";
           sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
           name = "jsfmt";
         };
@@ -30867,7 +31161,7 @@
           sha256 = "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-mode";
           sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
           name = "json-mode";
         };
@@ -30888,7 +31182,7 @@
           sha256 = "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-reformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-reformat";
           sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
           name = "json-reformat";
         };
@@ -30909,7 +31203,7 @@
           sha256 = "0xgrb0zfxyfmfnvx1l7ca99lzl6f2qyal798rcra45167c0j0vbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-rpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-rpc";
           sha256 = "1v1pfmm9g18p6kgn27q1m1bjgwbzvwfm0jbsxp8gdsssaygky71k";
           name = "json-rpc";
         };
@@ -30930,7 +31224,7 @@
           sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-snatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-snatcher";
           sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
           name = "json-snatcher";
         };
@@ -30951,7 +31245,7 @@
           sha256 = "07yd7sxb5f2mbm2nva7b2nwyxxkmsi2rdd5qig0bq1b2mf3g5l83";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jss";
           sha256 = "050hskqcjz5kc8nni255vj3hc9m936w1rybvg5kqyz4p4lpzj00k";
           name = "jss";
         };
@@ -30972,7 +31266,7 @@
           sha256 = "16jgmabcqrjb3v9c6q711jqn9dna88bmzm4880mdry69ixwcydxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jst";
           sha256 = "0hp1f7p6m1gfv1a3plavzkzn87dllb5g2xrgg3mch4qsgdbqx65i";
           name = "jst";
         };
@@ -30993,7 +31287,7 @@
           sha256 = "1g648r0wrd8m5ggl5jrplmj7jmr68bh2ykyii5wv30zfba97r1sh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jsx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jsx-mode";
           sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
           name = "jsx-mode";
         };
@@ -31005,14 +31299,14 @@
       }) {};
     jtags = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "jtags";
-        version = "20160118.828";
+        version = "20160119.1503";
         src = fetchgit {
           url = "git://git.code.sf.net/p/jtags/code";
-          rev = "1a820caeb0d0b38280346ee75e4aae312bf54799";
-          sha256 = "e71284e30a2d69e5769c414d29870d0d5ef3696fba35944a6844ad157bd57288";
+          rev = "46ff683a3b452729364d9f2fcb86b3f020d9baac";
+          sha256 = "96d9335e9baa6d466447a79219c955b71a9eb1e800d1e1311d9bf72dafcc358d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jtags";
           sha256 = "0in5ybgwmghlpa5d7wz0477ba6n14f1mwp5dxcl4y11f1lsq041r";
           name = "jtags";
         };
@@ -31029,11 +31323,11 @@
         src = fetchFromGitHub {
           owner = "JuliaLang";
           repo = "julia";
-          rev = "57beb963d9ba34ef2c40f7caf52e659339e6f258";
-          sha256 = "1s2j7iq3xwvjnrsljryzccca7h5sd6swmzhy4bj7gisymdg0h7lg";
+          rev = "baf336ff1940c355a9b66805330b7623a6b910f0";
+          sha256 = "0z78bppjl3d0qcc1vxh66gi3if35n35bh61569hr1hhyc0x8pzpq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/julia-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/julia-mode";
           sha256 = "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm";
           name = "julia-mode";
         };
@@ -31054,7 +31348,7 @@
           sha256 = "0r4ajn3f1c8n0r831ihvzwyzy94aiv0ijqrwhpq0s85cqvzr7pq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/julia-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/julia-shell";
           sha256 = "0182irlvk6nn71zk4j8xjgcqp4bxi7a2dbj44frrssy6018cd410";
           name = "julia-shell";
         };
@@ -31075,7 +31369,7 @@
           sha256 = "1f0kai4cz3r25fqlnryyvnyf80cf57xa655dvv1rx8si3xd20x4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jumblr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jumblr";
           sha256 = "1wnawz1m6x95iyzac453p55h7hlr5q0ry5437aqqx0bw7gdwg3dp";
           name = "jumblr";
         };
@@ -31096,7 +31390,7 @@
           sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump";
           sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
           name = "jump";
         };
@@ -31117,7 +31411,7 @@
           sha256 = "0vpla6lyr30fyq9gi7g9zmnhysbm077m0qgi7w3axppfbxdvg67q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump-char";
           sha256 = "0l8zvfwpngkgcxl1a36jwwxdh23hi390mikz7xrq63w5zwm0007n";
           name = "jump-char";
         };
@@ -31138,7 +31432,7 @@
           sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump-to-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump-to-line";
           sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
           name = "jump-to-line";
         };
@@ -31159,7 +31453,7 @@
           sha256 = "0ykzvy8034mchq6ffyi7vqnwyrj6gnqqgn39ki81pv97qh8hh8yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jumplist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jumplist";
           sha256 = "06xjg1q8b2fwfhfmdkb76bw2id8pgqc61fmwlgri5746jgdmd7nf";
           name = "jumplist";
         };
@@ -31180,7 +31474,7 @@
           sha256 = "0k91cdjlpil8npc4d3zsgx2gk41crl7qgm9r85khcgxs59kmkniw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jvm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jvm-mode";
           sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
           name = "jvm-mode";
         };
@@ -31193,15 +31487,15 @@
     kaesar = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaesar";
-        version = "20150220.505";
+        version = "20160128.408";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-kaesar";
-          rev = "11ab63b8e6f1c4ebc5a2e54474095754a39104e5";
-          sha256 = "1maab8iaf2wcjj02ibl21jlfzmi9gmcl167cgdlwj50wkig74s23";
+          rev = "d087075cb1a46c2c85cd075220e09b2eaef9b86e";
+          sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar";
           sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
           name = "kaesar";
         };
@@ -31214,15 +31508,15 @@
     kaesar-file = callPackage ({ fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }:
     melpaBuild {
         pname = "kaesar-file";
-        version = "20150130.1004";
+        version = "20160128.408";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-kaesar";
-          rev = "11ab63b8e6f1c4ebc5a2e54474095754a39104e5";
-          sha256 = "1maab8iaf2wcjj02ibl21jlfzmi9gmcl167cgdlwj50wkig74s23";
+          rev = "d087075cb1a46c2c85cd075220e09b2eaef9b86e";
+          sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar-file";
           sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
           name = "kaesar-file";
         };
@@ -31235,15 +31529,15 @@
     kaesar-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }:
     melpaBuild {
         pname = "kaesar-mode";
-        version = "20150220.505";
+        version = "20160128.408";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-kaesar";
-          rev = "11ab63b8e6f1c4ebc5a2e54474095754a39104e5";
-          sha256 = "1maab8iaf2wcjj02ibl21jlfzmi9gmcl167cgdlwj50wkig74s23";
+          rev = "d087075cb1a46c2c85cd075220e09b2eaef9b86e";
+          sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar-mode";
           sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
           name = "kaesar-mode";
         };
@@ -31264,7 +31558,7 @@
           sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kakapo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kakapo-mode";
           sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
           name = "kakapo-mode";
         };
@@ -31283,7 +31577,7 @@
           sha256 = "14g0f51jig8b1y6zfaw7b1cp692lddqzkc0ngf4y89sw9gbmsh3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kanban";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kanban";
           sha256 = "1sif2ayb8fq5vjz9lpkaq40aw9wiciz84yipab2qczszlgw1l1hb";
           name = "kanban";
         };
@@ -31304,7 +31598,7 @@
           sha256 = "0vfagfzhh4rkmvjzfhfcm7w3z1x31aqzxwigk5yw9scnfb77pinz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kanji-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kanji-mode";
           sha256 = "0nnkv7lp7ks9qhkbhz15ixm53grc2q0xfspzykxi9c4b59kypcq5";
           name = "kanji-mode";
         };
@@ -31314,6 +31608,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kaomoji";
+        version = "20160119.943";
+        src = fetchFromGitHub {
+          owner = "kuanyui";
+          repo = "kaomoji.el";
+          rev = "ffe8890019bb22eac586f42c7c7a184a243c8ba0";
+          sha256 = "1z35gk58jwynygyq1n3c9cb7xgqp5bmbsgq2j3bb43cagc55xixh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaomoji";
+          sha256 = "1p61pbqf2lnwr6ryxxc4jkd5bmlgknrc27lg89h3b4pw7k39cqy1";
+          name = "kaomoji";
+        };
+        packageRequires = [ emacs helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/kaomoji";
+          license = lib.licenses.free;
+        };
+      }) {};
     karma = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "karma";
@@ -31321,11 +31636,11 @@
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "karma.el";
-          rev = "07d5ba0fd669b909efdf02ffd0c1f45e6136edc4";
-          sha256 = "1xcs15j555cgp2k4k9vl5sy2lrffbk0ma2fv60hlxwirqyw4jcdy";
+          rev = "34952d4b5288d4b09a9f65b32ee8cb5f65926fe9";
+          sha256 = "03wdi0zwnsb42rbrlrck553mgn9vgnd896d5xpiqf1ik4z4cf10z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/karma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/karma";
           sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
           name = "karma";
         };
@@ -31346,7 +31661,7 @@
           sha256 = "1kkzs7nrcr74qn1m456vaj52a9j3ah4biakimz06hls415l56yk9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kerl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kerl";
           sha256 = "0f8n7cm5c432pwj28bcpv2jj5z3br3k164xj6nwfis3dvijwsgss";
           name = "kerl";
         };
@@ -31364,7 +31679,7 @@
           sha256 = "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-chord";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-chord";
           sha256 = "0cr9lx1pvr0qc762nn5pbh8w93dx1hh1zzf806cag2b9pgk6d4an";
           name = "key-chord";
         };
@@ -31385,7 +31700,7 @@
           sha256 = "1is7s50lgn77lxxwgakiaywx6jqdfg8045d18m4zn3ilxg6k8ljf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-combo";
           sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
           name = "key-combo";
         };
@@ -31406,7 +31721,7 @@
           sha256 = "143nfs8pgi5yy3mjq7nirffplk4vb8kik4q7zypynh2pddip30a4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-intercept";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-intercept";
           sha256 = "1z776jbpjks5bir6bd0748mlrmz05nf0jy9l4hlmwgyn72dcbx16";
           name = "key-intercept";
         };
@@ -31427,7 +31742,7 @@
           sha256 = "14xk0crl25alcckkcg0wx7gwb65hmicfn01db1zip8swk249g9w3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-leap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-leap";
           sha256 = "0z1fhpf8g0c4rh3bf8dfmdgyhj5w686kavjr214czaga0x7mwlwj";
           name = "key-leap";
         };
@@ -31448,7 +31763,7 @@
           sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-seq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-seq";
           sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
           name = "key-seq";
         };
@@ -31469,7 +31784,7 @@
           sha256 = "0xm7vybqgglacm0xz6fa7ipfvsx14qqws629gi9i16maxn3by9ci";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keychain-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keychain-environment";
           sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
           name = "keychain-environment";
         };
@@ -31490,7 +31805,7 @@
           sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keydef";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keydef";
           sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
           name = "keydef";
         };
@@ -31511,7 +31826,7 @@
           sha256 = "18qiw2324gx5w12pqka9njsysxym8dpglk7dzadg0k1wji73nn6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyfreq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyfreq";
           sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
           name = "keyfreq";
         };
@@ -31532,7 +31847,7 @@
           sha256 = "18kc48glbwy9njw863fzlrgc4g0a65s5wf2iarfsjqcynad7r4c7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keymap-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keymap-utils";
           sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
           name = "keymap-utils";
         };
@@ -31553,7 +31868,7 @@
           sha256 = "1kkp3frsk644djmdwxq3l1m88690gch3g8pijlzv566xrwkd903j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyset";
           sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
           name = "keyset";
         };
@@ -31574,7 +31889,7 @@
           sha256 = "0zw4klp9ifb6yylr9yab3p3vjv18as6clpg2i3w4r2xah9chxgqq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyword-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyword-search";
           sha256 = "0wvci1v8pblfbdslfzpi46c149y8pi49kza9jf33jzhj357lp5qa";
           name = "keyword-search";
         };
@@ -31595,7 +31910,7 @@
           sha256 = "0xq835xzywks4b4kaz5i0pp759i23kibs5gkvvxasw0dncqh7j5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kfg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kfg";
           sha256 = "0vvvxl6a4ac27igwmsgzpf0whf9h2pjl9d89fd9fizad6gi8x1fs";
           name = "kfg";
         };
@@ -31616,7 +31931,7 @@
           sha256 = "0s2hb2lvfmcvm3n1fg4biaafc1p7j7w990d7w15gicaw6rr2j4nr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kibit-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kibit-helper";
           sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
           name = "kibit-helper";
         };
@@ -31629,15 +31944,15 @@
     kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kill-or-bury-alive";
-        version = "20160114.345";
+        version = "20160128.309";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "kill-or-bury-alive";
-          rev = "dde977419d6d56f4be692e6d7fe1374a087e77c7";
-          sha256 = "15ang6bj34hiq605iaw97is85nn5vc6cyxiy0w4h921f7qmjqdd1";
+          rev = "63753e74a6136a1a196dc436adb8bef894489c58";
+          sha256 = "0a2jmk4wryngs56rqh6sxiyk5yh25l2qvping86yipic2wia17n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kill-or-bury-alive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kill-or-bury-alive";
           sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
           name = "kill-or-bury-alive";
         };
@@ -31658,7 +31973,7 @@
           sha256 = "0yrc09k64rv5is4wvss938mkj2pkvbr98lr3ahsi7p0aqn7s444v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kill-ring-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kill-ring-search";
           sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
           name = "kill-ring-search";
         };
@@ -31679,7 +31994,7 @@
           sha256 = "05rbh5hkj3jsn9pw0qa4d5a5pi6367vdqkijcn9k14fdfbmyd30x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/killer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/killer";
           sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
           name = "killer";
         };
@@ -31700,7 +32015,7 @@
           sha256 = "1cr4i66lws6yhyxmyx5jw6d5x7i75435mafkkych4nfa0mv4vicd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kite";
           sha256 = "04x92qcvx428l2cvm2nk9px7r8i159k0ra0haq2sjncjr1ajhg9m";
           name = "kite";
         };
@@ -31721,7 +32036,7 @@
           sha256 = "1m0f1hiczq88qjy573rhlkw2lmjy814cgdl42zxsjbf78wg4qx8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kite-mini";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kite-mini";
           sha256 = "1g644406zm3db0fjyv704aa8dbd20v1apmysb3mmh2vldbch4iyh";
           name = "kite-mini";
         };
@@ -31738,11 +32053,11 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "417fdc3dc5f0c695b016f9b853d8315de609592d";
-          sha256 = "00y1h3zm1rah86g5gl58qwmndmmcyvix2s6r1gmz7vc2rr06w4kj";
+          rev = "41cb82ab0dd480452139e20d61e264c40e37813f";
+          sha256 = "0vdl0bkgvb0fjja50yffv8izvh0fa2r7bdrcn9qzf5jild49n8m7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kivy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kivy-mode";
           sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
           name = "kivy-mode";
         };
@@ -31763,7 +32078,7 @@
           sha256 = "1ld3ccg8q7hmjrj60rxvmmfy4dpm2lvlshjqdf9ifgjzp221g4vb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kixtart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kixtart-mode";
           sha256 = "079bw4lgxbmk65rrfyy8givs8j5wsyhpcjjw915ifkg577gj87qp";
           name = "kixtart-mode";
         };
@@ -31780,11 +32095,11 @@
         src = fetchFromGitHub {
           owner = "for-GET";
           repo = "know-your-http-well";
-          rev = "e208d856ce1b036d2dc1454813c6fc81f0269def";
-          sha256 = "08q43k4450kgygyvqv18gwcmmb7y9x445401048lbixc4cp6p3cg";
+          rev = "d72da09014d44f67b1c6283e4391643b7f311e92";
+          sha256 = "19x08gjqzghxwdrvadjmb8kqm4cszla65nk3ihk2y60riksz9hbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/know-your-http-well";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/know-your-http-well";
           sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
           name = "know-your-http-well";
         };
@@ -31805,7 +32120,7 @@
           sha256 = "0yr4yxwxgxp5pm9f8gaqlikxp26inv01inq0ya42dzam5yphkafw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kolon-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kolon-mode";
           sha256 = "0wcg8ph3mk4zcmzqpvl2w6rfgvrfvhmgwb14y8agh9b7v5d9xwj3";
           name = "kolon-mode";
         };
@@ -31826,7 +32141,7 @@
           sha256 = "1ly55ldf2maf8qfpnsqzn0rbz9cz1f08ak9rr3zijaip3zvlm9q9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kooten-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kooten-theme";
           sha256 = "1kkk8nl1xykc4c487icmjrc2xsv8i4s2r5h5gbcpyrk2myqi4179";
           name = "kooten-theme";
         };
@@ -31847,7 +32162,7 @@
           sha256 = "1m9hixlclynph2i5q18miq077dyvhx14pfzgawrwj82j1kslz50x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kpm-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kpm-list";
           sha256 = "0022bhy1mzngjmjydyqnmlgnhww05v4dxsfav034r8nyyc7677z0";
           name = "kpm-list";
         };
@@ -31868,7 +32183,7 @@
           sha256 = "11axxmhdpwgrcyjz200pf5bqzjw9wz4085r8p1n2vr5gx98374fr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kroman";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kroman";
           sha256 = "0y9ji3c8kndrz605n7b4w5xq0qp093d61hxwhblm3qrh3370mws7";
           name = "kroman";
         };
@@ -31889,7 +32204,7 @@
           sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kurecolor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kurecolor";
           sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
           name = "kurecolor";
         };
@@ -31910,7 +32225,7 @@
           sha256 = "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kv";
           sha256 = "1vzifi6zpkmsh1a3c2njrw7mpfdgyjvpbz3bj42j8cg3vwjnjznb";
           name = "kv";
         };
@@ -31931,7 +32246,7 @@
           sha256 = "0irbfgip493hyh45msnb7climgfwr8f05nvc97bzaqggnay88scy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kwin";
           sha256 = "1pxnyj81py3ygadmyfrqndb0jkk6xlbf0rg3857hsy3ccblzm7ki";
           name = "kwin";
         };
@@ -31949,7 +32264,7 @@
           sha256 = "01vs0v17l76zwyrblf9c6x0xg5fagd4qv8pr1fwfw7kl64hb9aa2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lacarte";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lacarte";
           sha256 = "0a0n1lqakgsbz0scn6617rkkkvzwranzlvkzw9q4zapiz1s9xqp9";
           name = "lacarte";
         };
@@ -31970,7 +32285,7 @@
           sha256 = "135k7inkvdz51j7al3nndaamrkyn989vlv1mxcp8lwx8cgq0rqfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lang-refactor-perl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lang-refactor-perl";
           sha256 = "02fv25d76rvxqzxs48j4lkrifdhqayyb1in05ryyz2pk9x5hbax9";
           name = "lang-refactor-perl";
         };
@@ -31991,7 +32306,7 @@
           sha256 = "0svci7xs4iysv8ysf93g382arip0xpgi0fllw8xx2vrd70sz7lff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/langdoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/langdoc";
           sha256 = "19i6ys58wswl5ckf33swl6lsfzg4znx850br4icik15yrry65yj7";
           name = "langdoc";
         };
@@ -32012,7 +32327,7 @@
           sha256 = "1rj0j4vxfwss0w6bwh591w5mbyzjg5rkbwyjaphyi6p7wq5w6np1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/langtool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/langtool";
           sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
           name = "langtool";
         };
@@ -32033,7 +32348,7 @@
           sha256 = "1cqbdgk3sd0xbw76qrhlild9dvgds3vgldq0rcl200kh7y8l6g4k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latest-clojure-libraries";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latest-clojure-libraries";
           sha256 = "1vnm9piq71nx7q1843izm4vydfjq1564ax4ffwmqmlpisqzd6wq5";
           name = "latest-clojure-libraries";
         };
@@ -32054,7 +32369,7 @@
           sha256 = "17dp23ggd380fln3g5djs7gwx9z3ixbkn51zfccbh4s5549krl5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-extra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-extra";
           sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
           name = "latex-extra";
         };
@@ -32075,7 +32390,7 @@
           sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-math-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-math-preview";
           sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
           name = "latex-math-preview";
         };
@@ -32095,7 +32410,7 @@
           sha256 = "0h9hncf2ghfkd3i3342ajj1niykhfr0aais3j6sjg1vkm16xbr3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-pretty-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-pretty-symbols";
           sha256 = "1f2s2f64bmsx89a3crm4skhdi4pq9w18z9skxw3i3ydaj15s8jgl";
           name = "latex-pretty-symbols";
         };
@@ -32116,7 +32431,7 @@
           sha256 = "1bvhrh9xfl7p474b8jcczw255d2pjmrz5b60wis0lmmxdljplrfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-preview-pane";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-preview-pane";
           sha256 = "1id1l473azmc9hm5vq5wba8gad9np7sv38x94qd2zkf8b78pzkbw";
           name = "latex-preview-pane";
         };
@@ -32137,7 +32452,7 @@
           sha256 = "0ciycsqzyj6ld60c7sfqjq59ln3jvk3w9vy606kqzpcvj01ihmv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/launch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/launch";
           sha256 = "043gwz583pa1wv84fl634p1v86lcsldsw7qkjbm6y678q5mms0m6";
           name = "launch";
         };
@@ -32158,7 +32473,7 @@
           sha256 = "154z7bhb7qagvl3dlgrlsxdg4chz2863ijglg47xs3yhjp5ypanj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/launchctl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/launchctl";
           sha256 = "07fq445cjpv4ndi7hnjmsrmskm2rlp6ghq0k3bcbjxl21smd9vs9";
           name = "launchctl";
         };
@@ -32179,7 +32494,7 @@
           sha256 = "1mg923rs2dk104bcr461dif3mg42r081ii8ipnnr588w7il0xh7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lavender-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lavender-theme";
           sha256 = "1x7mk3dpk44fkzll6xmh2dw270cgb3a9qs3h8bmiq2dw0wrcwcd1";
           name = "lavender-theme";
         };
@@ -32200,7 +32515,7 @@
           sha256 = "03mv2r6k9syr7bk4vmdafmpa8kz19hv5h68ahj2bmdcmwlvwhkf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ldap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ldap-mode";
           sha256 = "0lkfpbzsry9jigrx5zp14bkrvqnavnk4y3s0whnbigc4fgpf94rq";
           name = "ldap-mode";
         };
@@ -32217,11 +32532,11 @@
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger";
-          rev = "f612ef0b25a6f679fae47f8371bcd4c25a380b02";
-          sha256 = "011a0l2jx4x687s3mqhhyrgpwxqcjv0cn4alhd55caql6z5cwh5h";
+          rev = "9b49ade03a3e5d9089ee031bdf733004cee8a36e";
+          sha256 = "0cp5ywmk48sd7c8s8d5a0sv0ng4fl0hybss2z8fwhw6z47iypzmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ledger-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ledger-mode";
           sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s";
           name = "ledger-mode";
         };
@@ -32242,7 +32557,7 @@
           sha256 = "0yrrlwmxg1wy65bqyacjpzd5ksljgp41x4zyizl7h0zx9rmqcdvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/leerzeichen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/leerzeichen";
           sha256 = "0h7zpskcgkswr110vckfdbxggz5b3g9grk1j1cbd98pmrpgfqrvp";
           name = "leerzeichen";
         };
@@ -32260,7 +32575,7 @@
           sha256 = "0vjf2f5kpmgnw7904jsv2wnn6dcv654v7h1v917wmj72sy941xml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/legalese";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/legalese";
           sha256 = "0xsf3w5h4g7wigrv5kbys7lf9lfv2cab5ch320p74l3l3r2lj9wz";
           name = "legalese";
         };
@@ -32281,7 +32596,7 @@
           sha256 = "0n6jrm5ilm5wzfrh7yjxn3sr5m10hwdm55b179ild32lh4795zj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lemon-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lemon-mode";
           sha256 = "0jdf3556kmv55jh85ljqh2gdx0jl2b8zgvpz9a4kf53xifk3lqz5";
           name = "lemon-mode";
         };
@@ -32302,7 +32617,7 @@
           sha256 = "0ab84qiqaz3swiraks8lx0y1kzwylpy9wz2104xgnpwnc5169z65";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lenlen-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lenlen-theme";
           sha256 = "1bddkcl9kzj3v071qpzmxzjwywqfj5j6cldz240qgp5mx685r0a9";
           name = "lenlen-theme";
         };
@@ -32323,7 +32638,7 @@
           sha256 = "04h6vk7w25yp4kzkwqnsmc59bm0182qqkyk5nxm3a1lv1v1590lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lentic";
           sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
           name = "lentic";
         };
@@ -32344,7 +32659,7 @@
           sha256 = "0c6wkfz6sdcs4aglvx6h3slhma2vbj7idckwzvp8ji6s7p1mavlv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lentic-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lentic-server";
           sha256 = "1y9idhf9qcsw3dbdj7rwa7bdrn1q0m3bg3r2jzwdnvkq8aas1w56";
           name = "lentic-server";
         };
@@ -32365,7 +32680,7 @@
           sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/less-css-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/less-css-mode";
           sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
           name = "less-css-mode";
         };
@@ -32378,15 +32693,15 @@
     letcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "letcheck";
-        version = "20150726.1112";
+        version = "20160202.1348";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "letcheck";
-          rev = "e85b185993a2eaeec6490709f4c131fde2edd672";
-          sha256 = "1l9qjmyb4a3f6i2iimpmjczbx890cd1p24n941s13sg67xfbm7hn";
+          rev = "edf188ca2f85349e971b83f164c6484264e79426";
+          sha256 = "06hggcbz98qhfbvp0fxn89j98d0mmki4wc4k8kfzp5fhg071chbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/letcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/letcheck";
           sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
           name = "letcheck";
         };
@@ -32407,7 +32722,7 @@
           sha256 = "088ijndcyfi5jai8x2pd9cbh7x9r41nbimw20hz71n9izy2xnjl0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/leuven-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/leuven-theme";
           sha256 = "0pm5majr9cmj6g4zr7vb55ypk9fmfbvxx78mgmgignknbasq9g9a";
           name = "leuven-theme";
         };
@@ -32425,7 +32740,7 @@
           sha256 = "0m94z18i1428bispxi285flvjf22kjm33s4sm0ad11m0w0jizir6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/levenshtein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/levenshtein";
           sha256 = "1iypnz0bw3baqxa9gldz8cikxvdhw60pvqp00kq5p3v4x3xcy4z2";
           name = "levenshtein";
         };
@@ -32446,7 +32761,7 @@
           sha256 = "167ayfl1k8dnajw173hh67nbwbk4frmjc4fzc515q67m9d7m5932";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lexbind-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lexbind-mode";
           sha256 = "1hs9wg45mwp3fwi827rc4g0gjx4fk87zlibq3id9fcqic8q7nrnl";
           name = "lexbind-mode";
         };
@@ -32467,7 +32782,7 @@
           sha256 = "1h0nzdnd698scn4hl6i3j5d0l51vgkf1y9q5prar0rj5n1sjd3vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lfe-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lfe-mode";
           sha256 = "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx";
           name = "lfe-mode";
         };
@@ -32485,7 +32800,7 @@
           sha256 = "077cy2clllrvabw44wb1pzcqz97r3y92j7cb9lnhd9pix0wpcq6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lib-requires";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lib-requires";
           sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx";
           name = "lib-requires";
         };
@@ -32506,7 +32821,7 @@
           sha256 = "039awlam3nrgkxrarcapfyc2myvc77aw7whrkcsjjybzylpzv0pr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/libmpdee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/libmpdee";
           sha256 = "0z4d8y8jlsjw20b31akkaikh5xl0c05lj77d2i1xbgzam4iixma0";
           name = "libmpdee";
         };
@@ -32527,7 +32842,7 @@
           sha256 = "11c3vmxyddx7zm8fpxmzhq2xygyijbszinfiwllgb4l738bxwljb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lice";
           sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
           name = "lice";
         };
@@ -32548,7 +32863,7 @@
           sha256 = "04dik8z2mg6qr4d3fkd26kg29b4c5crvbnc1lfsrzyrik7ipvsi8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/light-soap-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/light-soap-theme";
           sha256 = "09p4w51d5szhi81a6a3l0r4zd4ixkrkzxldr938bcmj0qmj62iyk";
           name = "light-soap-theme";
         };
@@ -32569,7 +32884,7 @@
           sha256 = "0rkx0hk3y79rwhjqs3wvgxhg1rj83mxbqkhhm3jfawp8c1av4f40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lingr";
           sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
           name = "lingr";
         };
@@ -32590,7 +32905,7 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/link";
           sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
           name = "link";
         };
@@ -32603,15 +32918,15 @@
     link-hint = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "link-hint";
-        version = "20160117.1918";
+        version = "20160128.1454";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "link-hint.el";
-          rev = "254f0daf31026934a45c4cdbe3a8b7cb2f713e3f";
-          sha256 = "1sh1cp5q6lbmf16fvq2w0m9dhljvra6n0525jfh6kkma8hk8xdvj";
+          rev = "a34fcdfef646e3f9861fc5513e0d8ab46ef720e2";
+          sha256 = "1glwsc1a3nhw7xwqlf1pgswgnwkvfy2a6a0k0lxshdajxiayyh7d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/link-hint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/link-hint";
           sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
           name = "link-hint";
         };
@@ -32632,7 +32947,7 @@
           sha256 = "01yv6239z90hvncwmm9g5nh4xvyxv2ig3h4hsmxdn4kacfxvc84n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/linphone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/linphone";
           sha256 = "0q7mw1npxq24szhwswc93qz5h6magcxw63ymba7hwhif6my65zx7";
           name = "linphone";
         };
@@ -32653,7 +32968,7 @@
           sha256 = "0x0k4m7nan2klvrhyzqvgpqnw99fq805hvipnrp2j755x7sv92g5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/linum-off";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/linum-off";
           sha256 = "1yilsdsyxlzmh64dpzirzga9c7lhp1phps9cdgp2898zpnzaclay";
           name = "linum-off";
         };
@@ -32674,7 +32989,7 @@
           sha256 = "01r8vbblpqfyfafmgbcw02f371j6c2g940bwmvi54rmjf9kjd6h7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/linum-relative";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/linum-relative";
           sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
           name = "linum-relative";
         };
@@ -32695,7 +33010,7 @@
           sha256 = "1r2yhjfby4mibbr7d14m1rifchdy7bvwy50xz2wx4004zqhjmnjd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lisp-extra-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lisp-extra-font-lock";
           sha256 = "1xchqwhav9x7b02787ghka567fihdc14aamx92jg549c6d14qpwk";
           name = "lisp-extra-font-lock";
         };
@@ -32713,7 +33028,7 @@
           sha256 = "1m07gb3v1a7al0h4nj3914y8lqrwzi8fwb1ih66nxzn6kb0qj3mf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispxmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispxmp";
           sha256 = "02gfbyng3dh2445jfkasxzjc9dlk02dafbfkjm40iwmb8h0fzji4";
           name = "lispxmp";
         };
@@ -32726,15 +33041,15 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "lispy";
-        version = "20160118.432";
+        version = "20160202.1340";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "d37884533a4ede108fcb840e7b53f9ca912b783a";
-          sha256 = "0a8jl83gc87fvq149834khqq3l6qcscv8n2np9xiqp16gpmw8q65";
+          rev = "37999ed32e2bd32f417cc84f9109795fcf1cb72a";
+          sha256 = "1ajymlhx3f2q132vzczgynwf2fyxbm8sbqcg62bpk9iii6ddxql3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispy";
           sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
           name = "lispy";
         };
@@ -32755,7 +33070,7 @@
           sha256 = "0n0mk01h9c3f24gzpws5xf6syrdwkq4kzs9mgwl74x9l0x904rgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispyscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispyscript-mode";
           sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
           name = "lispyscript-mode";
         };
@@ -32776,7 +33091,7 @@
           sha256 = "1szbs16jlxfj71986dbg0d3j5raaxcwz0xq5ar352731r5mdcqw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-environment";
           sha256 = "1zdhrlp8vk8knjwh56pws6dyn003r6avjzvhghlkgnw9nfrdk57h";
           name = "list-environment";
         };
@@ -32797,7 +33112,7 @@
           sha256 = "02l7q5376ydz6a8i9x74bsx5bbxz8xkasmv1lzvf79d3jbg28l1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-packages-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-packages-ext";
           sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
           name = "list-packages-ext";
         };
@@ -32816,7 +33131,7 @@
           sha256 = "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-processes+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-processes+";
           sha256 = "10x7hkba2bmryyl68w769fggw65dl4f3a9g0gqdzmkdj80rcipky";
           name = "list-processes-plus";
         };
@@ -32834,7 +33149,7 @@
           sha256 = "1sv1x2bc1xg7z3q4r9pbvjspj041q4zn883w9m071h7dgx8i9a6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-register";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-register";
           sha256 = "06q7q3j9qvqbp25cx9as2ckmgcz2myfvi2n34jp60v3ayhna79r4";
           name = "list-register";
         };
@@ -32855,7 +33170,7 @@
           sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-unicode-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-unicode-display";
           sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
           name = "list-unicode-display";
         };
@@ -32876,7 +33191,7 @@
           sha256 = "0b6pnkhm5hnim2lpari93la08ic8qyh4nv0d7mw0cyfyk8phzzvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-utils";
           sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
           name = "list-utils";
         };
@@ -32897,7 +33212,7 @@
           sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lit-mode";
           sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
           name = "lit-mode";
         };
@@ -32918,7 +33233,7 @@
           sha256 = "1nbz119ldwjvkm3xd9m0dx820lc177frz5mn585fsd7kqdbkam99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/litable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/litable";
           sha256 = "073yw3ivkl093xxppn5vqyh69jhfc97al505mnyn34fwdj5v8fji";
           name = "litable";
         };
@@ -32928,6 +33243,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    litecoin-ticker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "litecoin-ticker";
+        version = "20160130.2107";
+        src = fetchFromGitHub {
+          owner = "llcc";
+          repo = "btcbox-ticker";
+          rev = "5262efce86c6e5c0822e6817d5a4d842f754ec73";
+          sha256 = "1pxcm4dxb0mggjzcv6r0a34qwq6jyih1afplysh01wk5p3nqlpyk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/litecoin-ticker";
+          sha256 = "14gak0av8wljmyq9lcf44dc2bvlfjb86filanqh0wkf2swpbdw85";
+          name = "litecoin-ticker";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/litecoin-ticker";
+          license = lib.licenses.free;
+        };
+      }) {};
     literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "literate-coffee-mode";
@@ -32939,7 +33275,7 @@
           sha256 = "1wxysnsigjw40ykdwngg0gqfaag0dx6zg029i2zx25kl3gr1lflc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/literate-coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/literate-coffee-mode";
           sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
           name = "literate-coffee-mode";
         };
@@ -32960,7 +33296,7 @@
           sha256 = "1v37bii372w2g3pl09n5dcrk6y7glhpg8qiv17zsk9jy3ps2xm1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/literate-starter-kit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/literate-starter-kit";
           sha256 = "1n2njf007fmrmsb8zrgxbz1cpxmr5nsp8w41yxa934iqc7qygkjy";
           name = "literate-starter-kit";
         };
@@ -32981,7 +33317,7 @@
           sha256 = "1j0qa96vlsqybhp0082a466qb1hd2b0621306brl9pfl5srf5jsj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/live-code-talks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/live-code-talks";
           sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
           name = "live-code-talks";
         };
@@ -32994,15 +33330,15 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20151108.1107";
+        version = "20160204.1323";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "35dda7dadba37ffbcc14d3b0a2711ca4967f1db5";
-          sha256 = "02jvfn0g7r07kvb9m97kqa22j5nsgxbnp6r5vsq3d9qjsi459yd3";
+          rev = "5ebfc696dc4fa3812d934f8ce8f047717053feea";
+          sha256 = "1k7r1cc9hwjdid88hi4l325bwvfdclqxrkw2pm0605l3jpa9jqpy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/live-py-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/live-py-mode";
           sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
           name = "live-py-mode";
         };
@@ -33020,7 +33356,7 @@
           sha256 = "1z9b0arn7vby4fkwzgj3ml537lh94gvf61vs03cqfkc95lv14r76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lively";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lively";
           sha256 = "1wjd6kfnknhw9lc2p9iipaxfm9phpkqqmjw43bhc70ybsq1xaln7";
           name = "lively";
         };
@@ -33041,7 +33377,7 @@
           sha256 = "0kqjz0i0zapyhh8z57cvc8ifiizngix3ca01mjnvyq3zxg1bqrsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/livescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/livescript-mode";
           sha256 = "1fdfhp39zr2mhy5rd6mwqv5fwd8xaypdqig7v3ksv77m5zq7cmmj";
           name = "livescript-mode";
         };
@@ -33062,7 +33398,7 @@
           sha256 = "178ldzpk8a9m9abn8xlplxn5jgcca71dpkp82bs5g7bsccp3rx6p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/livid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/livid-mode";
           sha256 = "0jy16m6injqznx4gmxzvhys480pclw9g07z4qll2dna37177ww9d";
           name = "livid-mode";
         };
@@ -33103,7 +33439,7 @@
           sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/load-theme-buffer-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/load-theme-buffer-local";
           sha256 = "13829yrh36qac7gpxanizlk4n7av99ngvv06y6mmi5rq06a4hjx4";
           name = "load-theme-buffer-local";
         };
@@ -33124,7 +33460,7 @@
           sha256 = "0i0ainawjvfl3qix329hx01x7rxyfin2xgpjk7y5dgmh4p3xhv94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loc-changes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loc-changes";
           sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
           name = "loc-changes";
         };
@@ -33134,22 +33470,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    loccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    loccur = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "loccur";
-        version = "20151231.646";
+        version = "20160129.1422";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "loccur";
-          rev = "61dcaaf53622ece672cc6114f3f75e5ce3544c09";
-          sha256 = "1hl9f3kb8v07ks0qx7361y306739r5gcadp8l3m72mnlfx4vlsz1";
+          rev = "fb1fbc0ff5da7a8b117542ab8083d29cd79e12b2";
+          sha256 = "1npz90zf91wqf35bqd3zmkh0b538i69w8ygc78x5w2x5005aqr0p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loccur";
           sha256 = "06pv2i05yzjzal4q21krbnp9rp4bsainxcwvpc98020vsmms0z8h";
           name = "loccur";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/loccur";
           license = lib.licenses.free;
@@ -33166,7 +33502,7 @@
           sha256 = "1cdnm270kzixa0kpis0xw2ybkw8lqh7kykc7blxkxjrr9yjvbawl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lodgeit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lodgeit";
           sha256 = "1ax2w5yxscycjz90g4jdbhd64g9sipzxpfjs7gq3na77s5dcjzsq";
           name = "lodgeit";
         };
@@ -33187,7 +33523,7 @@
           sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/log4e";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/log4e";
           sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
           name = "log4e";
         };
@@ -33197,19 +33533,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    log4j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    log4j-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "log4j-mode";
-        version = "20101016.1022";
-        src = fetchFromGitHub {
-          owner = "emacsorphanage";
-          repo = "log4j-mode";
-          rev = "ec3de92cfe60dd3d0de613e9062476196dea0faf";
-          sha256 = "14dmmjdmcc0zag8i947n59ihjc2df2l44f7issf66767ym3839kk";
+        version = "20160108.1318";
+        src = fetchgit {
+          url = "git://git.code.sf.net/p/log4j-mode/code";
+          rev = "26171b1e723502055e085393b0ecdcb6db406010";
+          sha256 = "c552abe449a7288210e8490070dc58e037d7d9571633d316dc6b91799119a697";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/log4j-mode";
-          sha256 = "0axr0x8mdxif0xbvs83mxc3gqgs84jb4b9la9n62i3lldckghwmg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/log4j-mode";
+          sha256 = "06lam4iqxlbl9ib2n2db2nj6jbjzrw2ak8r99n6w4s3fny1q3yxx";
           name = "log4j-mode";
         };
         packageRequires = [];
@@ -33229,7 +33564,7 @@
           sha256 = "0lj3i9i3mg17xws13gzx8myc6d7djgsj47yx4kaq5hycgkni1p7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logalimacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logalimacs";
           sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
           name = "logalimacs";
         };
@@ -33250,7 +33585,7 @@
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logito";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logito";
           sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
           name = "logito";
         };
@@ -33271,7 +33606,7 @@
           sha256 = "05px3zc3is7k2jmh7mal0al5zx5cqvn1bzmhgqq02pp6lwsx5xqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logstash-conf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logstash-conf";
           sha256 = "03i2ilphf3fdjag7m9z5gi23n6ik36qn42mzc22432m4y3c7iksh";
           name = "logstash-conf";
         };
@@ -33292,7 +33627,7 @@
           sha256 = "1wglgjf45rl4rl5zp1p1z318p2d1hy1w77m65wwg35v6pkl1mikr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
           name = "logview";
         };
@@ -33313,7 +33648,7 @@
           sha256 = "0pyfgywmmnlz1arvdxwyw96gr6xcg2sp3bqjli8xfcl8i0nww4kb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lolcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lolcode-mode";
           sha256 = "0dxdqr3z5bw0vcfxhhhc1499vrfk1xqwxshr0kvlhdalpf59rqiw";
           name = "lolcode-mode";
         };
@@ -33334,7 +33669,7 @@
           sha256 = "0w9pbjcp4d2w3qb3nnyzq2d0d9f0pgz5lyzapidxa9z1xcj51ccj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/look-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/look-dired";
           sha256 = "0dddx5nxr519wqdgrbglh0pqjl3alg4ddmank42g4llzycy61wsd";
           name = "look-dired";
         };
@@ -33352,7 +33687,7 @@
           sha256 = "0sl6hqggi6qn2qp9khw11qp5hamngwxrrwx98k3pwpj9kgicdpgp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/look-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/look-mode";
           sha256 = "0y3wjfjx0g5jclmv9m3vimv7zd18pk5im7smr41qk09hswi63yqj";
           name = "look-mode";
         };
@@ -33373,7 +33708,7 @@
           sha256 = "1wmd7s3dk9krgmhs4f92mig18vx6y551n45ai7cvj92f4fbrsd08";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loop";
           sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
           name = "loop";
         };
@@ -33394,7 +33729,7 @@
           sha256 = "0grzl4kqpc1x6569yfh9xdzzbgmhcskxwk6f7scjpl32acr88cmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lorem-ipsum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lorem-ipsum";
           sha256 = "0p62yifbrknjn8z0613wy2aaknj44liyrgbknhpa0qn0d4fcrp4h";
           name = "lorem-ipsum";
         };
@@ -33415,7 +33750,7 @@
           sha256 = "179r4pz3hlb5p6bjfhdikkx1zvh09ln5dbw3c3rmlyww1q7v26yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/love-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/love-minor-mode";
           sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
           name = "love-minor-mode";
         };
@@ -33436,7 +33771,7 @@
           sha256 = "1psk4202rmkkfy1ir1ax4x4djfngd5pfry7x30ybq2ifqzymb9qb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lua-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lua-mode";
           sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
           name = "lua-mode";
         };
@@ -33457,7 +33792,7 @@
           sha256 = "0mv73s89n59m44szc37086wq55py5sx0lc0jxncfybawhsqyd0ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lush-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lush-theme";
           sha256 = "03kqws8dzm0ay5k86f4v7g2g2ygwk4fzmz2vyzhzhbsj8hrniq9p";
           name = "lush-theme";
         };
@@ -33478,7 +33813,7 @@
           sha256 = "1r1xfn0dyc4m49064g9n6hpwn4r763kpbg3dgprsv30i5ska61qa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lusty-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lusty-explorer";
           sha256 = "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps";
           name = "lusty-explorer";
         };
@@ -33499,7 +33834,7 @@
           sha256 = "090gk0il4yyypzjbh2qrjdaldwf90fi30impmh4zcfl73bic5q9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lxc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lxc";
           sha256 = "1rv1ybmbjx7n3cavx21nzmvckw63q3jmjsfdr2pcgavrr2ck6lka";
           name = "lxc";
         };
@@ -33512,15 +33847,15 @@
     m-buffer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "m-buffer";
-        version = "20160104.237";
+        version = "20160125.1503";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "m-buffer-el";
-          rev = "1ff021c5f6c74b092dc1aad28d28af1b5e060f76";
-          sha256 = "01847f8xmjfxvvi7hf73l7ypkdazwg8ciinm117zp4jkgnv0apz0";
+          rev = "cf99d4209a3422cabe13420dd9b2cbfbb63f7bea";
+          sha256 = "1rrfvshl6zbsrswg5hrvq1p0rd9vacqwbr4s44kln7vg4ybcgr24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/m-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/m-buffer";
           sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc";
           name = "m-buffer";
         };
@@ -33541,7 +33876,7 @@
           sha256 = "119c77s3qp1vqc5m2yf7m4s81aphkhsvsnwqmpq6xl08r3592zxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macro-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macro-math";
           sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
           name = "macro-math";
         };
@@ -33559,7 +33894,7 @@
           sha256 = "07iw9iarz6z9n6vnhqqljfjpvq6vb97ca2hwj9v0k5k8mafdqg7d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macros+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macros+";
           sha256 = "0aihszxsjnc93pbbkmkr1iwzvii3jw8yh1f6dpnjykgvb328pvqi";
           name = "macros-plus";
         };
@@ -33580,7 +33915,7 @@
           sha256 = "0j95lv4b01p8a5fpxnj5qs2ajg1yxnsg97vw3184dfy9r5hy7ryb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macrostep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macrostep";
           sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
           name = "macrostep";
         };
@@ -33601,7 +33936,7 @@
           sha256 = "1flamyk7z3r723cczqra0f4yabc6kmgwjaw2bvs3kisppqmmz72g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mag-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mag-menu";
           sha256 = "1r1yisjnqxl9llpf91rwqp4q47jc4qp32xnkl8wzsgr0r2qf5yk2";
           name = "mag-menu";
         };
@@ -33614,15 +33949,15 @@
     magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "magic-filetype";
-        version = "20151224.715";
+        version = "20160120.704";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "magic-filetype.el";
-          rev = "bffe69c70565c534bcc245cfdc2781d85e4edb68";
-          sha256 = "1ycqhmi18yjniw6w258rhxcc70ngq51vjlafx0bcs1aw1px97z5s";
+          rev = "db734bdd7aa429e188a628e772c40542b0216d5c";
+          sha256 = "0i38942lr4b7d624313hgydyy0ynmd6psjkz8xcvbb7gw0kcc436";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magic-filetype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magic-filetype";
           sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
           name = "magic-filetype";
         };
@@ -33635,15 +33970,15 @@
     magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magic-latex-buffer";
-        version = "20151230.116";
+        version = "20160121.952";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "magic-latex-buffer";
-          rev = "db01f00780cba71a18bd442332efc599450d5fec";
-          sha256 = "1nvfvyvangpyg5k56x4zrsnh43ffiqbbsibny33zy6idkc145fy0";
+          rev = "60e680c36fe8e1621a675f1407b901f617dc7cc8";
+          sha256 = "1vq709sw4lxydqxzf42yrw9alzr44hk18am4074znwb5vnnrg5sn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magic-latex-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magic-latex-buffer";
           sha256 = "0xm4vk4aggyfw96cgya5cp97jzx5ha0xwpf2yfh7c3m8d9cca4y8";
           name = "magic-latex-buffer";
         };
@@ -33656,16 +33991,16 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20160117.2329";
+        version = "20160202.2338";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "45b06a7b8664046fd1aecb3f07db535edd80d013";
-          sha256 = "1c6x10nm5syahn85vrgg9i6i7kzy4h7l9alahaxb71w6jwf91rsg";
+          rev = "08d0d095c7c16fb8223d3beeea232412f88936f5";
+          sha256 = "08h1lypdvgv0rkq1sjkmw9zwvbjwvpklzjyawb5chgfa5grgfiii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit";
-          sha256 = "099i9h375yfhcylz8mvsm45mkkiyyhx0s1q3icba5n875jvq7smz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit";
+          sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q";
           name = "magit";
         };
         packageRequires = [
@@ -33692,7 +34027,7 @@
           sha256 = "1h1i8712w0pn6bhc5lpps7ri7bf6f3vy23i6qld13hdgvimgisd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-annex";
           sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
           name = "magit-annex";
         };
@@ -33713,7 +34048,7 @@
           sha256 = "0nkxxhxkhy314jv1l3hza84vigl8q7fc8hjjvrx58gfgsfgifx6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-filenotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-filenotify";
           sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7";
           name = "magit-filenotify";
         };
@@ -33734,7 +34069,7 @@
           sha256 = "1j3jsrp0qpaa2xd98d1g9z0zc4b93knwajrlnlsc7l6g0vlfsddb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-find-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-find-file";
           sha256 = "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b";
           name = "magit-find-file";
         };
@@ -33747,15 +34082,15 @@
     magit-gerrit = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-gerrit";
-        version = "20160111.2048";
+        version = "20160128.2126";
         src = fetchFromGitHub {
           owner = "terranpro";
           repo = "magit-gerrit";
-          rev = "ce265149870d4e80fb2d9b80aa380a8c05686c65";
-          sha256 = "1qwcgd6lw0bfzyhzk7vkdrvnxshck0l7rp9lgg9g0jnhf0aqlfri";
+          rev = "04fc4b7ad7366db9559618ace1a61a4e571dde66";
+          sha256 = "0f8bcrvnffpcfxgxwp3rvrd4m0apdc7k93952l4v1mqc762lql1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gerrit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gerrit";
           sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
           name = "magit-gerrit";
         };
@@ -33776,7 +34111,7 @@
           sha256 = "03m4gr86lm8rs3zn6hdirlgfixf1w033iyhsg9dwlhvmfpfghxb5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gh-pulls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gh-pulls";
           sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
           name = "magit-gh-pulls";
         };
@@ -33797,7 +34132,7 @@
           sha256 = "10c1qd1l92h0z7mz7j004bx3fc9p6ij3m732lwmni9vlfbishbb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gitflow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gitflow";
           sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
           name = "magit-gitflow";
         };
@@ -33810,15 +34145,15 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20160117.1713";
+        version = "20160130.849";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "45b06a7b8664046fd1aecb3f07db535edd80d013";
-          sha256 = "1c6x10nm5syahn85vrgg9i6i7kzy4h7l9alahaxb71w6jwf91rsg";
+          rev = "08d0d095c7c16fb8223d3beeea232412f88936f5";
+          sha256 = "08h1lypdvgv0rkq1sjkmw9zwvbjwvpklzjyawb5chgfa5grgfiii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-popup";
           sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
           name = "magit-popup";
         };
@@ -33839,7 +34174,7 @@
           sha256 = "1pqbrrp4366kwfk1d32h2lb70id32ynfc03i7m2832w97f1xp16c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-rockstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-rockstar";
           sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
           name = "magit-rockstar";
         };
@@ -33860,7 +34195,7 @@
           sha256 = "0gb7wpwdhar2a81shd3c5s85ywv8vvjqykpc4py06ybjk8qpspcw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-stgit";
           sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
           name = "magit-stgit";
         };
@@ -33881,7 +34216,7 @@
           sha256 = "0r3nkrisyjawjwbm74yi6fqiwcqzlfkypsdscfhii0q50ky8plph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-svn";
           sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
           name = "magit-svn";
         };
@@ -33902,7 +34237,7 @@
           sha256 = "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-topgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-topgit";
           sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
           name = "magit-topgit";
         };
@@ -33923,7 +34258,7 @@
           sha256 = "0alcdr84g2gvvshpa3cws87n47n5shcryzbj947nsbicmp7f9k8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magma-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magma-mode";
           sha256 = "1gq6yi51h1h7ivrm1xr6nfrpabx8ylbk0waaw04gnw3bb54dmmvc";
           name = "magma-mode";
         };
@@ -33944,7 +34279,7 @@
           sha256 = "1hqz26zm4bdz5wavna4j9yia3ns4z19dnszl7k0lcpgbgmb0wh8y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magnatune";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magnatune";
           sha256 = "0fmxlrq5ls6fpbk5fv67aan8gg1c61i1chfw5lhf496pwqzq901d";
           name = "magnatune";
         };
@@ -33965,7 +34300,7 @@
           sha256 = "06sjwl0bk648wnnrmyh6qgnlqmxypjmy0gkfl6kpv01r8vh7x2q5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/main-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/main-line";
           sha256 = "0c9c5kmixvhk9il8hsxzf2k14fggb9b9mw59g8q3hgpn5g7kgpkv";
           name = "main-line";
         };
@@ -33978,15 +34313,15 @@
     majapahit-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "majapahit-theme";
-        version = "20160118.1010";
+        version = "20160203.829";
         src = fetchFromGitLab {
           owner = "franksn";
           repo = "majapahit-theme";
-          rev = "97b45223cf59b2ab56dcd06cea078b3ce2a0a328";
-          sha256 = "11dqlvazga7sisx4nbhwzz4525g43k1sbx5pcjwdamwy93bli0fz";
+          rev = "ccb069c3dc632e27e416716aaf705c1a215ead70";
+          sha256 = "1wwc9byjihpdm08a0c0mzbw2r55lhr7c4k0gbcl05hygphymwng7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/majapahit-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/majapahit-theme";
           sha256 = "04k2smrya27rrjlzvnl3a6llg8vj8x4mm9qyk4kwrmckhd6jd68s";
           name = "majapahit-theme";
         };
@@ -34007,7 +34342,7 @@
           sha256 = "1ky3scyjb69wi76xg6a8qx4ja6lr6mk530bv5gmhj7fxbq8b3x5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/make-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/make-color";
           sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
           name = "make-color";
         };
@@ -34028,7 +34363,7 @@
           sha256 = "00j5n9pil1qik4mrzvam4rp6213w8jm4qw7c4z8sxpq57xa0b679";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/make-it-so";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/make-it-so";
           sha256 = "0a8abz54mb60mfr0bl9ry8yawq99vx9hjl4fm2sivns58qjgfy73";
           name = "make-it-so";
         };
@@ -34049,7 +34384,7 @@
           sha256 = "0w3kar52yf8clf9801c4jzfrixi10clc8fs8ni2d4pzhdwwca2zw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maker-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maker-mode";
           sha256 = "03q09jxmhwqy7g09navj08z9ir0rbh7w26c1av7hwhmq4i6xwg8a";
           name = "maker-mode";
         };
@@ -34070,7 +34405,7 @@
           sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/makey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/makey";
           sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
           name = "makey";
         };
@@ -34091,7 +34426,7 @@
           sha256 = "0hlxs9gi2vml2id9q0r1r0xdm0zshjzc1w3phjf2ab0aa3hl5k6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/malabar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/malabar-mode";
           sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
           name = "malabar-mode";
         };
@@ -34112,7 +34447,7 @@
           sha256 = "1a22xkhnmpfffllarsjdw10n5cd3nwifcl1iv98kb4j4x96kd4xg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/malinka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/malinka";
           sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
           name = "malinka";
         };
@@ -34133,7 +34468,7 @@
           sha256 = "18x3cssfn81k8hg4frj7dhzphg784321z51wbbvn3bjhq7s6j3a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mallard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mallard-mode";
           sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
           name = "mallard-mode";
         };
@@ -34154,7 +34489,7 @@
           sha256 = "0qk7i47nmyp4llwp6x0i1i5dk82ck26iyz1sjvvlihaw8a5akny2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mallard-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mallard-snippets";
           sha256 = "0437qd7q9i32pmhxaz3vi2dnfpj4nddmzgnqpwsgl28slhjw2hv8";
           name = "mallard-snippets";
         };
@@ -34175,7 +34510,7 @@
           sha256 = "1lfq4hsq2n33l58ja5kzy6bwk9jxbcdsg6y8gqlk71lcslzqldrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/man-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/man-commands";
           sha256 = "1yl7y0k24gydldfs406v1n523q46m9x6in6pgljgjnjravc67wnq";
           name = "man-commands";
         };
@@ -34196,7 +34531,7 @@
           sha256 = "10wl7kc76dyijrmdlcl5cx821jg7clsj35r22955mbbgh7zl1x07";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/manage-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/manage-minor-mode";
           sha256 = "11jdj8kd401q0y8bbyyn72f27f51bckqid10dnh64z8w7hv59cw6";
           name = "manage-minor-mode";
         };
@@ -34209,15 +34544,15 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20160116.2051";
+        version = "20160126.2226";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "04bc90d764be19f8f22507e0c2d64f7ad2f1d8db";
-          sha256 = "1yddr220y2digfsfz6d1sx5d1m5xwsipl3xpfy2hzxm8mldkaa6c";
+          rev = "1f31c150443e19d99c16f95e258536b1d0bc2fc1";
+          sha256 = "08c31h2nan5ikjh171j63xbbznfc1bg6qay1ijx26r5f0c3n6b9k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mandoku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mandoku";
           sha256 = "1pg7ir3y6yk92kfs5agbxapcxf7gy60m353rjv8g3kfkx5zyh3mv";
           name = "mandoku";
         };
@@ -34238,7 +34573,7 @@
           sha256 = "0pd6bh7wrrh59blp86a2jl2vi4qkzx49z0hy7dkc71ccg0wjsgz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/map-progress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/map-progress";
           sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
           name = "map-progress";
         };
@@ -34259,7 +34594,7 @@
           sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/map-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/map-regexp";
           sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
           name = "map-regexp";
         };
@@ -34280,7 +34615,7 @@
           sha256 = "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marcopolo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marcopolo";
           sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
           name = "marcopolo";
         };
@@ -34301,7 +34636,7 @@
           sha256 = "1x3anvy3hlmydxyfzr1rhaiy502yi1yz3v54sg8wc1w7jrvwaj29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mark-multiple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mark-multiple";
           sha256 = "179wd9g0smm76k92n7j2vgg8gz5wn9lczrns5ggq2yhbc77j0gn4";
           name = "mark-multiple";
         };
@@ -34322,7 +34657,7 @@
           sha256 = "0k4zvbs09mkr8vdffv18s55rn9cyxldzav9vw04lm7v296k94ivz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mark-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mark-tools";
           sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
           name = "mark-tools";
         };
@@ -34335,14 +34670,14 @@
     markdown-mode = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20160118.700";
+        version = "20160121.728";
         src = fetchgit {
           url = "git://jblevins.org/git/markdown-mode.git";
-          rev = "7b68cd4e8cfbc86141763ee96a5c3e989afc1984";
-          sha256 = "e8abcd04d12977df22ba14fe38deca8c115c777d006fb5f9f37282f29c23ece0";
+          rev = "846a2d0db5f6ce71af9a67a793bfd89e751825fe";
+          sha256 = "9ebb4e9fde3364042a64842a62f7e9b7dc5bfefabc1387b2f6b9e9237596b104";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-mode";
           sha256 = "02lmhihv495drv9cb40h6l0xsbx7yglbvsdzc4r0vf78j87rs33f";
           name = "markdown-mode";
         };
@@ -34363,7 +34698,7 @@
           sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-mode+";
           sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
           name = "markdown-mode-plus";
         };
@@ -34384,7 +34719,7 @@
           sha256 = "1i5gr3j9dq41p2zl4bfyvzv6i5z7hgrxzrycmbdc3s7nja36k9z4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-preview-eww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-preview-eww";
           sha256 = "0j6924f84is41dspib68y5lnz1f8nm7pqyhv47alxra50cjrpxnx";
           name = "markdown-preview-eww";
         };
@@ -34405,7 +34740,7 @@
           sha256 = "10h5zh03c3v0c6pqcxvlns6l70k2l916nqvza53ikjpldmc4mln2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-preview-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-preview-mode";
           sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
           name = "markdown-preview-mode";
         };
@@ -34426,7 +34761,7 @@
           sha256 = "1s5sasp8z9s1pfq7nww221lb427qblryilx0h5y7bg4z2ay9yr03";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-toc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-toc";
           sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
           name = "markdown-toc";
         };
@@ -34447,7 +34782,7 @@
           sha256 = "1i95b15mvkkki2iq8hysdr7jr1d5nix9jjkh7jz0alvaybqlsnqi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markup";
           sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf";
           name = "markup";
         };
@@ -34468,7 +34803,7 @@
           sha256 = "1w6i1m7xdr9cijnmdj35cl99r12vl83qws0qlfhrgvisilshnr27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markup-faces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markup-faces";
           sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
           name = "markup-faces";
         };
@@ -34489,7 +34824,7 @@
           sha256 = "1ygznmqb3fqy94p8qi71i223m7cpw3f596pkls2ybjlbpb4psjcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marmalade";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marmalade";
           sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
           name = "marmalade";
         };
@@ -34510,7 +34845,7 @@
           sha256 = "017k109nfif5mzkj547py8pdnzlr4sxb74yqqsl944znflq67blr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marmalade-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marmalade-client";
           sha256 = "0llwqwwxrf7qdkpdb03ij0iinll0vc9qr557zyr3bn5zb4fad1sq";
           name = "marmalade-client";
         };
@@ -34531,7 +34866,7 @@
           sha256 = "0fwhhzfd6vgpaf5mrw90hvm35j2kzhk9h3gbrwd7y7q08nrmsx9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marshal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marshal";
           sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
           name = "marshal";
         };
@@ -34544,15 +34879,15 @@
     material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "material-theme";
-        version = "20160118.1237";
+        version = "20160120.303";
         src = fetchFromGitHub {
           owner = "cpaulik";
           repo = "emacs-material-theme";
-          rev = "35ad0e9f2e8c52c738b1fc2bf3eb6910402c87e3";
-          sha256 = "0n3gc90cgqbdcfml5zhvlpkfxczb0xhgxqxgd1ghcyxgsfzafbqh";
+          rev = "204abe37742a52eaf2775279d56e38bf163b2327";
+          sha256 = "0627kpc03hwa489d6bsfls8jc67f31m4m167748g12w07rswb7ba";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/material-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/material-theme";
           sha256 = "1d259avldc5fq121xrqv53h8s4f4bp6b89nz2rvjhygz7f8hargq";
           name = "material-theme";
         };
@@ -34573,7 +34908,7 @@
           sha256 = "186gb83y3g1q7d0sdrxqz22nr62qq6fy7m74qwirlsf7vnnm4gpx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/math-symbol-lists";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/math-symbol-lists";
           sha256 = "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27";
           name = "math-symbol-lists";
         };
@@ -34594,7 +34929,7 @@
           sha256 = "1chyxi096krjbi9zgbrnrkvwgmn4wygnia9m57m0jh4arlbm28la";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/math-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/math-symbols";
           sha256 = "0sx9cgyk56npjd6z78y9cldbvjl5ipl7k1nc1sylg1iggkbwxnqx";
           name = "math-symbols";
         };
@@ -34614,7 +34949,7 @@
           sha256 = "694652e361b9d15a3f1542d45b43c6516f20030dbaa8a058b5fdb4c833885465";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/matlab-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/matlab-mode";
           sha256 = "06s7mrbfbkk6baf8j1vc26nb2bg3ma1n7d297zqz8ay90cv81y76";
           name = "matlab-mode";
         };
@@ -34627,14 +34962,14 @@
     matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
     melpaBuild {
         pname = "matrix-client";
-        version = "20160116.2145";
+        version = "20160118.1725";
         src = fetchgit {
           url = "git://fort.kickass.systems/personal/rrix/pub/matrix.el";
-          rev = "7ee66597688fb3b664d0544a6c53f91d5ca5303d";
-          sha256 = "08d15d06b7b18c7b00cb02dc4107b38a40898ea52b8353084d9e1ebc8c2da322";
+          rev = "421ad8ebf3858acc99634a4cca442c57ca2b3707";
+          sha256 = "34e1f7bd0c4ab21b2b0ca6d2a6ba83c9a1a5591e9de9ceb1c5f8fe06a4738acb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/matrix-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/matrix-client";
           sha256 = "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6";
           name = "matrix-client";
         };
@@ -34654,7 +34989,7 @@
           sha256 = "06k07qvhm2mbqasn72649lx3pwzb0r466854a18g6lciwhiww7vy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maude-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maude-mode";
           sha256 = "04b6q328hj0w33z4c50nqyark0pn5sqi0s8096m9di4rjwxaw0ma";
           name = "maude-mode";
         };
@@ -34675,7 +35010,7 @@
           sha256 = "1xn2yyr8mr90cynbxgv0h5v180pzf0ydnjr9spg34mrdicqlki6c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maven-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maven-test-mode";
           sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
           name = "maven-test-mode";
         };
@@ -34696,7 +35031,7 @@
           sha256 = "0g9kpsg6623nmxnshj49q8k952xybrkmqqy6m892m8wnm22pjdz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maxframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maxframe";
           sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
           name = "maxframe";
         };
@@ -34714,7 +35049,7 @@
           sha256 = "0w8clp96jblsc9v87404zpc280ms0d644in34jdgjc5r33f4i0g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mb-depth+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mb-depth+";
           sha256 = "031hh227rh7l818p3di4h34i4698yynw5g9a5sl2hj47c0734q6w";
           name = "mb-depth-plus";
         };
@@ -34735,7 +35070,7 @@
           sha256 = "1qd4vya49sy7iwcpnyd91d0zx3niwsavhdcq6387rsb0j64hwybl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mb-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mb-url";
           sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
           name = "mb-url";
         };
@@ -34756,7 +35091,7 @@
           sha256 = "1zywygdgnp2zr8fxqhl0cbrgbl43931k936b9imhqi96p6622pb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mbe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mbe";
           sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
           name = "mbe";
         };
@@ -34777,7 +35112,7 @@
           sha256 = "1vr85fdlb4zwgid1v00ndppla9fqqk25g2x2f5alm69pfqssr75z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mbo70s-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mbo70s-theme";
           sha256 = "1abx2rw09xxp122ff7i9sry5djd4l6vn4lfzxs92rknjzkyc40pb";
           name = "mbo70s-theme";
         };
@@ -34798,7 +35133,7 @@
           sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mc-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mc-extras";
           sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
           name = "mc-extras";
         };
@@ -34819,7 +35154,7 @@
           sha256 = "1j8gp3byanf1mq8sc4hv838rgcywlv35d8q1vjwzsjaznvz8hvc3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/md-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/md-readme";
           sha256 = "1krq0f79jjrlihr2aqq87pxdqixv2zdjw4hm732sz79g996yxyw3";
           name = "md-readme";
         };
@@ -34840,7 +35175,7 @@
           sha256 = "136lh39hakwx46rd1gsmsfhsj78mrpamid766v2vjx9rkkprk0zv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/meacupla-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/meacupla-theme";
           sha256 = "09q88q2xghj5vn5y3mjrcparfwdzavkgjyg2ay55h7wf5f2zpw2d";
           name = "meacupla-theme";
         };
@@ -34853,15 +35188,15 @@
     mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mediawiki";
-        version = "20150711.1934";
+        version = "20160123.2037";
         src = fetchFromGitHub {
           owner = "hexmode";
           repo = "mediawiki-el";
-          rev = "47875f753599e309f1c3da5beb4805487ab75636";
-          sha256 = "1cdr5p9x9bxnfy9mgz7l70zfzfwcjdhydw0jhdvs6qlqaqmm4qqq";
+          rev = "e5e2905f1f81228c34f7ce531246bbdc07c5122c";
+          sha256 = "0f0p6ppgj1w0gfyja9hbah6wsw7glx9ybpbs6kn7lwm0ir9rd33s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mediawiki";
           sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
           name = "mediawiki";
         };
@@ -34882,7 +35217,7 @@
           sha256 = "0bilwhvprzk634sk5hnxilrvrl0yv593swzznch0p38hqxl585ld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mellow-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mellow-theme";
           sha256 = "0kl1psykx7akxwabszk4amszh3zil8ia4bfbjjvr6h9phgx66pb0";
           name = "mellow-theme";
         };
@@ -34903,7 +35238,7 @@
           sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/melpa-upstream-visit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/melpa-upstream-visit";
           sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
           name = "melpa-upstream-visit";
         };
@@ -34924,7 +35259,7 @@
           sha256 = "0pjqax3pi6pb650yb8iwa4brwwl6cdka7jym3cfkpppyy782dm0q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/memento";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/memento";
           sha256 = "0f8ajhj677r2kxszmad6h1j1b827ja0vaz2my1vx145y3gf160b8";
           name = "memento";
         };
@@ -34945,7 +35280,7 @@
           sha256 = "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/memoize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/memoize";
           sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6";
           name = "memoize";
         };
@@ -34966,7 +35301,7 @@
           sha256 = "1jd4rjv812iv7kp4wyxdz8sk7j0442m8x2ypk6hiqis0braxnspm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/memolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/memolist";
           sha256 = "1whajbwmz1v01dirv795bhvs27vq9dh0qmj10dk2xia7vhn42mgh";
           name = "memolist";
         };
@@ -34987,7 +35322,7 @@
           sha256 = "11hyydc13jdai6lkxx8nqf8xljh0gx7fcmywhik4f1hf3pdv7i2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mentor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
           name = "mentor";
         };
@@ -35005,7 +35340,7 @@
           sha256 = "1i96s0z0q9z2ws2b1lz1n50j6hih9y4rsy7mwx0k8a4ikll0gx82";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/menu-bar+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/menu-bar+";
           sha256 = "181jxjnzdckmvpsdknhm21xwimvsp0qxn8azfn58dz41gl4xcg90";
           name = "menu-bar-plus";
         };
@@ -35022,11 +35357,11 @@
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "969a01386f78b39432b1decacaac5ba0e48c85f2";
-          sha256 = "18gcqs9ds1afm11p78x5l9mqizlrq4cf4slapzwm2fmwbb1wf69x";
+          rev = "a532512e15b10d04ffd8281ac5406160f2764005";
+          sha256 = "1amb375dpy5al1ddh2ln9l1lw6xqfjigld6y5k7vvh730zild824";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/merlin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/merlin";
           sha256 = "0wnh7512sknagdk56j6gd8vamh9ns3vnggm56s73pik0m009w0xr";
           name = "merlin";
         };
@@ -35044,7 +35379,7 @@
           sha256 = "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/message-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/message-x";
           sha256 = "0z12alizwrqp5f9wq3qllym9k5xljh904c9qhlfhp9biazj6yqwj";
           name = "message-x";
         };
@@ -35065,7 +35400,7 @@
           sha256 = "1x425ah3ymjyp3pxvyzyp4gd8zrjx8lgdzprml8qvf1yk82iv45l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/meta-presenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/meta-presenter";
           sha256 = "0f70cfa91wavchlx8d9hdlgq90cmnylhbg2dbw603rzjkyvslp5d";
           name = "meta-presenter";
         };
@@ -35075,6 +35410,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    metafmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "metafmt";
+        version = "20160127.359";
+        src = fetchFromGitHub {
+          owner = "lvillani";
+          repo = "metafmt";
+          rev = "19dc36b3d085bba6f8e59ddbb1cbb7e2c085c461";
+          sha256 = "0zxal6alf99a2zfzizckibp5iwdk9kklfhml2r0r3wfvswb0rb3z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metafmt";
+          sha256 = "0vx1xrjr10nd90cr6ppgd3kc3c8bhkg3m4clnb50zagkpfqsy9ma";
+          name = "metafmt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/metafmt";
+          license = lib.licenses.free;
+        };
+      }) {};
     metascript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "metascript-mode";
@@ -35086,7 +35442,7 @@
           sha256 = "1rascpmv17dksyn9y0llmjb8r4484x5ax54w6r83k1x7ha1iacx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/metascript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metascript-mode";
           sha256 = "1kgs4ki0s6bxx2ri6zxmsy2b2w56gnr9hjkr6302wcmp3qy7clwn";
           name = "metascript-mode";
         };
@@ -35107,7 +35463,7 @@
           sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/metaweblog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metaweblog";
           sha256 = "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y";
           name = "metaweblog";
         };
@@ -35128,7 +35484,7 @@
           sha256 = "1rkipcv53p7zra3gbjc77ywyxn8d1kx2gniyfqq16d2p2jw0lbzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mew";
           sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
           name = "mew";
         };
@@ -35149,7 +35505,7 @@
           sha256 = "0bhllmyk1r9y63jw5gx10v09791w33lc54qs31gcxbnss094l6py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mexican-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mexican-holidays";
           sha256 = "0awf4vv6mbp1xr92nsgdn513g4adqhp21k12q4fbm85b2l3jlspb";
           name = "mexican-holidays";
         };
@@ -35162,15 +35518,15 @@
     mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mhc";
-        version = "20151210.238";
+        version = "20160129.141";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "mhc";
-          rev = "0204160474bdb01e62c89364b5f720b2c42afb0d";
-          sha256 = "0z34x254z79acslxzn35mg9nsxh0cpmb540k90vlp7am7g4d4sra";
+          rev = "79b0208995c37c5b81b40dc60630ebce63688ed2";
+          sha256 = "0dbchc5l6cv4hjrdshd68jhhwjzswwyhsl20q102kvj4l8n0sncz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mhc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mhc";
           sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
           name = "mhc";
         };
@@ -35188,7 +35544,7 @@
           sha256 = "1ibim60fx0srmvchwbb2s04dmcc7mv7zyg1vqavas24ya2gmixc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mic-paren";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mic-paren";
           sha256 = "1kdmp0wd7838nk58lby8gx91pjan47lq3izk4vdb2vm0h0iq57sa";
           name = "mic-paren";
         };
@@ -35209,7 +35565,7 @@
           sha256 = "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/midje-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/midje-mode";
           sha256 = "0069hwy5cyrsv5b1yvjhmjasywbmc8x3daq9hkzidy3a2fmqgqv3";
           name = "midje-mode";
         };
@@ -35230,7 +35586,7 @@
           sha256 = "0f3iq4ghi4ig2by1smfciavr2f0lx6vhvajykxdfs0afn006w4cs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/midje-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/midje-test-mode";
           sha256 = "0i5j9bnrncxar8hpy3d0566d0y5s4ywakskf27d3kxfyrwqi4l4f";
           name = "midje-test-mode";
         };
@@ -35251,7 +35607,7 @@
           sha256 = "1az4mnmanhz9ga0g46jf33w8axcw8lnrb9lmszajwv7y5j9nk7yr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/migemo";
           sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
           name = "migemo";
         };
@@ -35272,7 +35628,7 @@
           sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/milkode";
           sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
           name = "milkode";
         };
@@ -35292,7 +35648,7 @@
           sha256 = "1b2kn4c90hl07lzdg10wamd4lq8f24wmaj4zvr728pwyga99b2av";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minesweeper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minesweeper";
           sha256 = "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag";
           name = "minesweeper";
         };
@@ -35313,7 +35669,7 @@
           sha256 = "0r4jh58pls859fljb6qm49l4imfxxif9mxsmjgwan0czfhq33xqh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mingus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mingus";
           sha256 = "0vw09qk56l792706vvp465f40shf678mcmdh7iw8wsjix4401bzi";
           name = "mingus";
         };
@@ -35334,7 +35690,7 @@
           sha256 = "1n4b039448826w2jcsv4r2iw3v2vlrsxw8dbci8wcfigmkbfc879";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuf-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuf-isearch";
           sha256 = "0n36d152lc53zj9jy38b0c7hlww0z6hx94y3x2njy6cmh3p5g8nh";
           name = "minibuf-isearch";
         };
@@ -35355,7 +35711,7 @@
           sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuffer-complete-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuffer-complete-cycle";
           sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
           name = "minibuffer-complete-cycle";
         };
@@ -35376,7 +35732,7 @@
           sha256 = "011kg76zr4hfhi2gngnc7jlmp0l0nvhmlgyc0y9bir2jbjf4yyvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuffer-cua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuffer-cua";
           sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
           name = "minibuffer-cua";
         };
@@ -35397,7 +35753,7 @@
           sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/miniedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/miniedit";
           sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
           name = "miniedit";
         };
@@ -35418,7 +35774,7 @@
           sha256 = "1sj5sq932w079y3vy55q5b6wybwrzz30y092iq1mpfg5xvl42sbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minimal-session-saver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minimal-session-saver";
           sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
           name = "minimal-session-saver";
         };
@@ -35439,7 +35795,7 @@
           sha256 = "1iy1z2kwnbzxhz5r4gsy4zm0l3xbwy314dqxliprbl8n2m9w0lmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minimal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minimal-theme";
           sha256 = "0l4xj5q06h5fk634d6v3idm0zniq8grz4rjm6qzi7b4jr9sc60gm";
           name = "minimal-theme";
         };
@@ -35460,7 +35816,7 @@
           sha256 = "08sy08bzn2as4n6jydrzvn0h0xahyihr2snfr3ps25gkfwxsk4aq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minitest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minitest";
           sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
           name = "minitest";
         };
@@ -35481,7 +35837,7 @@
           sha256 = "0808cl5ixvmhd8pa6fc8rn7wbxzvqjgz43mz1pambj89vbkzmw1c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minizinc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minizinc-mode";
           sha256 = "1blb6mbyqvmdvwp477p1ggs3n6rzi9sdfvi0v1wfzmd7k749b10c";
           name = "minizinc-mode";
         };
@@ -35499,7 +35855,7 @@
           sha256 = "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minor-mode-hack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minor-mode-hack";
           sha256 = "1f2wy25iphk3hzjy39ls5j04173g7gaq2rdp2grkawfhwx0ld4pj";
           name = "minor-mode-hack";
         };
@@ -35520,7 +35876,7 @@
           sha256 = "12k9ii4090dn03xvgqisl4zl4qi33054zxyfkqzzpa9wv72h4knc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mip-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mip-mode";
           sha256 = "1wx5zg4kimd29vqipbzm4vjphn0mldri12g6b18kc290nhgj22ar";
           name = "mip-mode";
         };
@@ -35538,7 +35894,7 @@
           sha256 = "0sc4l0prwmakxmdq22xd5mj8ddwhzrs034zmx2swi2k3s07x15id";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/misc-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/misc-cmds";
           sha256 = "0bylb84icddgznmim18fwq1mhh3qz8yh8ch6lpadf9p3h420qgcl";
           name = "misc-cmds";
         };
@@ -35556,7 +35912,7 @@
           sha256 = "1mksmxy741sv7d5lr9wlj4klb0sg06bg5z1zpd5hj0bd4b3mx7x0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/misc-fns";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/misc-fns";
           sha256 = "1spjbkcac33lyfsgkd6z186a3432x9nw3akmx194gaap2863xcam";
           name = "misc-fns";
         };
@@ -35577,7 +35933,7 @@
           sha256 = "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mkdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mkdown";
           sha256 = "1b2vi8q6jhq1xv7yr5f3aiyp1w8j59w19vxys0pv6bqr2gra07i1";
           name = "mkdown";
         };
@@ -35598,7 +35954,7 @@
           sha256 = "1lcc2p9qz70kpykgx82isv0qiqlsajp4vvcj6bvag92d7h9yk9bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-jinja2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-jinja2";
           sha256 = "0579sv77dyzishhcw4xxi444inwy4jgh9vmxwd856nd05j3cyc7z";
           name = "mmm-jinja2";
         };
@@ -35618,7 +35974,7 @@
           sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-mako";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-mako";
           sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
           name = "mmm-mako";
         };
@@ -35639,7 +35995,7 @@
           sha256 = "04rapmqblfjvmdccm9kqi8gn0him1x2q7hjwsyb8mg4lwxcd7qp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-mode";
           sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
           name = "mmm-mode";
         };
@@ -35660,7 +36016,7 @@
           sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmt";
           sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
           name = "mmt";
         };
@@ -35673,15 +36029,15 @@
     mo-git-blame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mo-git-blame";
-        version = "20151127.215";
+        version = "20160129.1159";
         src = fetchFromGitHub {
           owner = "mbunkus";
           repo = "mo-git-blame";
-          rev = "a0b9ca186d96ef02a5c0ab5d1c29b7a71e78af68";
-          sha256 = "1ydv6z0nns3cc3bxb1r7052dck66y4v201ms2bzichmd351qhv6q";
+          rev = "254a675eb794cdbbdef9fa2b4b7bb510b70089c0";
+          sha256 = "1dh92hzpicfvrlg6swrw4igwb771xbsmsf7hxp1a4iry4w8dk398";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mo-git-blame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mo-git-blame";
           sha256 = "1dp9pxhggappb70m5hyp8sxlnh06y996adabq7x6qvm745mk6f0x";
           name = "mo-git-blame";
         };
@@ -35702,7 +36058,7 @@
           sha256 = "0k0scl9z35d8x4ikxm2db1frpbx151p2m181fa1armxbd9lbfvnn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mo-vi-ment-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mo-vi-ment-mode";
           sha256 = "1pg889mgpv0waccm135mlvag7q13gzfkzchv2532jngwrn6amqc7";
           name = "mo-vi-ment-mode";
         };
@@ -35723,7 +36079,7 @@
           sha256 = "04hbd7mv29v3fv4ld0b3skrir0wp9dix2n5nbqp63fj6n5i4cyyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mobdebug-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mobdebug-mode";
           sha256 = "19k0c7igqsqvib6hx0nssig4l5f959dlr4wijd1hp5h1hmcb5vv8";
           name = "mobdebug-mode";
         };
@@ -35733,6 +36089,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mocha = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mocha";
+        version = "20160203.1808";
+        src = fetchFromGitHub {
+          owner = "scottaj";
+          repo = "mocha.el";
+          rev = "811772fd498c7cff4c25ba4a6977973d8187e23c";
+          sha256 = "1jyqj7qdpaf0p8d7csc24ch0kgg3vfigadn118gh84xvr1brvvwk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocha";
+          sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx";
+          name = "mocha";
+        };
+        packageRequires = [ js2-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/mocha";
+          license = lib.licenses.free;
+        };
+      }) {};
     mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "mocha-snippets";
@@ -35744,7 +36121,7 @@
           sha256 = "06c92q1wrj6b8d8k7i10d4gcy5liag3x4f4chh510c4d3wi0f6sp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mocha-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocha-snippets";
           sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds";
           name = "mocha-snippets";
         };
@@ -35765,7 +36142,7 @@
           sha256 = "0dngznaraphpc5amn9n120la7ga3rj7h67pnnal6qwflh5rqcmss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocker";
           sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
           name = "mocker";
         };
@@ -35778,15 +36155,15 @@
     modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "modalka";
-        version = "20150924.1111";
+        version = "20160122.633";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "modalka";
-          rev = "67e08b9d315cfa6a2ca3b3dc3954214c68a90cf5";
-          sha256 = "04c7js9jfhzcak9rgzqh1lq56i2b1g4phwjncsxkirvx97rnz4ac";
+          rev = "5a1e914bb76dfde539df26f3108793bba98bd4f9";
+          sha256 = "0r24186d1q9436h3qhqz1z8q978d01an0dvpvzirf4x9ickrib3k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modalka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modalka";
           sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
           name = "modalka";
         };
@@ -35799,14 +36176,14 @@
     mode-icons = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mode-icons";
-        version = "20130602.748";
+        version = "20160125.1221";
         src = fetchgit {
           url = "git://ryuslash.org/mode-icons.git";
-          rev = "cbf412d0c47dfdbeac7587a0c12c96f58f546467";
-          sha256 = "b7afff1d8fb0b3f044d266af479df51fbb6021ff433628a9dc669695c1ddae40";
+          rev = "1b8249cad9723c467ccc9e6c25fad4c260900d1f";
+          sha256 = "5d599c604623b33ac1d332c54c4eca5587c58528bd93d14bdd0c342ee306936b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mode-icons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mode-icons";
           sha256 = "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp";
           name = "mode-icons";
         };
@@ -35827,7 +36204,7 @@
           sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mode-line-debug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mode-line-debug";
           sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
           name = "mode-line-debug";
         };
@@ -35845,7 +36222,7 @@
           sha256 = "1dlprk1jlfw7b7vnxi0d0mf85737wkjc5fkvycx8nawngb2fqhbw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modeline-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modeline-char";
           sha256 = "1cb6pm69db0jbksmc4mkawf643i74is9v7ka34pv3mb21nj095qp";
           name = "modeline-char";
         };
@@ -35863,7 +36240,7 @@
           sha256 = "1r4zq355h570hk7qq0ik121bwsr4hjnhacal4d4h119d11gq2p8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modeline-posn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modeline-posn";
           sha256 = "0dngfcbcdh22fl6nd47dhg9z9iivj67six67zjr9j1cbngp10dwk";
           name = "modeline-posn";
         };
@@ -35884,7 +36261,7 @@
           sha256 = "0ri841cwx2mx8ri50lhvifmxnysdc022421mlmklql0252kn775l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modtime-skip-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modtime-skip-mode";
           sha256 = "1drafwf4kqp83jp47j2ddl2n4a92zf1589fnp6c72hmjqcxv3l28";
           name = "modtime-skip-mode";
         };
@@ -35905,7 +36282,7 @@
           sha256 = "0dyp8jpznb9ivzkka2cgydzcldc275238p0f1c9pcrxjf7mjglmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moe-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moe-theme";
           sha256 = "1nqvj8spvffgjvqlf25rcm3dc6w1axb6qlwwsjhq401a6xhw67f6";
           name = "moe-theme";
         };
@@ -35926,7 +36303,7 @@
           sha256 = "1hqa59pdrnwfykyl58lr8pfbh2f13sygvmrh707hbwc2aii0jjv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/molokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/molokai-theme";
           sha256 = "0srdh3yx7j6xs7rgpzmsyzz6ds00kq887rs2sfa0nvk0j0ga6baf";
           name = "molokai-theme";
         };
@@ -35947,7 +36324,7 @@
           sha256 = "0z8mcfhj425hb91fkj1pyg3apw1kf4mgy8lx6n1sc8zmib38py0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mongo";
           sha256 = "103zkslqdihjyl81688fvkq96rzk3an1vf3gz8rlmmz5anbql8ai";
           name = "mongo";
         };
@@ -35968,7 +36345,7 @@
           sha256 = "0ddkcb5rzpcqpsrwkhvm9kzpx2mlrrsp7psljkz5q5qfvy3wdagh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monky";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monky";
           sha256 = "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz";
           name = "monky";
         };
@@ -35989,7 +36366,7 @@
           sha256 = "1sxhpvxapzgrwvzibkg7zd3ppmfcz5rhrbvg73b8rggjg4m5snyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monochrome-theme";
           sha256 = "191ikqns1sxcz6ca6xp6mb2vyfj19x19cmcf17snrf46kmx60qk9";
           name = "monochrome-theme";
         };
@@ -36010,7 +36387,7 @@
           sha256 = "0rszr7p5v47s66kj872mz68apkbykhl51lp4v1apwj1ay32lbx9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monokai-theme";
           sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
           name = "monokai-theme";
         };
@@ -36031,7 +36408,7 @@
           sha256 = "1z1gyknxscvk2qpfcrgzymf9w5m8jcnj525q852b8s6yf5fnffmh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monroe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monroe";
           sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
           name = "monroe";
         };
@@ -36052,7 +36429,7 @@
           sha256 = "1ndgw4799d816pkn2bwja5kmigydpmj9znn8cax4dxsd9fg2hzjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/morlock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/morlock";
           sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
           name = "morlock";
         };
@@ -36065,15 +36442,15 @@
     mote-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "mote-mode";
-        version = "20121014.2319";
+        version = "20160122.1829";
         src = fetchFromGitHub {
           owner = "inkel";
           repo = "mote-mode";
-          rev = "18dfc3af0cee7d6d522616f07134364c1c3e54ba";
-          sha256 = "1hz9vqvhyz2zw5sl4r62rjxiymqlp9y26j4kdd9qy1y67zx9rmi7";
+          rev = "666c6641addbd3b337a7aa01fd2742ded2f41b83";
+          sha256 = "10mf96r75558scn71pri71aa8nhp6hmnb5rwjxlh5dlf80r5dfd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mote-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mote-mode";
           sha256 = "1lg5z5d0d35sh21maiwmgzvc31iki9yg6x0awy5xrfsains7ykn9";
           name = "mote-mode";
         };
@@ -36094,7 +36471,7 @@
           sha256 = "17570labnwdnwca2cg4ga0mrrm00n0h3wlxry823k5yn3k93rnj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/motion-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/motion-mode";
           sha256 = "1lfsc8ayiz2v3dfn8c0mmfch8vpzqyddxw8kscan2lzl2lcj50h0";
           name = "motion-mode";
         };
@@ -36112,7 +36489,7 @@
           sha256 = "0rakxcpqdx175hic3ykwbd5if53dvvf0sxhq0gplpsybpqvkimyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mouse+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mouse+";
           sha256 = "1fv7jnqzskx9iv92dm2pf0mqy2accl0svjl2kkb6v273n1day3f8";
           name = "mouse-plus";
         };
@@ -36133,7 +36510,7 @@
           sha256 = "05pzplb3gmlnlvn2azbxdlf4vrkvk8fc9dkgi2nq4shysnh4c9v7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mouse-slider-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mouse-slider-mode";
           sha256 = "0aqxjm78k7i8c59w6mw9wsfw3rail1pg40ac1dbcjkm62fjbh5hy";
           name = "mouse-slider-mode";
         };
@@ -36151,7 +36528,7 @@
           sha256 = "1831jpi06hi5v2jdjgs83jma7fp8xiqdmvvwxfyp2zpbfwi1lkb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mouse3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mouse3";
           sha256 = "1rppn55axjpqwqm2lq4dvwi3z7xkd5jkyqi1x8jqgcsfc9w6m777";
           name = "mouse3";
         };
@@ -36172,7 +36549,7 @@
           sha256 = "0baynb6gq04rxh10l6rn0myrhg7c7fwqaryiiyddp4jy7llf83c8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/move-dup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/move-dup";
           sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
           name = "move-dup";
         };
@@ -36190,7 +36567,7 @@
           sha256 = "0azda60cbz3kpvy6zd7pvlj40iwvj1zjdxv1brzqa6yfa4kyixv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/move-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/move-text";
           sha256 = "1xgq7wsh08fb23zv71lfw5rska9wijsl64ijpi2m06zyw1m7mdqr";
           name = "move-text";
         };
@@ -36211,7 +36588,7 @@
           sha256 = "179mc70x3dvj0cz6yyhs00ndh0xvk71gmiscln9y0f1ngxr5h338";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mowedline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mowedline";
           sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
           name = "mowedline";
         };
@@ -36232,7 +36609,7 @@
           sha256 = "1g06i3d8xv8ja6nfww4k60l3467xr1s9xsk7i6dbicq0lf8559h9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moz";
           sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
           name = "moz";
         };
@@ -36253,7 +36630,7 @@
           sha256 = "0fssn33ld6xhjlwg1dbrjg8sa0pjmglq0dw792yrmvm4fj0zjph8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moz-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moz-controller";
           sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
           name = "moz-controller";
         };
@@ -36295,7 +36672,7 @@
           sha256 = "03j5fy2xw204807wi7ivwcqlgkh1f7msshh5yrk6c7qdpp08062r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mozc-im";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mozc-im";
           sha256 = "1gqzmm712npj36qfi506zgl0ycd6k7l5m46c7zz2z2lb6jpssw10";
           name = "mozc-im";
         };
@@ -36316,7 +36693,7 @@
           sha256 = "1mbpkjc6sk7qqmgsmr5a5l2ycwnqp8bkwgikdavgs6hnal10bkmn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mozc-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mozc-popup";
           sha256 = "1n43lwflxzzyskxgzg19rg3hiqqkf5l7vfgaydryf4sk8480x687";
           name = "mozc-popup";
         };
@@ -36337,7 +36714,7 @@
           sha256 = "11c8pr3s77aq34ic32lnsialwh8bw3m78kj838xl2aab2pgrlny2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mpages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mpages";
           sha256 = "11scjjwwrpgaz6i4jq9y7m864nfak46vnbfb0w15625znz926jcs";
           name = "mpages";
         };
@@ -36358,7 +36735,7 @@
           sha256 = "09731mwm23b6ic53366lnxy2p7dfd245yh75gaf6ijfa22jks7gb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mpg123";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mpg123";
           sha256 = "184ip9pvv4zkfxnrzxbfajjadc9f4dz4psn33f9x3sfh7s1y4nw8";
           name = "mpg123";
         };
@@ -36379,7 +36756,7 @@
           sha256 = "193j90sgn1zgl00mji86wll4djj57vk5arhwbmhhf5b1qx3wpbhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mpv";
           sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
           name = "mpv";
         };
@@ -36400,7 +36777,7 @@
           sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/msvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/msvc";
           sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
           name = "msvc";
         };
@@ -36410,6 +36787,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mu-cite = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mu-cite";
+        version = "20160130.500";
+        src = fetchFromGitHub {
+          owner = "ksato9700";
+          repo = "mu-cite";
+          rev = "aea3c2d01eb3284d5e0124059d368e8c6b6ffddc";
+          sha256 = "1gxspy50gh7j4sysvr17fvvp8p417ww39ii5dy0fxncfwczdsa19";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu-cite";
+          sha256 = "0ap21sw4r2x774q2np6rhrxh2m2rf3f6ak3k71iar159chx32y6q";
+          name = "mu-cite";
+        };
+        packageRequires = [ flim ];
+        meta = {
+          homepage = "http://melpa.org/#/mu-cite";
+          license = lib.licenses.free;
+        };
+      }) {};
     mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "mu4e-alert";
@@ -36421,7 +36819,7 @@
           sha256 = "065pncwj0sgiacn24c4pimcw325xc7wncbq0s1rrgq0920dxc9rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mu4e-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu4e-alert";
           sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
           name = "mu4e-alert";
         };
@@ -36434,15 +36832,15 @@
     mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mu4e-maildirs-extension";
-        version = "20151126.1126";
+        version = "20160126.239";
         src = fetchFromGitHub {
           owner = "agpchil";
           repo = "mu4e-maildirs-extension";
-          rev = "17eacf2d0b3a57ebf26a6aaa9eeb51d579457d25";
-          sha256 = "0hbgzvybd04s9fz9myrs68ic2v0kks3wpv8qj14ihrnl7xh03rfh";
+          rev = "f759dff954e09ab2952decac4d39bb7e5b7e399d";
+          sha256 = "1cvpzs65fjmhdza1vi2lpk68vkvivb0igrpgm42andi42gc6k50b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mu4e-maildirs-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu4e-maildirs-extension";
           sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
           name = "mu4e-maildirs-extension";
         };
@@ -36463,7 +36861,7 @@
           sha256 = "0f5hc6mgq0hg1wwnvqd4fp7ck58lcavvgqjggz9zlhrjgkmynjxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi";
           sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
           name = "multi";
         };
@@ -36476,15 +36874,15 @@
     multi-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multi-compile";
-        version = "20151111.1640";
+        version = "20160204.1541";
         src = fetchFromGitHub {
           owner = "ReanGD";
           repo = "emacs-multi-compile";
-          rev = "61a4a7b35cd78773305150f533f51587367378db";
-          sha256 = "004c4fbf5rrxvs01imv43lwvw5k9ndk02mk29q0w45s230gfca8x";
+          rev = "7bbd1e84a4ed411fed77007ebae0fa7d870be75e";
+          sha256 = "0bayjp60lzv2ay34k9yvx46vyk5ffnivrlvb3hw1kfpwyw46fww6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-compile";
           sha256 = "16fv0hpwcjw1771zlbgznph0fix9fbm6yqj2rcz1f9l26iih6apz";
           name = "multi-compile";
         };
@@ -36502,7 +36900,7 @@
           sha256 = "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-eshell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-eshell";
           sha256 = "1i0mvgqxsc99dwp9qcdrijqxsxflrbxw846rgw89p1jfs8mp4l7d";
           name = "multi-eshell";
         };
@@ -36523,7 +36921,7 @@
           sha256 = "13rp6kbabjy9dy0x4696065yyaxlgmfnwcqq9vcw2jhbb2gl9gs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-line";
           sha256 = "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp";
           name = "multi-line";
         };
@@ -36543,7 +36941,7 @@
           sha256 = "0lcx73vzm7zwvzzc53pfb5y16bhvq9cm9fdy63d3242s8v834z3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-project";
           sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x";
           name = "multi-project";
         };
@@ -36561,7 +36959,7 @@
           sha256 = "062c52xd469jdmsq4fvdhsmgfjrlanv0bb1w5vglz7bsn68d2bim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-term";
           sha256 = "1va4ihngwv5qvwps3m9jj0150gbrmq3zllnyq1hbx5ap8hjrhvdx";
           name = "multi-term";
         };
@@ -36582,7 +36980,7 @@
           sha256 = "0mc4kkgwnwfk27wwc21nw5ly7qcsl7y5bd8wf2y8r6pxhvwran4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-web-mode";
           sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
           name = "multi-web-mode";
         };
@@ -36603,7 +37001,7 @@
           sha256 = "1ispa0wxpkydm0cyj4scyyacfrbilrip5v8bsrcqfc6qs597z8rf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multicolumn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multicolumn";
           sha256 = "1ylnc3s4ixvnqn7g2p6nzz8x29ggqc703waci430f1rp1lsd3q09";
           name = "multicolumn";
         };
@@ -36624,7 +37022,7 @@
           sha256 = "065l04ylplng1vgykkbn2vnkcs3sn1k2cikx1ha2q8wmgx6bkvai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multifiles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multifiles";
           sha256 = "0m0pi2qjis9p6z9cd8hlxm1r88ynwmd2ks8wg65sffffwsdbg4kz";
           name = "multifiles";
         };
@@ -36645,7 +37043,7 @@
           sha256 = "0hl9ll7pgqv74dnihyy0gz15wz0swj1cpa208484qd3g0dvin8j6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multiple-cursors";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multiple-cursors";
           sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
           name = "multiple-cursors";
         };
@@ -36666,7 +37064,7 @@
           sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustache";
           sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g";
           name = "mustache";
         };
@@ -36687,7 +37085,7 @@
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustache-mode";
           sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
           name = "mustache-mode";
         };
@@ -36708,7 +37106,7 @@
           sha256 = "19qd34dcfspv621p4y07zhq2pr8pwss3lcssm9sfhr6w2vmvgcr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustang-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustang-theme";
           sha256 = "0771l3x6109ki914nwpfz3fj7pbvpcg9vf485mrccq2wlxymr5dr";
           name = "mustang-theme";
         };
@@ -36729,7 +37127,7 @@
           sha256 = "170qhbbvcv9dg6jzfd9r95in5m8z1k647mn0gaqflfj0hvq5hwgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustard-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustard-theme";
           sha256 = "0izxhivhmv49dja4wy9n0ipd41xdzdza2ql7pfa7ny35ji5hskik";
           name = "mustard-theme";
         };
@@ -36739,6 +37137,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mutant = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mutant";
+        version = "20160124.753";
+        src = fetchFromGitHub {
+          owner = "p-lambert";
+          repo = "mutant.el";
+          rev = "aff50603a70a110f4ecd7142963ef719e8c11c06";
+          sha256 = "1faqbkff0v6pigsnnq2dxnzdra8q62cvlxigscwalwxd27bbz548";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mutant";
+          sha256 = "0m5l5r37zb0ig96757ldyl9hbb01lknzqf08ap6dsmdwr1zayvp1";
+          name = "mutant";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/mutant";
+          license = lib.licenses.free;
+        };
+      }) {};
     muttrc-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "muttrc-mode";
         version = "20090804.1752";
@@ -36747,7 +37166,7 @@
           sha256 = "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/muttrc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/muttrc-mode";
           sha256 = "0ym6rfrhrmpnlqhkxv9ck5893qm0yhswslvgc9vb4nl9hyc1b5jn";
           name = "muttrc-mode";
         };
@@ -36768,7 +37187,7 @@
           sha256 = "1gvn0a49lgbjnkl0j2sv4p9zdfqzj9s4jw0k2f4ypmsd1fc0q6d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mvn";
           sha256 = "1ykiz5fviq2n2474izwp0vvqanpbmxg7lzh1xbpn281kwmp0mwin";
           name = "mvn";
         };
@@ -36789,7 +37208,7 @@
           sha256 = "0qdlbyq47gr65yq5ri8s9lxw4wp9fmyqc2prkh560d4hkvw60aw3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mwe-log-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mwe-log-commands";
           sha256 = "05z2ax9mgyxldd3ds44xnh9f5w5q4ziy4rxmnfiqjykan2f5hnkn";
           name = "mwe-log-commands";
         };
@@ -36810,7 +37229,7 @@
           sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mwim";
           sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
           name = "mwim";
         };
@@ -36831,7 +37250,7 @@
           sha256 = "0cf0c9g9k2lk1ifi2dlw7c601sh1ycxf3fgl2hy5wliyd6l9rf86";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/myanmar-input-methods";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/myanmar-input-methods";
           sha256 = "1yg8zy2z18pbyr507ms2b162c0819rna1ilwyp6hb3iv2zjw45sd";
           name = "myanmar-input-methods";
         };
@@ -36852,7 +37271,7 @@
           sha256 = "0a9a6hmv8vjmp6h9mnzin9vc0sncg79v5z72pasvbrplfxijzan0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mykie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mykie";
           sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
           name = "mykie";
         };
@@ -36873,7 +37292,7 @@
           sha256 = "18ml0qz3iipm9w36zvwz77cbbrg885jgvzk6z4a33xcfp524xhma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mynt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mynt-mode";
           sha256 = "17s0wdwgh2dcpww6h3qszc9dcs7ki00xkyisvsfn4xqajrmmp75b";
           name = "mynt-mode";
         };
@@ -36894,7 +37313,7 @@
           sha256 = "0q5809hq22hyzxx5xr2hwwf3jh3qlpf3mkbl3fxqq93gm16plh1i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mysql2sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mysql2sqlite";
           sha256 = "1jblrbw4rq2jwpb8d1dyna0fiv52b9va3sj881cb17rqx200y3nd";
           name = "mysql2sqlite";
         };
@@ -36907,15 +37326,15 @@
     myterminal-controls = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "myterminal-controls";
-        version = "20150427.547";
+        version = "20160119.2230";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "myterminal-controls";
-          rev = "6b40d5f606dd402b80b7c93775bece1063cbf826";
-          sha256 = "0mnkhp286nrifxbrzp7lbmr4bccm7byh1f2zid4l1hac4x5wcx86";
+          rev = "d772b847442570f5fbfac1bd53184b7778361813";
+          sha256 = "18wqgjn38jxzsbivmf2fkcq3r1y4lffh3dbpv1jj7s9qn91pyp6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/myterminal-controls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/myterminal-controls";
           sha256 = "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2";
           name = "myterminal-controls";
         };
@@ -36936,7 +37355,7 @@
           sha256 = "1lp1bx9110vqzjww94va8pdks39qvqzl8rf0p8na1q0qn06rnk9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/n3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/n3-mode";
           sha256 = "0hasxq39phgyc259dgxskhqxjsp0yi98vx1bs8ynvwa26la4ddzh";
           name = "n3-mode";
         };
@@ -36957,7 +37376,7 @@
           sha256 = "1pd6c0jc1zxx3i3nk4qdx7gdf1qn8sc9jgqd72pkkpzvdwv998cp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/n4js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/n4js";
           sha256 = "0x7smxs91ffriyxx2df61fh1abpl39gqy4m62k77h7xb6fg7af6m";
           name = "n4js";
         };
@@ -36975,7 +37394,7 @@
           sha256 = "0zq13qjqfpxjba1bhdqqxkvgxq1dxyb7hd1bpnk6cbhsxr6mr50i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/naked";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/naked";
           sha256 = "06p6dzhn34dva3677mrvwq2a2x3bhw7f486y654hszla7i75pilq";
           name = "naked";
         };
@@ -36996,7 +37415,7 @@
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/name-this-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/name-this-color";
           sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
           name = "name-this-color";
         };
@@ -37017,7 +37436,7 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nameframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nameframe";
           sha256 = "0iq8cfii39ha8sxn9w7kyfvys8kwyax8g4l0pkl05q0a0s95padp";
           name = "nameframe";
         };
@@ -37038,7 +37457,7 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nameframe-perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nameframe-perspective";
           sha256 = "0wgr90m2pazc514slgdl1lin4mr3xxizasc82k7qinvdvdja515x";
           name = "nameframe-perspective";
         };
@@ -37059,7 +37478,7 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nameframe-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nameframe-projectile";
           sha256 = "11z64wy8mnnrjmgfs2sjbv3mh136aki8r5f89myx861nfx18hc3k";
           name = "nameframe-projectile";
         };
@@ -37080,7 +37499,7 @@
           sha256 = "13v0v90vrc2w0wi7wmzmpql6yjbr6lpzh29kxggq9fy38lahd3ks";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nameless";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nameless";
           sha256 = "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq";
           name = "nameless";
         };
@@ -37101,7 +37520,7 @@
           sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/names";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/names";
           sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
           name = "names";
         };
@@ -37122,7 +37541,7 @@
           sha256 = "157hhb253m6a9l5wy6x8w5ar3x0qz1326l7a0npxif6pma0dd140";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/namespaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/namespaces";
           sha256 = "02pb7762khxpah4q6xg8r7dmlv1kwyzinffi7pcaps6ycj29q2fr";
           name = "namespaces";
         };
@@ -37143,7 +37562,7 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nand2tetris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nand2tetris";
           sha256 = "1zg9xx7mj8334m2v2zqqfkr5vkj4dzqbj8y13qk6xhzb7qkppyqd";
           name = "nand2tetris";
         };
@@ -37164,7 +37583,7 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nand2tetris-assembler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nand2tetris-assembler";
           sha256 = "1761kgrflipxba8894cnx90ks7f3ba4nj6ci515zzxcx9s45mfyy";
           name = "nand2tetris-assembler";
         };
@@ -37184,7 +37603,7 @@
           sha256 = "1nzkamy53kl1g4y1jm7j5zgpkdsyg5ykp8zp1f0bg5mhy8mmf75w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nanowrimo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nanowrimo";
           sha256 = "1nhyj38qyn1x6a5rbrwhcxwfwzyqqjm3dvksdnmam6vfwn3s2r31";
           name = "nanowrimo";
         };
@@ -37205,7 +37624,7 @@
           sha256 = "0mxf61ky1dd7r2qd4j7k6bdppmkilkq5l9gv257a12539wkw5yq2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/naquadah-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/naquadah-theme";
           sha256 = "1aml1f2lgn530i86218nrc1pk3zw5n3qd2gw4gylwi7g75i0cqn1";
           name = "naquadah-theme";
         };
@@ -37223,7 +37642,7 @@
           sha256 = "1lyszm94pd3jxs73v7k0aaazm0sd2rpz2pphcdag7lk7k6vppd9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrow-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrow-indirect";
           sha256 = "10aq4gssayh3adw8yz2lza1xbypyffi8r03lsc0kiis6gd9ibiyj";
           name = "narrow-indirect";
         };
@@ -37244,7 +37663,7 @@
           sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrow-reindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrow-reindent";
           sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
           name = "narrow-reindent";
         };
@@ -37265,7 +37684,7 @@
           sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrowed-page-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrowed-page-navigation";
           sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
           name = "narrowed-page-navigation";
         };
@@ -37286,7 +37705,7 @@
           sha256 = "19v1qp4rzqvyzrk5zaxdjhki8cjl4fg6lr4ai3vi06yf62ds9mcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nasm-mode";
           sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
           name = "nasm-mode";
         };
@@ -37305,7 +37724,7 @@
           sha256 = "0kfqpji6z3ra8sc951vmm1bzyhkws7vb5q6djvl45wlf1wrgkc4p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nav";
           sha256 = "036lf6iirxamlqzq3w6m0hji36l480yx5c9wnwypms85hi8hq0vl";
           name = "nav";
         };
@@ -37326,7 +37745,7 @@
           sha256 = "07wjicbvzg7cz983hv0p2qw1qlln07djigkmbqfpwvg3fk50fdyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nav-flash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nav-flash";
           sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
           name = "nav-flash";
         };
@@ -37347,7 +37766,7 @@
           sha256 = "1yywbfa0syhb8zmn2qjjw2hxy7vz9ky3xd7kv3nz3gd2x989nb9a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navi-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navi-mode";
           sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
           name = "navi-mode";
         };
@@ -37368,7 +37787,7 @@
           sha256 = "15l2zmm8bp4ip8m1hfxkvswfwa29pg72kisfya2n5v900r184a4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navi2ch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navi2ch";
           sha256 = "13xwvyy27dz1abjkkazm3s1p6cw32l2klr1bnln02w0azkbdy7x3";
           name = "navi2ch";
         };
@@ -37389,7 +37808,7 @@
           sha256 = "0g7rmvfm0ldv0d2x7f8k761mgmi47siyspfi1ns40ijhkpc15x8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navorski";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navorski";
           sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
           name = "navorski";
         };
@@ -37410,7 +37829,7 @@
           sha256 = "0gbv5fv401z58ycbqlivqamf5kp3x6krhi36q7q0m4gvy448xz0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ncl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ncl-mode";
           sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9";
           name = "ncl-mode";
         };
@@ -37431,7 +37850,7 @@
           sha256 = "178gjv7kq97p9i4naxql7xabvmchw5x8idkpyjqqky3b24v5wkis";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nclip";
           sha256 = "016jp1rqrf1baxlxbi3476m88a0l3r405dh6pmly519wm2k8pipw";
           name = "nclip";
         };
@@ -37448,11 +37867,11 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "47840833c6a49d680127e6112848868879eeeb4d";
-          sha256 = "0nw13s51frvm5yhrbvhq0ns38cr9whqvacnn7xbbkm017rg4dhy7";
+          rev = "0be91a256921594bb81c76d813cd41a2a3a78ce7";
+          sha256 = "15akpl5b3k37hsiw364hn38901gplai6sjc1j563w8ygnfans6vn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nemerle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nemerle";
           sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6";
           name = "nemerle";
         };
@@ -37465,15 +37884,15 @@
     neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20160112.158";
+        version = "20160204.326";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "56ea48d0035daed7f6716dffcdfacbc9b9f13149";
-          sha256 = "0zr4lcbqd1fasx7h49klnbc1d8sv1nzhvv18jqqkkgkjq6q7bapf";
+          rev = "7ac86e96f1a0eb542ba38da741b4abd21312c7dd";
+          sha256 = "105a8qwhjaay2nfspp5zj227zkwl85ggymakgbqqf6gi0s789vyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/neotree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
           name = "neotree";
         };
@@ -37494,7 +37913,7 @@
           sha256 = "1kkflj2qnrn6kzh1l6bjl5n5507qilb22pqj3h0f2m6hfyn0sw5z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/netherlands-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/netherlands-holidays";
           sha256 = "181linsbg5wrx1z7zbj3in2d3d4zd2v7drspkj0b6l0c5yfxwayf";
           name = "netherlands-holidays";
         };
@@ -37515,7 +37934,7 @@
           sha256 = "0p00mmid04pfsna4ify3cy0b9lx431q1r5h772hihsg4f1rs2ppy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/never-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/never-comment";
           sha256 = "0sn8y57895bfpgiynnj4m9b3x3dbb9v5fwkcwmf9jr39dbf98v6s";
           name = "never-comment";
         };
@@ -37536,7 +37955,7 @@
           sha256 = "05jwaj7wlrdpmylawv14ypwpg9qz9pqqqd1nvb94b9gbs79j86z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/newlisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/newlisp-mode";
           sha256 = "0i2d2gyzzvpr5qm2cqzbn9my21lfb66315hg9fj86ac5pkc25zrd";
           name = "newlisp-mode";
         };
@@ -37557,7 +37976,7 @@
           sha256 = "1xnx6v49i6abzbhq4fl4bp9d0pp9gby40splpcj211xsb8yiry27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nexus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nexus";
           sha256 = "1mdphgsqg6n4hryr53rk42z58vfv0g5wkar5ipanr4h4iclkf5vd";
           name = "nexus";
         };
@@ -37578,7 +37997,7 @@
           sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nginx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nginx-mode";
           sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
           name = "nginx-mode";
         };
@@ -37599,7 +38018,7 @@
           sha256 = "147vw3qlsply5h8cjmjzqr5dv9jzf9xlmhjnmcpyb1r7krh1l8xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/niflheim-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/niflheim-theme";
           sha256 = "1dipxwaar7rghmz7s733v035vrbijcg1dla9f7cld1gkgiq9iq36";
           name = "niflheim-theme";
         };
@@ -37609,22 +38028,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    nim-mode = callPackage ({ emacs, epc, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
+    nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20160118.1138";
+        version = "20160202.2209";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "4aa694e25423fda22ebb21ae355ba2d4a7e08d07";
-          sha256 = "0l07wwzjj8479zyghh6dq454c62gxi0bxppwa43zmvfmk3zwcblx";
+          rev = "9e119eba89ad1574a129b7502d14237ec9f54825";
+          sha256 = "1wlfar160gs7ar6kl6and3jv8k75wj2f189ygbawyag4dyq5a9h2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nim-mode";
           sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
           name = "nim-mode";
         };
-        packageRequires = [ emacs epc let-alist ];
+        packageRequires = [ commenter emacs epc let-alist ];
         meta = {
           homepage = "http://melpa.org/#/nim-mode";
           license = lib.licenses.free;
@@ -37637,11 +38056,11 @@
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "19a3066bf76bd121ca39ca138577f90bea5a10a2";
-          sha256 = "1kfmf4dprg2zkmfkpyn0w9d18xz8v3hmmdkajmv14a6py1sjh14c";
+          rev = "8028e91a9dc90b51b4da7ded70cc38234ed62451";
+          sha256 = "0zkm6ddsrwbp2fvw80y6mgvihr24nvf1d6pjb784qvmil716fm3j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ninja-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ninja-mode";
           sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
           name = "ninja-mode";
         };
@@ -37658,11 +38077,11 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "d704abc0f33718e339562eea4cce565f8467ada3";
-          sha256 = "0gd592xvh7mr6h4gcdyfi03lg6ciml1spjpvrcbbkvxz7sdk6p3i";
+          rev = "c780c1124ec6711f09b9855c3b574b6655af6625";
+          sha256 = "1nps30kq70zy81690wsr80khaqgds0awx8hd7wzl6xcs56zjq07x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nix-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nix-mode";
           sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
           name = "nix-mode";
         };
@@ -37683,7 +38102,7 @@
           sha256 = "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nixos-options";
           sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
           name = "nixos-options";
         };
@@ -37704,7 +38123,7 @@
           sha256 = "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nm";
           sha256 = "004rjbrkc7jalbd8ih170sy97w2g16k3whqrqwywh09pzrzb05kw";
           name = "nm";
         };
@@ -37725,7 +38144,7 @@
           sha256 = "0gzxcq0gki89dz9ad26683zhq1nif3wdz185cdplwy68z9szbdx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nnir-est";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nnir-est";
           sha256 = "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv";
           name = "nnir-est";
         };
@@ -37746,7 +38165,7 @@
           sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noccur";
           sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
           name = "noccur";
         };
@@ -37767,7 +38186,7 @@
           sha256 = "1a1pp3sd5g4wkhywb5jfchcdpjsjb0iyhk2sxvd0gpc4kk4zh6xs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noctilux-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noctilux-theme";
           sha256 = "15ymyv3rq0n31d8h0ry0l4w4r5a8as0q63ajm9wb6yrxxjl1imfp";
           name = "noctilux-theme";
         };
@@ -37788,7 +38207,7 @@
           sha256 = "1cgmq00ackabwcl4h0n2bb8y08wz0ir5rzca2q3sk4asly6d02m7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/node-resolver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/node-resolver";
           sha256 = "1ng4rgm8f745fajqnbjhi2rshvn6icwdpbh5dzpzhim1w9kb3bhh";
           name = "node-resolver";
         };
@@ -37809,7 +38228,7 @@
           sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nodejs-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nodejs-repl";
           sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
           name = "nodejs-repl";
         };
@@ -37830,7 +38249,7 @@
           sha256 = "0g70gnmfi8n24jzfci9nrj0n9bn1qig7b8f9f325rin8h7x32ypf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noflet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noflet";
           sha256 = "0vzamqb52n330mi6rydrd4ls8nbwh5s42fc2gs5y15zakp6mvhr3";
           name = "noflet";
         };
@@ -37849,7 +38268,7 @@
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nose";
           sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
           name = "nose";
         };
@@ -37864,11 +38283,11 @@
         version = "20160108.632";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "3959d98535b1a3fa61d45a457cce23aa7569b942";
-          sha256 = "163d6027ea220493a607e7a815de1c2580a9d01672bb4f3987256a92034c4f52";
+          rev = "1fcbf095828dc91423f61a290887fe244750bf8a";
+          sha256 = "b53261201a0541c81ec91f5289d194e04bc80e78c5583ab478c4c7bdd7f4d543";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/notmuch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/notmuch";
           sha256 = "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r";
           name = "notmuch";
         };
@@ -37889,7 +38308,7 @@
           sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/notmuch-labeler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/notmuch-labeler";
           sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
           name = "notmuch-labeler";
         };
@@ -37907,7 +38326,7 @@
           sha256 = "0mmdf3z9299hbs3wr8hqgpmg74sb2xm0rxyh38sjcqmk8f310rqh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/novice+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/novice+";
           sha256 = "0r4w4c6y4fny8k0kipzqjsn7idwbi9jq6x9yw51d41ra3pkpvfzf";
           name = "novice-plus";
         };
@@ -37928,7 +38347,7 @@
           sha256 = "0jahr1380919p272srym1pp16ifdz69fn1m45ppglm54q4a741d8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noxml-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noxml-fold";
           sha256 = "11dninxxwhflf2qrmvwmrryspd9j6m95kdlmyx59ykqvw8j0siqc";
           name = "noxml-fold";
         };
@@ -37949,7 +38368,7 @@
           sha256 = "1nwj1ax2qmmlab4lik0b7japhqd424d0rb995dfv89p99gp8vmvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nrepl-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nrepl-eval-sexp-fu";
           sha256 = "17g4nih9kz2483ylp651lwfxkvmaj7wpinpgnifwbciyrplfvx2j";
           name = "nrepl-eval-sexp-fu";
         };
@@ -37970,7 +38389,7 @@
           sha256 = "1129r3rzmfbl8nxjz71xnlyaszhhldawj467zbl36brdadp014n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nrepl-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nrepl-sync";
           sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
           name = "nrepl-sync";
         };
@@ -37991,7 +38410,7 @@
           sha256 = "1w80mbwlvmpd5ff7vy84z61b27klzh9z4wa6m2g7cy674fw4r1xp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nsis-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nsis-mode";
           sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
           name = "nsis-mode";
         };
@@ -38012,7 +38431,7 @@
           sha256 = "0nbmpnljl0wdkwmxzg6lqd3mand9w043qmwp727hb84gxy0j4dib";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nu-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nu-mode";
           sha256 = "0h5jaw577vgm3hfiwc2c0k1wn8zda8ps06vj6mqj952m8bqhf4i7";
           name = "nu-mode";
         };
@@ -38033,7 +38452,7 @@
           sha256 = "045m83rdqryjpqh6y9s6x0yf9fw9xrwmxbm4qgg8ka164x9szv0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/number";
           sha256 = "1nwcdv5ibirxx3sqadh6mnpj40ni3wna7wnjh343mx38dk2dzncf";
           name = "number";
         };
@@ -38054,7 +38473,7 @@
           sha256 = "1i0yymsx8kin28bkrgwkk9ngsmjh0gh5j4hb0k03bq4fy799f2xx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nummm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nummm-mode";
           sha256 = "10khhc6q0zjzrhsv4fgfdbs7qcwi1bgkwq4yqzidqcdndsailyh0";
           name = "nummm-mode";
         };
@@ -38075,7 +38494,7 @@
           sha256 = "0prag0ks511ifa5mdpqmizp5n8190dxp4vdr81ld9w9xv7migpd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nvm";
           sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
           name = "nvm";
         };
@@ -38096,7 +38515,7 @@
           sha256 = "1v8ndr8hdbqhd7nca8882g05y36pigv6lj7hpxl50lr1lvp1kmmf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nyan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nyan-mode";
           sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
           name = "nyan-mode";
         };
@@ -38117,7 +38536,7 @@
           sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nyan-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nyan-prompt";
           sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
           name = "nyan-prompt";
         };
@@ -38138,7 +38557,7 @@
           sha256 = "0xs6787a4v7djgd2zz2v1pk14x27mg2ganz30j9f0gdiai7da6ch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/o-blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/o-blog";
           sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
           name = "o-blog";
         };
@@ -38159,7 +38578,7 @@
           sha256 = "058dyk1c3iw0ip8n8rfpskvqiriqilpclkzc18x73msp5svrh3lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/oauth";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/oauth";
           sha256 = "18z3i5brxm60z373cwx2sa3hx7v38a5s62gbs9b0lxb20ah4p9rz";
           name = "oauth";
         };
@@ -38175,11 +38594,11 @@
         version = "20150804.1700";
         src = fetchhg {
           url = "https://bitbucket.com/pdo/axiom-environment";
-          rev = "d7ea57a27527";
-          sha256 = "1vk7jjbf8wp183c4nagkgxvzcyrdlr53avzsxl111rm5rsxbvdli";
+          rev = "f7b3a13f54ea";
+          sha256 = "1qq0b92mf73fnx2viwzlsxr6672wkskf0vjimymyhv9aq3gw165w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-axiom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-axiom";
           sha256 = "12cmzhgzk8314y6nvzdjwidalccz6h440lil83c1h4lz4ddlwmf6";
           name = "ob-axiom";
         };
@@ -38200,7 +38619,7 @@
           sha256 = "1nzli8wk3nd05j2z2fw511857qbawirhg8mfw21wqclkz8zqn813";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-browser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-browser";
           sha256 = "1yqbzmmazamgf8fi8ipq14ffm8h1pp5d2lkflbxjsagdq61hirxm";
           name = "ob-browser";
         };
@@ -38221,7 +38640,7 @@
           sha256 = "1xbczyqfqdig5w6jvx2kg57mk16sbiz5ysv445v83wqk0sz6nc9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-cypher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-cypher";
           sha256 = "1ygmx0rjvxjl8hifkkwrkk9gpsmdsk6ndb6pg7y78p8hfp5jpyq3";
           name = "ob-cypher";
         };
@@ -38242,7 +38661,7 @@
           sha256 = "0qknm1h2ijnzs1km51hqwpnv5083m9ngi3nbxd90r7d6vva5fhhk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-elixir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-elixir";
           sha256 = "1l5b9hww2vmqnjlsd6lbjpz9walck82ngang1amfnk4xn6d0gdhi";
           name = "ob-elixir";
         };
@@ -38255,15 +38674,15 @@
     ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-http";
-        version = "20151128.430";
+        version = "20160128.423";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-http";
-          rev = "d9af67c6726c50447d8cf21b9c1c25a3a07dc0ce";
-          sha256 = "1yv1i646ll9wnmarcwcmx3nvscq3sv22rmnphvqcr0whrd9vb7rb";
+          rev = "149a921b0a18ae765afaaa8d3b792a0f25b94faf";
+          sha256 = "14jpr8igxgs8gwcr2w13hnis66qlyjgmcn7fibvyprrpg8z69xak";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-http";
           sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
           name = "ob-http";
         };
@@ -38284,7 +38703,7 @@
           sha256 = "0r5p2gr7ri4w79lmhil4fgh6g8cmxs1qp8glkbvycvlaxwrzszhs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-ipython";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-ipython";
           sha256 = "06llf365k8m81ljmlajqvxlh84qg6h0flp3m6gb0zx71xilvw186";
           name = "ob-ipython";
         };
@@ -38305,7 +38724,7 @@
           sha256 = "01cjwg27m0iqndkwwl0v5w8vvk270xvi81za3y5hyrmb7dq6bfy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-kotlin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-kotlin";
           sha256 = "19g4s9dnipg9aa360mp0affmnslm6h7byg595rnaz6rz25a3qdpx";
           name = "ob-kotlin";
         };
@@ -38326,7 +38745,7 @@
           sha256 = "1mk7qcf4svf4yk4mimcyhbw5imq3zps2vh2zzq9gwjcn17jnplhn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-lfe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-lfe";
           sha256 = "11cpaxk9wb27b9zhyns75dqpds4gh3cbjcvia4p2bnvmbm8lz4y8";
           name = "ob-lfe";
         };
@@ -38347,7 +38766,7 @@
           sha256 = "0qibnn908a59jyfslsnpjanbm85f8xw9zywsqsh37nv27ncbx0hr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-mongo";
           sha256 = "1cgmqsl5dzi8xy3sh5xsfkczl555fpd4q6kgsh9xkn74sz227907";
           name = "ob-mongo";
         };
@@ -38368,7 +38787,7 @@
           sha256 = "14scbds1rlmii52i0zr3s0r1wmga7qysj63c2dpinhagxa36d51n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-prolog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-prolog";
           sha256 = "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s";
           name = "ob-prolog";
         };
@@ -38378,22 +38797,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ob-restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }:
     melpaBuild {
         pname = "ob-restclient";
-        version = "20151207.1503";
+        version = "20160201.656";
         src = fetchFromGitHub {
           owner = "alf";
           repo = "ob-restclient.el";
-          rev = "fc5684186275146bba667325c8c33bf7d6011552";
-          sha256 = "0gd2n7dgaasl0clx71gsdm74xxm03qr5yrin8vz3q7wvkfn4bzdf";
+          rev = "c2686286b7d17fc8c059c7a5b301142718fdf2de";
+          sha256 = "18b5k02mnswsv6jijvh9kb5ps5r0imkvr9r3r3x8fkyjh3k4f5il";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-restclient";
           sha256 = "0nv2wsqmpschym6ch8fr4a79hlnpz31jc8y2flsygaqj0annjkfk";
           name = "ob-restclient";
         };
-        packageRequires = [];
+        packageRequires = [ restclient ];
         meta = {
           homepage = "http://melpa.org/#/ob-restclient";
           license = lib.licenses.free;
@@ -38410,7 +38829,7 @@
           sha256 = "0gymna48igcixrapjmg842pnlsshhw8zplxwyyn0x2yrma9fjyyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-sml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-sml";
           sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
           name = "ob-sml";
         };
@@ -38431,7 +38850,7 @@
           sha256 = "1yaqs6zcx8228pwzsm19h6272bw9lhib6xz5xzzq8x8n54l81225";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-translate";
           sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
           name = "ob-translate";
         };
@@ -38452,7 +38871,7 @@
           sha256 = "1ycqdjqn5361pcnc95hxhjqd3y96cjjnaylrnzwhmacl38jm3vai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-typescript";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-typescript";
           sha256 = "1wpy928ndvc076jzi14f6k5fsw8had0pz7f1yjdqql4icszhqa0p";
           name = "ob-typescript";
         };
@@ -38473,7 +38892,7 @@
           sha256 = "16462cgq91jg7i97h440zss5vw2qkxgdy7gm148ns4djr2fchnf6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/oberon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/oberon";
           sha256 = "1wna7ld670r6ljdg5yx0ga0grbq1ma8q92gkari0d5czr7s9lggv";
           name = "oberon";
         };
@@ -38494,7 +38913,7 @@
           sha256 = "138c1nm579vr37dqprqsakfkhs2awm3klzyyd6bv9rhkrysrpbqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/objc-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/objc-font-lock";
           sha256 = "0njslpgdcph3p3gamrbd6pc04szks07yv4ij3p1l7p5dc2p06rs6";
           name = "objc-font-lock";
         };
@@ -38515,7 +38934,7 @@
           sha256 = "00v21iw9wwxap8jhg9035cp47fm5v2djmldq6nprv860m01xlwh1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/obsidian-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/obsidian-theme";
           sha256 = "17ckshimdma6fqiis4kxczxkbrsfpm2a0b41m5f3qz3qlhcw2xgr";
           name = "obsidian-theme";
         };
@@ -38536,7 +38955,7 @@
           sha256 = "0pnliw02crqw8hbg088klz54z6s1ih8q2lcn9mq5f12xi752hxm8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/occidental-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/occidental-theme";
           sha256 = "1ra5p8k96wvb04v69xm87jl4jlgi57v4jw2xxzkwbwxbydncnv0b";
           name = "occidental-theme";
         };
@@ -38557,7 +38976,7 @@
           sha256 = "1v1c2481v2xgnw8kgbbqhqkdd41lzvki9hm3iypbf3n0jxz8nnzy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/occur-context-resize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/occur-context-resize";
           sha256 = "0sp5v4rwqgqdj26gdkrmjvkmbp4g6jq4lrn2c3zm8s2gq0s3l6ri";
           name = "occur-context-resize";
         };
@@ -38578,7 +38997,7 @@
           sha256 = "1zj0xhvl5qx42injv0av4lyzd3jsjls1m368dqd2qnswhfw8wfn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/occur-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/occur-x";
           sha256 = "1xq1k9rq7k1zw90shbgiidwvcn0ys1d53q03b5mpvvfqhj4n0i1g";
           name = "occur-x";
         };
@@ -38599,7 +39018,7 @@
           sha256 = "155gmls6cz3zf4lcj89kzb96y7k0glx0f659jg5z0skgxq79hf48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ocodo-svg-modelines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ocodo-svg-modelines";
           sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
           name = "ocodo-svg-modelines";
         };
@@ -38620,7 +39039,7 @@
           sha256 = "0p3wsxkj9jpnxanl6r8glf9wvyjbf5z24idvaa1j07whlq68bcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ocp-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ocp-indent";
           sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
           name = "ocp-indent";
         };
@@ -38641,7 +39060,7 @@
           sha256 = "0dp7dhmgrq078rjhpm1cr993qjqz7qgy2z4sn73qw6j55va7d9kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/octicons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/octicons";
           sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
           name = "octicons";
         };
@@ -38654,15 +39073,15 @@
     octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "octopress";
-        version = "20151006.514";
+        version = "20160123.1606";
         src = fetchFromGitHub {
           owner = "aaronbieber";
           repo = "octopress.el";
-          rev = "2e068887b17b72a69e29349d477333d067867eec";
-          sha256 = "1fc9iabxfmyqb41j31rgbzxdmnjrzqh1pp9s15q6s7b2d7mc0a0y";
+          rev = "842907662c613710a87feeb1e4a29f4d32111683";
+          sha256 = "0p9ph62vnw1r9dbvrjyw356a9bjnzh0hglssi97dr0qd6cs8whf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/octopress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/octopress";
           sha256 = "0zsir6chjvn5i1irmf5aj6mmb401c553r5wykq796sz7jnjhrjg0";
           name = "octopress";
         };
@@ -38683,7 +39102,7 @@
           sha256 = "1bjrgj8klg7ly63vx90jpaih9virn02bhqi16p6z0mw36q1q7ysq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/offlineimap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/offlineimap";
           sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
           name = "offlineimap";
         };
@@ -38704,7 +39123,7 @@
           sha256 = "0y9fxrsxp1158fyjp4f69r7g2s7b6nbxlsmsb8clwqc8pmmg2z82";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/oldlace-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/oldlace-theme";
           sha256 = "1pxiqqh5x4wsayqgwplzvsbalbj44zvby7x0pijdvwcnsh74znj8";
           name = "oldlace-theme";
         };
@@ -38725,7 +39144,7 @@
           sha256 = "1mh4dlx5j2zwv7zx8x52vl6h38jr41ly5bn6zqsncnafd1a8l7x7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/olivetti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/olivetti";
           sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
           name = "olivetti";
         };
@@ -38746,7 +39165,7 @@
           sha256 = "03szb2i2xk3nq578cz1drsddsbld03ryvykdfzmfvwcmlpaknvzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/om-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/om-mode";
           sha256 = "1q2h9wjnyg7wlk913px4vj1cxqynd6xfh9ind7kjyra436yw3l4j";
           name = "om-mode";
         };
@@ -38767,7 +39186,7 @@
           sha256 = "1925mh47n4x9v780qp5l6cksl64v9mpyb87znsg93x6sxr0cvv4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-kill";
           sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
           name = "omni-kill";
         };
@@ -38788,7 +39207,7 @@
           sha256 = "1nvgh9wvgswcs3r958b579rsx540xrhlnafc6cmcd63z6yck19w0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-log";
           sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
           name = "omni-log";
         };
@@ -38809,7 +39228,7 @@
           sha256 = "1x8af8jv4n83sl4rgj0d2rpmw9g78rknm1h523f3b1a5x4kdvsz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-quotes";
           sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs";
           name = "omni-quotes";
         };
@@ -38830,7 +39249,7 @@
           sha256 = "1icdk19vwihc8mn04yxl2brql2gssn3gxd5bv7ljdd6mn5hkw500";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-scratch";
           sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
           name = "omni-scratch";
         };
@@ -38851,7 +39270,7 @@
           sha256 = "1lvnkdrav7h15p8d5ayhfsjynllwp4br1vqxmw0ppxnlyq7337n5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-tags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-tags";
           sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
           name = "omni-tags";
         };
@@ -38872,7 +39291,7 @@
           sha256 = "1hzvpajq58py6k7z2rwwax1c7pm65m534mq8mr9g9kxn9hqiz9n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omniref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omniref";
           sha256 = "0lgw1knqppdg046zqx4m7nbzvsasr89wa9i4594hf46w1094dabj";
           name = "omniref";
         };
@@ -38893,7 +39312,7 @@
           sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omnisharp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omnisharp";
           sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
           name = "omnisharp";
         };
@@ -38923,7 +39342,7 @@
           sha256 = "1616bdvrf1bawcqgj7balbxaw26waw81gxiw7yspnvpyb009j66y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/on-parens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/on-parens";
           sha256 = "19kyzpkgfl0ipbcgnl8fbfbapnfdxr8w9i7prfkm6rjp6amxyqab";
           name = "on-parens";
         };
@@ -38944,7 +39363,7 @@
           sha256 = "1rksk0j9b27w913bzbq7w2ws75yi66m24ic6ljdhhbrq3z2ic7dy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/on-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/on-screen";
           sha256 = "104jisc2bckzrajxlvj1cfx1drnjj7jhqjblvm89ry32xdnjxmqb";
           name = "on-screen";
         };
@@ -38962,7 +39381,7 @@
           sha256 = "05njigqi9061d34530d76kwsdzqgk9qxnwhn9xis64w59f5nzf1h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/oneonone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/oneonone";
           sha256 = "0v4nvhzgq97zbi18jd3ds57yh1fpv57b2a1cd7r8jbxwaaz3gpg9";
           name = "oneonone";
         };
@@ -38983,7 +39402,7 @@
           sha256 = "1yqrp9icci5snp1485wb6y8mr2hjp9006ahch58lvmnq98bn7j45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/opam";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/opam";
           sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
           name = "opam";
         };
@@ -39001,7 +39420,7 @@
           sha256 = "1vjmgayksdgg54b46aqmvhd7a9arjx9p3jyrjs2z9262f6r288lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/open-junk-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/open-junk-file";
           sha256 = "0ybycprs5di9niai4hbmfq4xdacfgrzf1mwq1aj1hi53phl8l4di";
           name = "open-junk-file";
         };
@@ -39022,7 +39441,7 @@
           sha256 = "0086pfk4pq6xmknk7a42fihcjgzkcplqqc1rk9fhwmn9j7djbq70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/openstack-cgit-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/openstack-cgit-browse-file";
           sha256 = "05dl28a4npnnzzipypfcqb21sdww715lwji2xnsabx3fb1h1w5jl";
           name = "openstack-cgit-browse-file";
         };
@@ -39041,7 +39460,7 @@
           sha256 = "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/openwith";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/openwith";
           sha256 = "05lkx3yfv2445fp07bhqv2aqz5hgf3dxp39lmz3nfxn4c9v8nkqi";
           name = "openwith";
         };
@@ -39062,7 +39481,7 @@
           sha256 = "0iw3c8sn702ziki59mvd5gxm484i7f0bwsy8fz95y08s9gknjjf9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/operate-on-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/operate-on-number";
           sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
           name = "operate-on-number";
         };
@@ -39083,7 +39502,7 @@
           sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-ac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-ac";
           sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
           name = "org-ac";
         };
@@ -39104,7 +39523,7 @@
           sha256 = "15xgkm5p30qfghyhkjivh5n4770794qf4pza462vb0xl5v6kffbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-agenda-property";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-agenda-property";
           sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
           name = "org-agenda-property";
         };
@@ -39125,7 +39544,7 @@
           sha256 = "0yzvir2gmyv9k43q3sf37lc9xcmfyaj5wh825xax7305j3b2hhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-alert";
           sha256 = "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152";
           name = "org-alert";
         };
@@ -39138,15 +39557,15 @@
     org-attach-screenshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-attach-screenshot";
-        version = "20160104.1446";
+        version = "20160125.1532";
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org-screenshot";
-          rev = "5e80f275ee3fe540a72e5f5b11a0d8634e46cafb";
-          sha256 = "1b3n4cbpx7crvkc8kx651f8ap68xhpvq0kp4f6c9sqp4n6wg7g35";
+          rev = "628e82cc0e78ff2d3b08685d72aefe3568947b38";
+          sha256 = "0f4ja4m1r6bbgachipswb2001ryg8cqcxjvwmnab951mw0cbg7v4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-attach-screenshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-attach-screenshot";
           sha256 = "0108kahyd499q87wzvirv5d6p7jrb7ckz8r96pwqzgflj3njbnmn";
           name = "org-attach-screenshot";
         };
@@ -39167,7 +39586,7 @@
           sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-autolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-autolist";
           sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
           name = "org-autolist";
         };
@@ -39188,7 +39607,7 @@
           sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-beautify-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-beautify-theme";
           sha256 = "1j2gi3f72kvavdcj6xs7zng0dcnivrhc7pjzm2g4mjm5ad5s1flq";
           name = "org-beautify-theme";
         };
@@ -39209,7 +39628,7 @@
           sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-bullets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-bullets";
           sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75";
           name = "org-bullets";
         };
@@ -39230,7 +39649,7 @@
           sha256 = "0lq2rx6wgz0aymwhw597xs2pabinhk3jpnnhjwq0jk8ggp3afqaz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-caldav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-caldav";
           sha256 = "0166y04gxrwnynm4jshm2kqk5jbvl5g5078dxvw18nicrgq3y4r8";
           name = "org-caldav";
         };
@@ -39251,7 +39670,7 @@
           sha256 = "1g9fanikdcbkmvbh9bp5dg3s2maawkqinjavn5158p0gy68ab240";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-cliplink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-cliplink";
           sha256 = "19l3k9w9csgvdr7n824bzg7jja0f28dmz6caldxh43vankpmlg3p";
           name = "org-cliplink";
         };
@@ -39272,7 +39691,7 @@
           sha256 = "0q4v216ihhwv8rlb9xc8xy7nj1p058xabfflglhgcd7mfjrsyayx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-context";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-context";
           sha256 = "19y8aln7wix9p506ajvfkl641147c5mdmjm98jnq68cx2r4wp6zz";
           name = "org-context";
         };
@@ -39293,7 +39712,7 @@
           sha256 = "0nrfvmqb70phnq0k4wbdj6z666wq6xvabg4pgv8qn62rbrw4yyhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-cua-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-cua-dwim";
           sha256 = "0p7v564p8n1hm7rzlrbm2pnhyha8aif2r9g7g4kg0iqln89f5yhc";
           name = "org-cua-dwim";
         };
@@ -39314,7 +39733,7 @@
           sha256 = "1nqfi139cag3ll8wxk8rh59hay97vi8i0mlgnams4jla285zydj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-dashboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-dashboard";
           sha256 = "1hvhhbmyx12wsf2n1hd0hg5cy05zyspd82xxcdh04g4s9r3ikqj5";
           name = "org-dashboard";
         };
@@ -39335,7 +39754,7 @@
           sha256 = "1wrgqdrfdxc1vrcr6dsa8dcxrwj6zgjr9h1fzilwnxlzfvdilnsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-doing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-doing";
           sha256 = "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j";
           name = "org-doing";
         };
@@ -39356,7 +39775,7 @@
           sha256 = "15zrnd168n4pwa1bj5fz79hcrgw61braf0b095rsfhjh5w2sasy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-dotemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-dotemacs";
           sha256 = "1vc391fdkdqd4g0piq66zhrlgqx5s2ijv7qd1rc3a235sjb9i2n4";
           name = "org-dotemacs";
         };
@@ -39377,7 +39796,7 @@
           sha256 = "12k3iqzmj92cvi0d99mn3ylxj00p2f2f8049dd2nxnp1gxs2k4dq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-download";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-download";
           sha256 = "19yjx0qqpmrdwagp3d6lwwv7dcb745m9ccq3m29sin74f5p4svsi";
           name = "org-download";
         };
@@ -39398,7 +39817,7 @@
           sha256 = "0m5c9x0vazciq6czpg5y9nr5yzjf6nl0qp5cfajv49cw2h0cwqyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-drill-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-drill-table";
           sha256 = "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69";
           name = "org-drill-table";
         };
@@ -39419,7 +39838,7 @@
           sha256 = "0jjdsng7fm4wbhvd9naqzdfsmkvj1sf1d9rikprg1pd58azv6idx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-dropbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-dropbox";
           sha256 = "0qfvdz13ncqn7qaz03lwabzsnk62z6wqzlxlvdqv5xyllcy9m6ln";
           name = "org-dropbox";
         };
@@ -39440,7 +39859,7 @@
           sha256 = "0kqvwqmwnwg2h7r38fpjg6qlkcj9v8011df8nmsgs1w1mfdvnjsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-ehtml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-ehtml";
           sha256 = "0n82fbd7aircqg2c9m138qfv8csrv0amhya3xlwswdkqn51vn3gw";
           name = "org-ehtml";
         };
@@ -39461,7 +39880,7 @@
           sha256 = "0va8wm319vvw7w0j102mx656icy3fi4mz3b6bxira6z6xl9b92s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-elisp-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-elisp-help";
           sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
           name = "org-elisp-help";
         };
@@ -39482,7 +39901,7 @@
           sha256 = "1mpdk34l08m53r7dk8qaza7kvscy9jxv7bjwc232s1xhgy3mcin5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-eww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-eww";
           sha256 = "132asshgfpphjckd5vz1vcs18lj55mrqs1l4ggfa89rc6aj8xrca";
           name = "org-eww";
         };
@@ -39502,7 +39921,7 @@
           sha256 = "35000fb42e317ec1a6e6c7b448bfdec7ecf65fd9f5ab4723062513c3a4acba79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-fstree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-fstree";
           sha256 = "11ddkfddmsy26mmhgw24757f753ssh056v9vxn89pxp4qypxidfz";
           name = "org-fstree";
         };
@@ -39523,7 +39942,7 @@
           sha256 = "0r5w85bflmky3xzwqr7g7x7srdm43i93vg0gqnhh6k0ldy7ypc06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-gcal";
           sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
           name = "org-gcal";
         };
@@ -39544,7 +39963,7 @@
           sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-gnome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-gnome";
           sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
           name = "org-gnome";
         };
@@ -39565,7 +39984,7 @@
           sha256 = "10jwqzs431mnwz717qdmcn0v8raklw41sbxbnkb36yrgznk8c09c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-grep";
           sha256 = "0kpgizy0zxnlmyh0prwdll62ri2c1l4sb0yrkl7yw17cr4gxmkkz";
           name = "org-grep";
         };
@@ -39586,7 +40005,7 @@
           sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-if";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-if";
           sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
           name = "org-if";
         };
@@ -39607,7 +40026,7 @@
           sha256 = "1n7l70pl9x6mh7dyyiihg4zi1advzlaq2x7vivhas1i2120884i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-iv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-iv";
           sha256 = "1akhabp6mdw1h7zms6ahlfvwizl07fwsizwxpdzi4viggfccsfwx";
           name = "org-iv";
         };
@@ -39628,7 +40047,7 @@
           sha256 = "0whv8nsla93194jjpxrhlr6g230spdxbac8ibmzmyad075vx97z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-jekyll";
           sha256 = "0jh3rla8s8prprvhnlg0psdrj7swz7v6vf2xy1m6ff66p9saiv8i";
           name = "org-jekyll";
         };
@@ -39649,7 +40068,7 @@
           sha256 = "0b5f8qkyzh4jwj3kvbaj3m4dpjbvh1fql7v1nb9bi5n7iwkv3lxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-jira";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-jira";
           sha256 = "11h7kbkf38p2xycw8hvabpaacp72xdgy8c7kzcgjb2a8qlbs5ifm";
           name = "org-jira";
         };
@@ -39670,7 +40089,7 @@
           sha256 = "15swkzq5v9jnpmsziy8mj9rkriilxrm1c24lbfg0a4pwax5nkzp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-journal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-journal";
           sha256 = "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s";
           name = "org-journal";
         };
@@ -39691,7 +40110,7 @@
           sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-link-travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-link-travis";
           sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
           name = "org-link-travis";
         };
@@ -39712,7 +40131,7 @@
           sha256 = "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-linkany";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-linkany";
           sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
           name = "org-linkany";
         };
@@ -39728,11 +40147,11 @@
         version = "20140107.719";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "f3f4b21c57262c8e1527433634d54c1e496055f0";
-          sha256 = "fa1f174e35aad41ca090982ba645f7734201cf720336bce3ab3c07432d345170";
+          rev = "99697abdb98f67d8fad90a2fd39316ea3c0982dd";
+          sha256 = "9124972a0892d6782da739102e0648af184f24c6a5ca0e24b7571d6a018356b5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-mac-iCal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-mac-iCal";
           sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
           name = "org-mac-iCal";
         };
@@ -39748,11 +40167,11 @@
         version = "20160109.1643";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "f3f4b21c57262c8e1527433634d54c1e496055f0";
-          sha256 = "fa1f174e35aad41ca090982ba645f7734201cf720336bce3ab3c07432d345170";
+          rev = "99697abdb98f67d8fad90a2fd39316ea3c0982dd";
+          sha256 = "9124972a0892d6782da739102e0648af184f24c6a5ca0e24b7571d6a018356b5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-mac-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-mac-link";
           sha256 = "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw";
           name = "org-mac-link";
         };
@@ -39773,7 +40192,7 @@
           sha256 = "0d22q57mizw70qxbvwi4yz15jg86icqq1z963rliwss3wgpirndh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-mobile-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-mobile-sync";
           sha256 = "1cj0pxcjngiipmyl0w1p0g4wrxgm2y98a8862x1lcbali9lqbrwj";
           name = "org-mobile-sync";
         };
@@ -39794,7 +40213,7 @@
           sha256 = "0zbpzm9lni6z180s7n52x8s5by5zkq2nlhx82l2h9i7in9y4r6c3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-multiple-keymap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-multiple-keymap";
           sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
           name = "org-multiple-keymap";
         };
@@ -39815,7 +40234,7 @@
           sha256 = "132jv1zvp3yp4pa4ysl0n3a81d39cdi3nqfziz1ha1pl10qbn6wr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-octopress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-octopress";
           sha256 = "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw";
           name = "org-octopress";
         };
@@ -39836,7 +40255,7 @@
           sha256 = "10dddbs9jppqqzwwv5y6pj2szdkw3223gvzzd4pzn9biv5d9kzsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-outlook";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-outlook";
           sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
           name = "org-outlook";
         };
@@ -39846,22 +40265,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-page = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
+    org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-page";
-        version = "20160111.2331";
+        version = "20160201.353";
         src = fetchFromGitHub {
           owner = "kelvinh";
           repo = "org-page";
-          rev = "a69851476167395a387d561a6e526abf048295d0";
-          sha256 = "1k4yfrmv74mfyvbf5ddhx1mwzbnlrhc2qm30b9278hg6mqdd95sx";
+          rev = "83303ceaff69a08d9885471ca4b4b9a0f73584f2";
+          sha256 = "0lcbahpq90sv9a265r0ajm3zx3h1dmsz7fz2gw5ndjkz3c59qk93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-page";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-page";
           sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
           name = "org-page";
         };
-        packageRequires = [ dash ht htmlize mustache org simple-httpd ];
+        packageRequires = [ cl-lib dash ht htmlize mustache org simple-httpd ];
         meta = {
           homepage = "http://melpa.org/#/org-page";
           license = lib.licenses.free;
@@ -39878,7 +40297,7 @@
           sha256 = "022qqas919aziq4scs5j1wdbvd0qyw8kkirn2vzfb5k2fjl8z7iq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pandoc";
           sha256 = "1r6j6rkwfv7fv7kp73gh1bdz3y5ffwk5f2wyv4mpxs885cfbsm8v";
           name = "org-pandoc";
         };
@@ -39895,11 +40314,11 @@
         src = fetchFromGitHub {
           owner = "leafac";
           repo = "org-password-manager";
-          rev = "b13f63aa4efca47e92cfe52865e99f230851fa03";
-          sha256 = "0v2b7byr56v4pffva93d80cppp3xk8nj3987vpwmczqiq5by1pc8";
+          rev = "85b61fb513cee8f4311998c4fc22f981c47ccefa";
+          sha256 = "0b02d6x8kmq5h3x2fk1cl59jq10c1wy6xmmcsrn37di8bpygdwhy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-password-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-password-manager";
           sha256 = "1l3h0qhv0ad9l933d47as8y3h9x94zw315ax4qsgiw3046nzkdwv";
           name = "org-password-manager";
         };
@@ -39912,15 +40331,15 @@
     org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
     melpaBuild {
         pname = "org-pdfview";
-        version = "20151125.1544";
+        version = "20160125.1454";
         src = fetchFromGitHub {
           owner = "markus1189";
           repo = "org-pdfview";
-          rev = "8f66629e883e0d490584bbf4610cc91938694889";
-          sha256 = "07xcibpqkr0kmwqvz9sfcd3bizscksvc7jw48zg6k79hb90vp1i0";
+          rev = "569b22197f2a5a08e7be7198c4d871f29559811f";
+          sha256 = "16z44kdsg8w1p27fsi72k8wqr35xbb0777rq7h7swv6j2jn1b6hc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pdfview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pdfview";
           sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
           name = "org-pdfview";
         };
@@ -39941,7 +40360,7 @@
           sha256 = "015idpk66835jdg1sbvpksyr07xk4vn17z8cng2qw87fss688ihb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pomodoro";
           sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
           name = "org-pomodoro";
         };
@@ -39962,7 +40381,7 @@
           sha256 = "1n9magg7r7xnw16d43fh6nzjf42s70l3mxq6ph727zi4lz5ngmfm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-present";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-present";
           sha256 = "09h0cjqjwhqychyrdv1hmiyak677vgf1b94392sdsq3ns70zyjk7";
           name = "org-present";
         };
@@ -39983,7 +40402,7 @@
           sha256 = "1jxw9r1mn9zf0vlvy89w9w6v6mhl8i210hkx86c9vcrkpcrpzmvi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-projectile";
           sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
           name = "org-projectile";
         };
@@ -40004,7 +40423,7 @@
           sha256 = "1jzp65sf1am6pz533kg1z666h4jlynvjyx1mf24gyksiiwdhypsy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-protocol-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-protocol-jekyll";
           sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
           name = "org-protocol-jekyll";
         };
@@ -40025,7 +40444,7 @@
           sha256 = "1q3s12s0ll7jhrnd3adkaxv7ff69ppprv0pyl5f6gy8y51y63k8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-readme";
           sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
           name = "org-readme";
         };
@@ -40052,7 +40471,7 @@
           sha256 = "1q99b9l6y97iic46xqj7rqnkrzk8f0qq4qy81jv9wz54hq51w07v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-redmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-redmine";
           sha256 = "0y2pm18nnyzm9wjc0j15v46nf3xi7a0wvspfzi360qv08i54skqv";
           name = "org-redmine";
         };
@@ -40065,15 +40484,15 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20160118.846";
+        version = "20160203.2047";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "aa8d51897553093e9f1f39817cb547d451635e03";
-          sha256 = "0z4qbfpw0w5kajc25s7wzk2gxfvb9dwjznhj103hp6pxdaw20gym";
+          rev = "4d0eaf48db5711d4a67bf5352ae9d79aa29dc5ec";
+          sha256 = "0bh5faz51hiy82j3355n78dqbcwwx5scizq6w5n1snpdxw6dxfjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-ref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-ref";
           sha256 = "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08";
           name = "org-ref";
         };
@@ -40094,7 +40513,7 @@
           sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-repo-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-repo-todo";
           sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
           name = "org-repo-todo";
         };
@@ -40107,15 +40526,15 @@
     org-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, rtm }:
     melpaBuild {
         pname = "org-rtm";
-        version = "20160116.1025";
+        version = "20160119.824";
         src = fetchFromGitHub {
           owner = "pmiddend";
           repo = "org-rtm";
-          rev = "c01c45af2cbb4f15f0a8b92c600a5e11ff5cb8ec";
-          sha256 = "0j937x4qk2pb8vbq42qz5rsaf9x33rqfvay656naxzz0jvxj5nzl";
+          rev = "b40475213d32ea46d0bbb055c3d682242140794c";
+          sha256 = "1596npclhghlarb1cfg3q7ky43y8zm73npjv169acjb77yz29rix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-rtm";
           sha256 = "1paiy5zmdlxb3a1cjk9d30mqbl60bkairw6xkix2qw36p07jwlj5";
           name = "org-rtm";
         };
@@ -40136,7 +40555,7 @@
           sha256 = "14zn0b8qs740ls1069kg2lwm0b9yc4qv525fg8km0hgi0yp8qw7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-sync";
           sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
           name = "org-sync";
         };
@@ -40157,7 +40576,7 @@
           sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-table-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-table-comment";
           sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
           name = "org-table-comment";
         };
@@ -40167,6 +40586,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-tfl";
+        version = "20160131.1444";
+        src = fetchFromGitHub {
+          owner = "storax";
+          repo = "org-tfl";
+          rev = "c9e024ac55d9e0c61a273e75bd68981a623c9ab2";
+          sha256 = "1x241jaw726zjsplwf6svbvr8af09k6kqj7icpvcbyayivkbhxy2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tfl";
+          sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf";
+          name = "org-tfl";
+        };
+        packageRequires = [ cl-lib emacs org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-tfl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-themis = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-themis";
+        version = "20160121.2204";
+        src = fetchFromGitHub {
+          owner = "zellio";
+          repo = "org-themis";
+          rev = "78aadbbe22b1993be5c4accd0d3f91a4e85c9a3c";
+          sha256 = "1apd5yyr12skagma7xpzrh22rhplmhhv0pma4zf5b0i6nkxy06j2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-themis";
+          sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln";
+          name = "org-themis";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/org-themis";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-time-budgets = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-time-budgets";
@@ -40178,7 +40639,7 @@
           sha256 = "04adkz950vvwyzy3da468nnqsknpr5kw5369w2yqhnph16cwwfxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-time-budgets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-time-budgets";
           sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
           name = "org-time-budgets";
         };
@@ -40199,7 +40660,7 @@
           sha256 = "014337wimvzy0rxh2p2c647ly215zcyhgym2hcljkdriv15cafna";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-toodledo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-toodledo";
           sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
           name = "org-toodledo";
         };
@@ -40220,7 +40681,7 @@
           sha256 = "053wf36lq9piyzq7rv2lid34zanj6l9fvawp3r3nsniy5nlfckqx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-tracktable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tracktable";
           sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
           name = "org-tracktable";
         };
@@ -40241,7 +40702,7 @@
           sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-transform-tree-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-transform-tree-table";
           sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
           name = "org-transform-tree-table";
         };
@@ -40262,7 +40723,7 @@
           sha256 = "19id53sjv0r0xnm3l8d694s27dxlmdfm9dal57zlf60s5lg8hykq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-tree-slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tree-slide";
           sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
           name = "org-tree-slide";
         };
@@ -40283,7 +40744,7 @@
           sha256 = "0w0gw3varx8qrcfh3iwg6qqxavprm25bjv9ada34xqjdhsv537xc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-trello";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-trello";
           sha256 = "1rm91xccvdsqghdnrnjvyp8xfvrw5ac677vzzz24rz9dssh2mz9b";
           name = "org-trello";
         };
@@ -40311,7 +40772,7 @@
           sha256 = "1m2xdp6wfg11wi7s4i675c3m5qancm8bpizcf380r6vmkcdfkrdy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-vcard";
           sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
           name = "org-vcard";
         };
@@ -40324,15 +40785,15 @@
     org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-wc";
-        version = "20141101.120";
+        version = "20160204.1329";
         src = fetchFromGitHub {
           owner = "dato";
           repo = "org-wc";
-          rev = "f1765fc913f288432ee2cc330c8a7af3af7715c8";
-          sha256 = "0miahg10xx3sy85n22xqwjp1z7kcmcsb85dh0653sf7axp42kq98";
+          rev = "bfb9f2d670c9f700e86e1dd965be1cd6fdc86e32";
+          sha256 = "0xhfpv5g2smxywrnwzk2sgak99lv950imm03jdgldhrjz6z1g78y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-wc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-wc";
           sha256 = "1sa9fcy0bnn06swwq2gfrgmppd6dsbmw2mq0v73mizg3l6has1zb";
           name = "org-wc";
         };
@@ -40353,7 +40814,7 @@
           sha256 = "1izf0lxycg4wh3wfki1sfy283qwgfdf8rzb365z3sk1zzijjaw6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-webpage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-webpage";
           sha256 = "0vwv8cv38gx8rnfskbmnaf8y8sffjqy1408655bwhjz6dp69qmah";
           name = "org-webpage";
         };
@@ -40374,7 +40835,7 @@
           sha256 = "1cagmwl3acanwc2nky7m61cawi0i0x703sjc6zlw968lacyw86wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-wunderlist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-wunderlist";
           sha256 = "08zg3wgr80rp89c53ffqzz22ws9bp62a1m74xvxa74x6nq9i4xl0";
           name = "org-wunderlist";
         };
@@ -40395,7 +40856,7 @@
           sha256 = "0q6dpih869rz94dqbi910vk5iwffbbl6hkraazc8rky7fnb4nh4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org2blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org2blog";
           sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
           name = "org2blog";
         };
@@ -40416,7 +40877,7 @@
           sha256 = "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org2jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org2jekyll";
           sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
           name = "org2jekyll";
         };
@@ -40429,15 +40890,15 @@
     organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "organic-green-theme";
-        version = "20151028.720";
+        version = "20160202.820";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "organic-green-theme";
-          rev = "c4d68c3329147aedd066a88b6d5e5266bcd59dcc";
-          sha256 = "0q90vm2z3vs9hg9zg5dl6c35f7ivzxj5df3y3h9xjif494ladbsg";
+          rev = "463c8216b33561263e0f605665ff3d705d39423a";
+          sha256 = "194mcm7xlzlwm4phy3b9pz7na3sdw6galnidf8aqjk97mgw9z74r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/organic-green-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/organic-green-theme";
           sha256 = "1fdj3dpcdqx0db5q8dlxag6pr2qn4yiz1hmg3c7dkmh51n85ssw2";
           name = "organic-green-theme";
         };
@@ -40458,7 +40919,7 @@
           sha256 = "0hwmr67nky9xp5xlrkp54nw6b72d29lmna28dnbgqs2i5rccbk55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgbox";
           sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
           name = "orgbox";
         };
@@ -40471,15 +40932,15 @@
     orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "orgit";
-        version = "20151008.1614";
+        version = "20160119.1624";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "orgit";
-          rev = "731c5cb4f1c7e2ee5b819ca159c0c01e2b306c73";
-          sha256 = "0d7rh5bi5v04njj1nh8q8kdr6aw68lcw4ghx6kwq97aff4qmcrp1";
+          rev = "12bfadf603d8a1f616a1bdac5f909a0c20e6aba4";
+          sha256 = "1wxxdx3c5qacsii4kysk438cjr1hnmpir78kp6xgk9xw5g9snlnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgit";
           sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
           name = "orgit";
         };
@@ -40500,7 +40961,7 @@
           sha256 = "12y395ld36jnlbcrfycnvr4g723w6vahfv9iqf1wr6m94ka9pz3d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orglink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orglink";
           sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
           name = "orglink";
         };
@@ -40521,7 +40982,7 @@
           sha256 = "1w0hadpslxcjn29yxl9i37sja4qf4kp7ffjpwij5hs73r518c2z6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orglue";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orglue";
           sha256 = "14g4q2k9zjzipzrp5mg72s40b0rwiaixgq3rvi15wh4vvcw5xajn";
           name = "orglue";
         };
@@ -40542,7 +41003,7 @@
           sha256 = "0am2yfnaxwc6f2wvrg4d508pdcs88cynr32k7bgyyadwq4xq3zsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgtbl-aggregate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgtbl-aggregate";
           sha256 = "0gnyjwn6jshs8bzdssm2xppg2s9p2x3rrhp523q39aydskc6ggc9";
           name = "orgtbl-aggregate";
         };
@@ -40563,7 +41024,7 @@
           sha256 = "1vbnp37xz0nrpyi0hah345928zsb1xw915mdb0wybq1fzn93mp1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgtbl-ascii-plot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgtbl-ascii-plot";
           sha256 = "1ssjbdprbn34nsfx1xjc382l2195rbh8mybpn31d4kcjx6fqf78h";
           name = "orgtbl-ascii-plot";
         };
@@ -40584,7 +41045,7 @@
           sha256 = "06nc82wiha11i79izqil53dkd95fl55nb5m739gyyzvx3sksb0dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgtbl-join";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgtbl-join";
           sha256 = "1kq2h0lb521z8q2xb9bsi37xzzdsa0hw4mm3qkzidi5j9fi3apf1";
           name = "orgtbl-join";
         };
@@ -40605,7 +41066,7 @@
           sha256 = "0zfiq9d5jqzpmscngb1s2jgfiqmbi4dyw0fqa59v2g84gxjg793x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgtbl-show-header";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgtbl-show-header";
           sha256 = "1xgqjg3lmcczdblxaka47cc1ad8p8jhyb2nqwq0qnbqw46fqjp3k";
           name = "orgtbl-show-header";
         };
@@ -40626,7 +41087,7 @@
           sha256 = "0p53l0s8rxr8v77kj83qjrbln7nck16q0zgdp4sqmqb1121ily48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/origami";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/origami";
           sha256 = "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr";
           name = "origami";
         };
@@ -40647,7 +41108,7 @@
           sha256 = "1iybrhp607a5rb3ynlaf8w2x9wdgdbril702z44dgcg3wxih2zy1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-browse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-browse";
           sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
           name = "osx-browse";
         };
@@ -40668,7 +41129,7 @@
           sha256 = "1ykn48src7qhx9cmpjkaqsz7h36p75kkq1h9wlcpv5fhaky2d4n4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-clipboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-clipboard";
           sha256 = "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f";
           name = "osx-clipboard";
         };
@@ -40689,7 +41150,7 @@
           sha256 = "0frv92i7rj9fbjzgwf80zngq77394wjgijggda6d8ai75n5f47g1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-dictionary";
           sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
           name = "osx-dictionary";
         };
@@ -40702,15 +41163,15 @@
     osx-lib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "osx-lib";
-        version = "20160106.1215";
+        version = "20160125.2328";
         src = fetchFromGitHub {
           owner = "raghavgautam";
           repo = "osx-lib";
-          rev = "3a5a4561c5a1d9f5b8078cd6cbb9cd1f70ad8fbf";
-          sha256 = "1b8ahmljk5whs29ss2wq3800qrb32hk1jlbs71rq8chvxxwlx8j7";
+          rev = "9334c0614be7dbcc3d763ff7061979643fa08b4a";
+          sha256 = "0kh7mrgwalys2vmf1dyrl2cc9v58zah2r8lr43nsky8dkszrz2al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-lib";
           sha256 = "12wvki8jhzqsanxv5yqzjmfx6ifwz9ab9zh6r8nss86bk8864ix4";
           name = "osx-lib";
         };
@@ -40731,7 +41192,7 @@
           sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-location";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-location";
           sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
           name = "osx-location";
         };
@@ -40752,7 +41213,7 @@
           sha256 = "1rgykby1ysbapq53lnk9yy04r9q4qirnzs2abgvz7g2qjq5fyzag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-org-clock-menubar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-org-clock-menubar";
           sha256 = "1y5qxslxl0d93f387nyj8zngz5nh1p4rzdfx0lnbvya6shfaxaf6";
           name = "osx-org-clock-menubar";
         };
@@ -40773,7 +41234,7 @@
           sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-plist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-plist";
           sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8";
           name = "osx-plist";
         };
@@ -40794,7 +41255,7 @@
           sha256 = "1j601gzizxjsvkw6bvih4a49iq05yfkw0ni77xbc5klc7x7s80hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-pseudo-daemon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-pseudo-daemon";
           sha256 = "150fxj2phj5axnh5i8ws5fv2qzzmpyisch452wgxb604p56j7vy8";
           name = "osx-pseudo-daemon";
         };
@@ -40815,7 +41276,7 @@
           sha256 = "1l231168bjqz6lwzs0r9vihxi53d46csrr2gq7g33lg1zm3696ah";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-trash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-trash";
           sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
           name = "osx-trash";
         };
@@ -40836,7 +41297,7 @@
           sha256 = "116cwlhn7s47rhivz6113lh8lvaz3bjb3ynjlbx9hyf7gq3nfnxn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outline-magic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outline-magic";
           sha256 = "085yayzph3y7fh6pd5sdjdkhdcvwfzcyqd6y3xlbz7wni5ac6b5f";
           name = "outline-magic";
         };
@@ -40857,7 +41318,7 @@
           sha256 = "0d9hfr4kb6rkhwacdn70bkfchgam26gj92zfyaqw77a2sgwcmwwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outlined-elisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outlined-elisp-mode";
           sha256 = "165sivmv5h4nvh08ampq95x6b0bkzxgrdjbxjxlq6rv00vaidn7v";
           name = "outlined-elisp-mode";
         };
@@ -40878,7 +41339,7 @@
           sha256 = "0jhqpm31rsmc2r01ra48nbnd9rx9am90qk6i0qrhgfzx9q1svmj9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outorg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outorg";
           sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
           name = "outorg";
         };
@@ -40891,15 +41352,15 @@
     outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
     melpaBuild {
         pname = "outshine";
-        version = "20151203.1002";
+        version = "20160204.1546";
         src = fetchFromGitHub {
           owner = "tj64";
           repo = "outshine";
-          rev = "d1847614727a060e01d1d2f33b414a1b49d3e85b";
-          sha256 = "0g6h5ifmzxvwgyi7qrkkmr8s28kpq8xhmv7rkr3gphqrh5hyppl8";
+          rev = "14baed9f4673a52eb9f90c71ec0ae70b4d447fc5";
+          sha256 = "0y5r1wy9pjyygzkkjhm7ain2n5p875s2kivns3kmxyak3nl689sy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outshine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outshine";
           sha256 = "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4";
           name = "outshine";
         };
@@ -40920,7 +41381,7 @@
           sha256 = "1rk5pzm5wmdq68d99hhhbq8pq37bnph0dip5j2jnfj6zsw70whr2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ov";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ov";
           sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
           name = "ov";
         };
@@ -40941,7 +41402,7 @@
           sha256 = "1bfj56ackza8c1jja660v6ss9ii7prcaim5plnfqsv3k149r8qlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/overseer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/overseer";
           sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
           name = "overseer";
         };
@@ -40962,7 +41423,7 @@
           sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/owdriver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/owdriver";
           sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
           name = "owdriver";
         };
@@ -40975,15 +41436,15 @@
     ox-asciidoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-asciidoc";
-        version = "20150919.1459";
+        version = "20160120.723";
         src = fetchFromGitHub {
           owner = "yashi";
           repo = "org-asciidoc";
-          rev = "e34b1df9fa061d395e600660620ab6c3b7e59ac1";
-          sha256 = "1q7jlz0f09mwymq8m6x9fiariww7rwiy4wkqkbbc296wm7impr75";
+          rev = "da5f66d881c79cc780290d80caa528c1dd219509";
+          sha256 = "03ivnvqxc5xdcik4skk32fhr686yv2y5mj8w7v27dhyc0vdpfhvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-asciidoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-asciidoc";
           sha256 = "07b549dqyh1gk226d7zbls1mw6q4mas7kbfwkansmyykax0r2zyr";
           name = "ox-asciidoc";
         };
@@ -41004,7 +41465,7 @@
           sha256 = "0gfkb12rn40m71xv292dn3nj3h1bnn81698pinirp0nd8p4bvnin";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-gfm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-gfm";
           sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q";
           name = "ox-gfm";
         };
@@ -41025,7 +41486,7 @@
           sha256 = "19h3w3fcas60jv02v7hxjmh05804sb7bif70jssq3qwisj0j09xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-html5slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-html5slide";
           sha256 = "0nqk6chg0ky98ap2higa74786prj7dbwx2a3l67m0llmdajw76qn";
           name = "ox-html5slide";
         };
@@ -41046,7 +41507,7 @@
           sha256 = "1kf2si2lyy0xc971bx5zd2j9mnz1smc9s8l0dwc6iksh2v9q8cy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-impress-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-impress-js";
           sha256 = "0p0cc51lmxgl0xv951ybdg5n8gbzv8qf0chfgigijizzjypxc21l";
           name = "ox-impress-js";
         };
@@ -41059,15 +41520,15 @@
     ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, makey, melpaBuild, org }:
     melpaBuild {
         pname = "ox-ioslide";
-        version = "20160118.1034";
+        version = "20160120.1005";
         src = fetchFromGitHub {
           owner = "coldnew";
           repo = "org-ioslide";
-          rev = "8dcb0a4ea852d495d7d421d2141f993a250d4a23";
-          sha256 = "1s5byryi8g3vnqvzydzi4dycjpqphw1af5v9dm4rw1g9syaxm87p";
+          rev = "746bce18ec534a470ec265a14c1d982ffc3f5d3c";
+          sha256 = "0p03xzldz5v8lx3ip2pgll0da00ldfxmhr6r3jahwp6692kxpr6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-ioslide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-ioslide";
           sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
           name = "ox-ioslide";
         };
@@ -41088,7 +41549,7 @@
           sha256 = "0c2m02g6csg5fqizj3zqcm88q7w17kgvgi7swcx4fzz6rixnpsji";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-mediawiki";
           sha256 = "0lijj2n4saw0xd3jaghbvx9v6a4ldl5gd8wy7s7hfcm30wb75cdb";
           name = "ox-mediawiki";
         };
@@ -41109,7 +41570,7 @@
           sha256 = "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-nikola";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-nikola";
           sha256 = "1amplnazs9igfd382djq23d8j7r0knr0hwlpasd01aypc25c82a4";
           name = "ox-nikola";
         };
@@ -41130,7 +41591,7 @@
           sha256 = "0bawigwc6v5420642xlkyxdd0i82gicx69wqlnjf6lvhfvs990is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
           name = "ox-pandoc";
         };
@@ -41151,7 +41612,7 @@
           sha256 = "0adj6gm39qw4ivb7csfh21qqqipcnw1sgm1xdqvrk86kbs9k1b2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-pukiwiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-pukiwiki";
           sha256 = "10sfbri5hv5hyx9jc1bzlk4qmzfmpfgfy8wkjkpv7lv2x0axqd8a";
           name = "ox-pukiwiki";
         };
@@ -41172,7 +41633,7 @@
           sha256 = "196bjiij0nj19qsz95y9l44sr63673mxxj0cv6aa3ijpm48vmj9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-reveal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-reveal";
           sha256 = "092swxkkisvj2y18ynal8dn7wcfi7h4y6n0dlzqq28bfflarbwik";
           name = "ox-reveal";
         };
@@ -41193,7 +41654,7 @@
           sha256 = "1js4n8iwimc86fp2adzhbhy4ixss1yqngjd8gq7pxgpgmnhd66x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-rst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-rst";
           sha256 = "1vyj6frrl7328n2x7vc3qwv3ssdhi8bp6ja5h2q4bqalc6bl1pq0";
           name = "ox-rst";
         };
@@ -41214,7 +41675,7 @@
           sha256 = "1r9c4s9f7cvxxzf9h07rg75bil0295zq1inh5i4r6za5jabkr4dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-textile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-textile";
           sha256 = "01kri7vh16xhy8x5qd6s5z08xr0q964rk6xrligdb3i6x78wfvi4";
           name = "ox-textile";
         };
@@ -41231,11 +41692,11 @@
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org8-wikiexporters";
-          rev = "0cd92e84ad22c103b078f285ec66ff98f7ca98ca";
-          sha256 = "1rmlwx2svnsf0cg2xf0a09ncy4kx8jgn3rrnpa89z0brlafxx25s";
+          rev = "4a7028751aa6b6875466c0acee60cddee3dd2efc";
+          sha256 = "1wmjmkx2nz7alhdrbbm59dsrhrhn9fm3kjsvv3lmwgqg029vi3fp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-tiddly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-tiddly";
           sha256 = "196i8lzxv2smpj5yhmiqwazn4pvc14yqyzasrgimhv3vi2xnxlfb";
           name = "ox-tiddly";
         };
@@ -41256,7 +41717,7 @@
           sha256 = "0w6963jvz1sk732nh18735dxivd6nl59jd4m26ps6l4wqhqby0db";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-trac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-trac";
           sha256 = "0f8b3i83vzxzfa91p4ahlqz6njql18xy5nk265sjxpy9zr898rsa";
           name = "ox-trac";
         };
@@ -41273,11 +41734,11 @@
         src = fetchFromGitHub {
           owner = "marsmining";
           repo = "ox-twbs";
-          rev = "cfe67353d148e65a7676f1609d8cc22a4c8fbc78";
-          sha256 = "026g48sgqwnqs5zmrabhiv3l8052l4c1vsbsf6bdxv4a6yp0l654";
+          rev = "fb3bb0dc9c7ded39605fb6dd805b81b25e1c8f19";
+          sha256 = "0gjwpjr7gpqcnqxcgcfy2zgzh1i4z3dw9yryaqnqc8fbxrqqvk9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-twbs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-twbs";
           sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
           name = "ox-twbs";
         };
@@ -41294,11 +41755,11 @@
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org8-wikiexporters";
-          rev = "0cd92e84ad22c103b078f285ec66ff98f7ca98ca";
-          sha256 = "1rmlwx2svnsf0cg2xf0a09ncy4kx8jgn3rrnpa89z0brlafxx25s";
+          rev = "4a7028751aa6b6875466c0acee60cddee3dd2efc";
+          sha256 = "1wmjmkx2nz7alhdrbbm59dsrhrhn9fm3kjsvv3lmwgqg029vi3fp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-twiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-twiki";
           sha256 = "1p1k0yg5fxcjgwpq2ix9ckh2kn69m7d5rnz76h14hw9p72cb54r0";
           name = "ox-twiki";
         };
@@ -41319,7 +41780,7 @@
           sha256 = "12jsnfppif4l548wymvakx0f2zlm63xs6kfrb49hicmk668cq4ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/p4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/p4";
           sha256 = "0215li17gn35wmvd84gnp4hkwa2jd81wz4frb1cba2b5j33rlprc";
           name = "p4";
         };
@@ -41340,7 +41801,7 @@
           sha256 = "0cbsl184szbl486454jkn28zj4p7danp92h0zv8yscrlnyl68p0y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pabbrev";
           sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
           name = "pabbrev";
         };
@@ -41353,15 +41814,15 @@
     package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-build";
-        version = "20160112.322";
+        version = "20160129.1532";
         src = fetchFromGitHub {
           owner = "milkypostman";
           repo = "melpa";
-          rev = "553e27a3523ade9dc4951086d9340e8240d5d943";
-          sha256 = "00h1zbc4i8apvam38qah9nfs7g7fv2hnd35qhynx2c7ff0xkjq2c";
+          rev = "0fe7b0857828a041ee06b30edd2cd488cc3394c7";
+          sha256 = "15q2fwihg7pc3r3vcp3magyddzz9ylbrwyba1rf2yxh54i0mgrl5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-build";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-build";
           sha256 = "1m245q81c2jifgqxwd2fi35jrcbf6v9a1a5zy815861avq3fg9g0";
           name = "package-build";
         };
@@ -41382,7 +41843,7 @@
           sha256 = "0i7f8ambcrhyqq15xwlk31jjdcii2hr37y45va8m5w6n9mkpz8c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-filter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-filter";
           sha256 = "0am73zch2fy1hfjwzk8kg0j3lgbcz3hzxjrdf0j0a9w0myp0mmjm";
           name = "package-filter";
         };
@@ -41403,7 +41864,7 @@
           sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package+";
           sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
           name = "package-plus";
         };
@@ -41424,7 +41885,7 @@
           sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-safe-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-safe-delete";
           sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
           name = "package-safe-delete";
         };
@@ -41445,7 +41906,7 @@
           sha256 = "138l07qmxj4fkvf43f1hdn4skadxb50c023bc5101l3njzmf74wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
           name = "package-utils";
         };
@@ -41466,7 +41927,7 @@
           sha256 = "0743scd1g5xf3k9fbqv1qd9w421vfxwjlnb0vwix0ypahd83r3db";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/packed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/packed";
           sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
           name = "packed";
         };
@@ -41479,15 +41940,15 @@
     pacmacs = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pacmacs";
-        version = "20160116.1131";
+        version = "20160131.232";
         src = fetchFromGitHub {
           owner = "codingteam";
           repo = "pacmacs.el";
-          rev = "9fd3009e5a25dfdb3ff7d97b4ffb0fdde984a520";
-          sha256 = "19631m9xyrzbqv0whshxslhqylx5p77535nm49d4kyib2nb30i3m";
+          rev = "d813e9c62c2540fe619234824fc60e128c786442";
+          sha256 = "0zx72qbqy2n1r6mjylw67zb6nnchp2b49vsdyl0k5bdaq2xyqv6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pacmacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pacmacs";
           sha256 = "0w0r6z365jrglpbifb94w6c22wqi9x93qgkss9pn820hrndqbqxy";
           name = "pacmacs";
         };
@@ -41508,7 +41969,7 @@
           sha256 = "0mqd18w98p6z0i08xx7jga10ljh9360x6sqfyvfq6bjfi2jvxdbk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/page-break-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/page-break-lines";
           sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
           name = "page-break-lines";
         };
@@ -41529,7 +41990,7 @@
           sha256 = "1dq5ibz7rx9a7gm9zq2pz4c1sxgrm59yibyq92bvmi68lvf2q851";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pager";
           sha256 = "0s5zwimkbsivbwlyd7g8dpnjyzqcfc5plg53ij4sljiipgjh5brl";
           name = "pager";
         };
@@ -41550,7 +42011,7 @@
           sha256 = "11msqs8v9wn8sj45dw1fl0ldi3sw33v0xclynbxgmawyabfq3bqm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pager-default-keybindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pager-default-keybindings";
           sha256 = "0vqb3s1fxkl1fxxspq89344s55sfcplz26z0pbh347l1681h3pci";
           name = "pager-default-keybindings";
         };
@@ -41568,7 +42029,7 @@
           sha256 = "1qnv84y0s437xcsjxh0gs9rb36pydba3qfrihvz5pqs9g9w7m94k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/palette";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/palette";
           sha256 = "1v6dsph18rqfbvda2c25mqgdwap2a4zrg6qqq57n205zprpcwxc0";
           name = "palette";
         };
@@ -41589,7 +42050,7 @@
           sha256 = "1kbja107smdjqv82p84jx13jk1410c9vms89p1iy1jvn7s8g9fiq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/palimpsest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/palimpsest";
           sha256 = "18kklfdlcg982pdrslh0xqa42h28f91bdm7q2zn890d6dcivp6bk";
           name = "palimpsest";
         };
@@ -41610,7 +42071,7 @@
           sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pallet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pallet";
           sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
           name = "pallet";
         };
@@ -41623,15 +42084,15 @@
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "20151030.513";
+        version = "20160204.340";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "23444375a60f44b3439994e969d8aa7acf220f8c";
-          sha256 = "0aj509yjqgq8bxrvdq5x3d1sfj0dgwwh6kg7f20vapz9qxjdjvdg";
+          rev = "db7d7a6e887ec3d50e1f94a5743b5ef4c3af2914";
+          sha256 = "1q3r0vhch3yb0kjnp7l3x5ma39w6ir9rini4i0c7jfh54abyf78r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pandoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pandoc-mode";
           sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
           name = "pandoc-mode";
         };
@@ -41652,7 +42113,7 @@
           sha256 = "01zc2cvkyfx80snwrm3cs8cbwgxmd56rgvvbsyq53r4q3zhdk1li";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pangu-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pangu-spacing";
           sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
           name = "pangu-spacing";
         };
@@ -41673,7 +42134,7 @@
           sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paper-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paper-theme";
           sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
           name = "paper-theme";
         };
@@ -41683,22 +42144,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    paradox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hydra, json ? null, let-alist, lib, melpaBuild, seq, spinner }:
+    paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
     melpaBuild {
         pname = "paradox";
-        version = "20151211.1517";
+        version = "20160119.2027";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "paradox";
-          rev = "68643e1f473ea204b7191dbcc8a53f95eeb4a117";
-          sha256 = "1gcbdk111m1filfjj0k98s6b65wzm7kj60nfzszf7shl60j5sng7";
+          rev = "8eca9880ed52d0d53d7d5e28858ec95987fa22e1";
+          sha256 = "1vc59n9jmsn5d15v2m9xl64564h3q0c78pv4a4n3dhd1iz797l3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paradox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paradox";
           sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
           name = "paradox";
         };
-        packageRequires = [ cl-lib emacs hydra json let-alist seq spinner ];
+        packageRequires = [ emacs hydra let-alist seq spinner ];
         meta = {
           homepage = "http://melpa.org/#/paradox";
           license = lib.licenses.free;
@@ -41713,7 +42174,7 @@
           sha256 = "34dd7d8c07c697b54ea943566e6967012f7366d6f5a21e31e3d768716bc4928f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit";
           sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
           name = "paredit";
         };
@@ -41734,7 +42195,7 @@
           sha256 = "1jkpb67h96sm3fnga9hrg3kwhlp3czdv66v49a9szq174zpsnrgv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit-everywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit-everywhere";
           sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
           name = "paredit-everywhere";
         };
@@ -41744,22 +42205,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    paredit-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    paredit-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
     melpaBuild {
         pname = "paredit-menu";
-        version = "20130923.1454";
+        version = "20160128.1133";
         src = fetchFromGitHub {
           owner = "phillord";
-          repo = "phil-emacs-packages";
-          rev = "6e0142bae9cc3bfbea2fa134b6385af1c99ee782";
-          sha256 = "0ygckaj87swrnmsv5dhs55dngw1f22xm6238s9xb2axi3rr4w965";
+          repo = "paredit-menu";
+          rev = "cc0ae85bd819f9ebfa4f2a419ab3b2d70e39c9c8";
+          sha256 = "15xkanrwxh3qqay3vkfqvhzs88g7nnfv9bqk509qflyhqnvc9sxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit-menu";
-          sha256 = "17l05m1lg0vmahh53b2lvw316y4z7jz3nmy0zyiyiygax313y42l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit-menu";
+          sha256 = "05jp4cc548x5f07k096dgizhivdpaajxq38hin831sm0p9cibm4p";
           name = "paredit-menu";
         };
-        packageRequires = [];
+        packageRequires = [ paredit ];
         meta = {
           homepage = "http://melpa.org/#/paredit-menu";
           license = lib.licenses.free;
@@ -41776,7 +42237,7 @@
           sha256 = "0fds9s16c0dgq6ah98x4pv5bgwbikqwiikcxjzmk9g1m3s232fl8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paren-completer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paren-completer";
           sha256 = "0xh17h8vmsgbrq6yf5sfy3kpia4za68f43gwgkvi2m430g15fr0x";
           name = "paren-completer";
         };
@@ -41797,7 +42258,7 @@
           sha256 = "0ggpb58dw4dv9i0czj064a8fdcalgjqgl4cm5zsk7hcvjcmal9af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paren-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paren-face";
           sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
           name = "paren-face";
         };
@@ -41818,7 +42279,7 @@
           sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parent-mode";
           sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
           name = "parent-mode";
         };
@@ -41839,7 +42300,7 @@
           sha256 = "1z8cp1cdkxmdqislixxvncj0s1jx42i6arx48kdl5paymnnp282s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parse-csv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parse-csv";
           sha256 = "0khpfxbarw0plx8kka357d8wl1vvdih5797xlld9adc0g3cng0zz";
           name = "parse-csv";
         };
@@ -41860,7 +42321,7 @@
           sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parsebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parsebib";
           sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
           name = "parsebib";
         };
@@ -41881,7 +42342,7 @@
           sha256 = "14zpkxnwvwdi7wnjw4827lzzn6kw8wmwr2whavpi4rlkq8ix6dv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pass";
           sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
           name = "pass";
         };
@@ -41902,7 +42363,7 @@
           sha256 = "0yckh61v9a798gpyk8x2z9990h3b61lwsw0kish571pygfyqhjkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/passthword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/passthword";
           sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
           name = "passthword";
         };
@@ -41923,7 +42384,7 @@
           sha256 = "1pw401ar114wpayibphv3n6m0gz68zjmiwz60r4lbar45bmxvihx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/password-generator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/password-generator";
           sha256 = "0aahpplmiwmp6a06y6hl4zvv8lvzkmakmaazlckl5r3rqbsf24cb";
           name = "password-generator";
         };
@@ -41943,7 +42404,7 @@
           sha256 = "9c3ee0155b9d6b96acacaab8e799b23e92550ef136ffa2c07880029af3061733";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/password-store";
           sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
           name = "password-store";
         };
@@ -41956,15 +42417,15 @@
     password-vault = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "password-vault";
-        version = "20151121.2141";
+        version = "20160126.1220";
         src = fetchFromGitHub {
           owner = "PuercoPop";
           repo = "password-vault";
-          rev = "e47d99bb092e150472f1989ab3ac5a4752863515";
-          sha256 = "0984pzlfxsgi2060spjxw7livfh8013ffrk4x8m4sjifhniqgjqk";
+          rev = "dc56e6c2f5da66f1ab63736cecf08fb2c6c2b30f";
+          sha256 = "0921xwg3d3345hiqz4c1iyqwvfyg8rv0wggcnig7xh9qivspag4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/password-vault";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/password-vault";
           sha256 = "17i556xwq6yaxv9v18l1abcpbaz6hygsa4vf4b68fc98vcy7396a";
           name = "password-vault";
         };
@@ -41982,7 +42443,7 @@
           sha256 = "17br64snqby465bjb0l1hzw0pcms5m2knrvb6y9gn3kir4sdi6kn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastebin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastebin";
           sha256 = "19fgjcbxgmnm59qjkxhvy2aib5qs5d5a43hwvjdhxq2k6rn3f2gj";
           name = "pastebin";
         };
@@ -42003,7 +42464,7 @@
           sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastehub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastehub";
           sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
           name = "pastehub";
         };
@@ -42024,7 +42485,7 @@
           sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastelmac-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastelmac-theme";
           sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
           name = "pastelmac-theme";
         };
@@ -42044,7 +42505,7 @@
           sha256 = "c53b4f2c7449bf74648c091f249c33da3ddd8f621474a8901745b4e985cb26ab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastels-on-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastels-on-dark-theme";
           sha256 = "0zdr29793gg229r47yjb3plagxc9pszqyy4sx81ffp3rpdf0nlbh";
           name = "pastels-on-dark-theme";
         };
@@ -42065,7 +42526,7 @@
           sha256 = "1ffnkw8djs8kvfjd1crnaqram1vl4w3g1zhsqp74ds0mccsd6830";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/path-headerline-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/path-headerline-mode";
           sha256 = "0dwr8iyq62ad5xkh7r4kpywpypdq1wljsdzwqbq9zdr79yfqx337";
           name = "path-headerline-mode";
         };
@@ -42086,7 +42547,7 @@
           sha256 = "0kkgqaxyrv65rfg2ng1vmmmrc9bm98yqpsv2pcb760287dn0l27m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paxedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paxedit";
           sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
           name = "paxedit";
         };
@@ -42107,7 +42568,7 @@
           sha256 = "138w0dlp3msjmr2x09kfcnxwhdldbz9xjfy7l6lig1x9ima0z5w6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pbcopy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pbcopy";
           sha256 = "1989pkhaha6s2rmgyswnzps92x9hhzymjz4ng4a5jda1b9snp60q";
           name = "pbcopy";
         };
@@ -42128,7 +42589,7 @@
           sha256 = "1jj5h92qakrn9d5d88dvl43b7ppw96rm11hqg3791i6k48nx1d1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pc-bufsw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pc-bufsw";
           sha256 = "01d7735ininlsjkql7dy57irgwgk4k9br8bl18wq51vgkg90i5k5";
           name = "pc-bufsw";
         };
@@ -42149,7 +42610,7 @@
           sha256 = "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcache";
           sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
           name = "pcache";
         };
@@ -42170,7 +42631,7 @@
           sha256 = "0pwx1nbgciy28rivvrgka46zihmag9ljrs40bvscgd9rkragm4zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcmpl-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcmpl-args";
           sha256 = "0sry4zvr8xmzyygf2m5dms52srkd1apj3i7a3aj23qa8jvndx8vr";
           name = "pcmpl-args";
         };
@@ -42191,7 +42652,7 @@
           sha256 = "0pspxgicc0mkypp94r0jydmkjr3ngv8y4w1xpj93kp79hnvyls0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcmpl-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcmpl-git";
           sha256 = "12y9pg1g4i1ghnjvgfdpa6p84h4bcqrr23y9bazwl9n6aj20cmxk";
           name = "pcmpl-git";
         };
@@ -42212,7 +42673,7 @@
           sha256 = "17i5j5005dhzgwzds5jj1a7d31xvbshjc139vawwz2xip5aynji4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcmpl-homebrew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcmpl-homebrew";
           sha256 = "1gckzcwpg4am1ryjy08aic98mbafb64wkfmnm98d64kiwbpaacly";
           name = "pcmpl-homebrew";
         };
@@ -42233,7 +42694,7 @@
           sha256 = "14pz15by9gp0307bcdv9h90mcr35ya89wbn3y13n7k0z5r45gn58";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcmpl-pip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcmpl-pip";
           sha256 = "17nmgq4wgv4yl2rsdf32585hfa58j0825mzzajrlwgmjiqx9i778";
           name = "pcmpl-pip";
         };
@@ -42254,7 +42715,7 @@
           sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcomplete-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcomplete-extension";
           sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
           name = "pcomplete-extension";
         };
@@ -42275,7 +42736,7 @@
           sha256 = "0ymbximchjfllrglkwv4lwb2sqprvva77vfbjb6n6kzni0ix70s3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcre2el";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcre2el";
           sha256 = "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3";
           name = "pcre2el";
         };
@@ -42296,7 +42757,7 @@
           sha256 = "0aaprjczjf3al5vcypw1fsnz5a0xnnlhmvy0lc83i9aqbsa2y8af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcsv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcsv";
           sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
           name = "pcsv";
         };
@@ -42317,7 +42778,7 @@
           sha256 = "1xkkyz7y08jr71rzdacb9v7gk95qsxlsshkdsxq8jp70irq51099";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pdb-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pdb-mode";
           sha256 = "1ihkxd15kx5m5xb9yxwz8wqbmyk9iaskry9szzdz1j4gjlczb6hy";
           name = "pdb-mode";
         };
@@ -42330,15 +42791,15 @@
     pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
     melpaBuild {
         pname = "pdf-tools";
-        version = "20151224.1359";
+        version = "20160203.1257";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "97b86cd09a411d00a7947da76b4c3f77995ccf44";
-          sha256 = "05b5fn3w2bika21a5sxyjs3yfrcdvn6qdrx9li1jda9jg623bpn3";
+          rev = "6b7b10a746695e22ef9aa7d29de20c05e71c7e75";
+          sha256 = "1cj489dv8dw7qkczwib47n7zsdw4k53jkxcqm57a2jpv42bhxz4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pdf-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pdf-tools";
           sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
           name = "pdf-tools";
         };
@@ -42359,7 +42820,7 @@
           sha256 = "1clvrmvijwpffigh5f29vnwcvffqk0nrvlz26158hip1z9x7nah3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peacock-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peacock-theme";
           sha256 = "0jpdq090r37d07bm52yx3x9y3gsip6fyxxq1ax1k5k0r0js45kq9";
           name = "peacock-theme";
         };
@@ -42380,7 +42841,7 @@
           sha256 = "11nv6pll0zj9dkgzlzgav39a6x3sfi7kvfhwm96fa3iy4v8bixrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peek-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peek-mode";
           sha256 = "07wcnh3jmp2gi9xhd3d8i2n0pr2g9kav497nnz94i85awhzf8fi4";
           name = "peek-mode";
         };
@@ -42401,7 +42862,7 @@
           sha256 = "1qi9qzcvclyw9wiamsw0z8q09hs0mfhaj2giny42nd6sqacvfr7m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peep-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peep-dired";
           sha256 = "16k5y3h2ip96k071vhx83avg4r4nplnd973b1271vvxbx2bly735";
           name = "peep-dired";
         };
@@ -42422,7 +42883,7 @@
           sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peg";
           sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
           name = "peg";
         };
@@ -42442,7 +42903,7 @@
           sha256 = "1rh87jf0a15q35a8h00bx6k5wa931rb6gh600zbs7j4r3y8qsylf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/per-buffer-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/per-buffer-theme";
           sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
           name = "per-buffer-theme";
         };
@@ -42463,7 +42924,7 @@
           sha256 = "0fzypcxxd5zlkcybz0xppf09l0vf4vsfisr2y3ijsmxhg7yrwzj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perl-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perl-completion";
           sha256 = "01p17mlkwjm60f14arda3ly8ng0r98nn3rly94ghn6jr7r7fv14b";
           name = "perl-completion";
         };
@@ -42484,7 +42945,7 @@
           sha256 = "11fs78b7ssz18wr35vxf6h4zpfj4l4vsikfzayq6hyqjnchv7b45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perl6-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perl6-mode";
           sha256 = "0af1djypd8n0n1fq10sl8mrdg27354kg9g87d6xz4q5phvi48cqv";
           name = "perl6-mode";
         };
@@ -42505,7 +42966,7 @@
           sha256 = "0wg0cpqxzfgln6xdngzspsbfirn9a5jxpgk66m0fpi33215z9q26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perlbrew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perlbrew";
           sha256 = "1qadwkcic2qckqy8hgrnj08ajhxayknhpyxkc6ir15vfqjk5crr8";
           name = "perlbrew";
         };
@@ -42526,7 +42987,7 @@
           sha256 = "0h05j55y3csq91a5m2fg99y4rzsh7zca7hnifb6kic5zb3nahi00";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persistent-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persistent-scratch";
           sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
           name = "persistent-scratch";
         };
@@ -42547,7 +43008,7 @@
           sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persistent-soft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persistent-soft";
           sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
           name = "persistent-soft";
         };
@@ -42560,15 +43021,15 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20160115.533";
+        version = "20160129.655";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "56828b520e30662da7a20557971b47a99c56011a";
-          sha256 = "0fqmmv1y0vpgivad1nc8bq781wakfsp2azhxb20lpk7wqa0hp3kr";
+          rev = "fe239586593c9f7884d4a105ce21038ab464e251";
+          sha256 = "0ah2zimbs59ivg7mvnz5zv3q4lx3ms43ip49l2zyf8jf2dnmhpn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persp-mode";
           sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
           name = "persp-mode";
         };
@@ -42589,7 +43050,7 @@
           sha256 = "0b9hz253m6d58dwsjsk9d1fw0ql33m9wfvyx10ncsqbr0j0s98k5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persp-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persp-projectile";
           sha256 = "10l2kqjyigg98qbbpf3qf4d5bm63kkk4vp7ip8fibgj1p9gqmnxm";
           name = "persp-projectile";
         };
@@ -42610,7 +43071,7 @@
           sha256 = "1ajmyl3bg01a3gkhay4qibgk9a0r6s8rhf1cc1678w3cm0w6yvmd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perspective";
           sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
           name = "perspective";
         };
@@ -42631,7 +43092,7 @@
           sha256 = "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pg";
           sha256 = "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji";
           name = "pg";
         };
@@ -42652,7 +43113,7 @@
           sha256 = "0c9d4c24ic67y07y74bv5b7vc56b6l0lbh2fbzm870r1dl5zbzcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pgdevenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pgdevenv";
           sha256 = "0za35sdwwav81wpk4jjqh56icaswwxxyg3bqqp0qiz24llb5ln1w";
           name = "pgdevenv";
         };
@@ -42673,7 +43134,7 @@
           sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ph";
           sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
           name = "ph";
         };
@@ -42694,7 +43155,7 @@
           sha256 = "0y77ld1cmfpv9p7yx2mlbvjm5ivsrf2j0g0h4zabfrahz22v39d4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phabricator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phabricator";
           sha256 = "07988f2xyp76xjs25b3rdblhmijs2piriz4p0q92jw69bdvkl14c";
           name = "phabricator";
         };
@@ -42715,7 +43176,7 @@
           sha256 = "14g06ndxrqz80kdyhil6ajcqqxkfa77r1gr7vwqa9sq6jgm8dpx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-autopair";
           sha256 = "1ya1bvh28qgz1zg9kdh2lzbsf0w0lx4xr42mdrjwaz3bbfa9asg4";
           name = "phi-autopair";
         };
@@ -42736,7 +43197,7 @@
           sha256 = "1rchxhp4kji5kbg8kzkzdbfy8sdbgbqd5g59cch7ia9agh5jvwyx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-grep";
           sha256 = "1y5lq6lq9qdydbypb1pjnxryh94a295nnqqh2x27whiwdiysirjj";
           name = "phi-grep";
         };
@@ -42757,7 +43218,7 @@
           sha256 = "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-rectangle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-rectangle";
           sha256 = "08yw04wmbgbbr60i638m0rspfwn3cp47ky5ssgjcgcmmdgg9yfvy";
           name = "phi-rectangle";
         };
@@ -42778,7 +43239,7 @@
           sha256 = "10kyq3lkhmbmj1hl9awzc0w8073dn9mbjd5skh660ljg5mmi6x62";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search";
           sha256 = "0nj06ixl76dd80zg83q4bi8k224mcwb612mr4gd1xppj5k8xl03g";
           name = "phi-search";
         };
@@ -42799,7 +43260,7 @@
           sha256 = "1b44947hncw4q42fxxrz6fm21habzp4pyp0569xdwysrx2rca2fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search-dired";
           sha256 = "1gf3vs3vrp5kbq4ixnj7adazmnqixi63qswgc2512p10gf7inf8p";
           name = "phi-search-dired";
         };
@@ -42820,7 +43281,7 @@
           sha256 = "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search-mc";
           sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
           name = "phi-search-mc";
         };
@@ -42841,7 +43302,7 @@
           sha256 = "1k8hjnkinzdxy9qxldsyvj6npa2sv48m905d1cvxr8lyzpc5hikh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search-migemo";
           sha256 = "0qk73s09sasm438w29j5z2bmlb60p1mgbv2ch43rgq8c6kjzg6h6";
           name = "phi-search-migemo";
         };
@@ -42862,7 +43323,7 @@
           sha256 = "1fg63g1cm9mp50sf3ldcb0pr4bvlfxx010arisxdkj102pmib2ri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phoenix-dark-mono-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phoenix-dark-mono-theme";
           sha256 = "15in299j170n0wxmkg3cx1zzx1n7r1ifraqqzfqhcnk8i8lmc939";
           name = "phoenix-dark-mono-theme";
         };
@@ -42883,7 +43344,7 @@
           sha256 = "042yw44d5pwykl177sdh209drc5f17yzhq0mxrf7qhycbjs4h8cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phoenix-dark-pink-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phoenix-dark-pink-theme";
           sha256 = "0bz6iw73d85bi12qqx6fdw3paqknrxvn0asbwjmgdcrlqrfczjlr";
           name = "phoenix-dark-pink-theme";
         };
@@ -42904,7 +43365,7 @@
           sha256 = "1l64rka9wrnwdgfgwv8xh7mq9f1937z2v3r82qcfi6il3anw4zm0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-auto-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-auto-yasnippets";
           sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
           name = "php-auto-yasnippets";
         };
@@ -42925,7 +43386,7 @@
           sha256 = "10lzbyr7z95mynz885k75n2ibsy92dh3mg3s5m69n03jnf9gv1jy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-boris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-boris";
           sha256 = "19yfbrlfqikix2lnnlbpzm6yakjhl84ix0zra2ycpvgg2pl88r0g";
           name = "php-boris";
         };
@@ -42946,7 +43407,7 @@
           sha256 = "1wk7vq80v97psxfg0pwy4mc6kdc61gm6h1vgl9p71ii6g6zvzcqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-boris-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-boris-minor-mode";
           sha256 = "1cmpd303chldss7kylpinv8qc3c78srz02a9cp9x79c8arq7apwl";
           name = "php-boris-minor-mode";
         };
@@ -42967,7 +43428,7 @@
           sha256 = "0hm6myvf91f4d2yfc7fs2xky9m8hfnimx1gkfzmn9f5pcc2l2p0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-eldoc";
           sha256 = "1q5fkl8crqrgxik2mxbkqv10qnqhqrazd66rgfw797s3jcchv58j";
           name = "php-eldoc";
         };
@@ -42988,7 +43449,7 @@
           sha256 = "0206jv7rz9gm016lpfdwh2l0z6da25szc6hfxgcz2qvkzjpvrlr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-mode";
           sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
           name = "php-mode";
         };
@@ -43009,7 +43470,7 @@
           sha256 = "0f1n0jcla157ngqshq5n8iws216ar63ynjd6743cbdrzj0v030wg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php+-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php+-mode";
           sha256 = "1ibcsky6la3l7gawpgx814w1acjf73b68i6wbb4p6saxhwg6adik";
           name = "php-plus--mode";
         };
@@ -43030,7 +43491,7 @@
           sha256 = "163albjkq7ldc9fki368540m7nl58qa70wfpff08gx3gsvywfnyi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-refactor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-refactor-mode";
           sha256 = "0gj0nv6ii7pya0hcxs8haz5pahj0sa12c2ls53c3j85in645zb3s";
           name = "php-refactor-mode";
         };
@@ -43051,7 +43512,7 @@
           sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phpcbf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phpcbf";
           sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
           name = "phpcbf";
         };
@@ -43072,7 +43533,7 @@
           sha256 = "1zghw5nfm4a9j98vsaw4fc8r4f98s5fhgvgbnbyyxapl851fa9i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phpunit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phpunit";
           sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
           name = "phpunit";
         };
@@ -43093,7 +43554,7 @@
           sha256 = "053jqzl0sp3dnl4919vi30xqrdcpi9jsqx5hndj1bprf7926w11d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pianobar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pianobar";
           sha256 = "16vsf2cig9qjbh9s58zb5byjmyghxbsxpzpm5hyyrv251jap1jjn";
           name = "pianobar";
         };
@@ -43114,7 +43575,7 @@
           sha256 = "0p91ysyjksbravnw3l78mshay6swgb5k1zi5bbppppk8zkmdp115";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/picolisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/picolisp-mode";
           sha256 = "1n56knbapyfs8n23arzlz27y0q4846r64krwlwh8agfqkcdw9dp5";
           name = "picolisp-mode";
         };
@@ -43135,7 +43596,7 @@
           sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pig-mode";
           sha256 = "0gmvc4rrqkn0cx8fk1sxk6phfbpf8dcba3k6i24k3idcx8rxsw3x";
           name = "pig-mode";
         };
@@ -43156,7 +43617,7 @@
           sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pig-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pig-snippets";
           sha256 = "1sqi0a2dsqgmabkrncxiyrhibyryyy25d11b15ybhlngd05wqbx2";
           name = "pig-snippets";
         };
@@ -43177,7 +43638,7 @@
           sha256 = "19i8hgzr7kdj4skf0cnv6vlsklq9qcyxcv3p33k9vgq7y4f9mah8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pillar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pillar";
           sha256 = "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js";
           name = "pillar";
         };
@@ -43198,7 +43659,7 @@
           sha256 = "0wy9c37g6m5khchlp8qvfnjgkwq4r38659adcm5prvzjgzqhlfja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pinboard-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pinboard-api";
           sha256 = "0yzvgnpkj2fhl01id36nc5pj8vyb05bllraiz3lwwcc66y98h9n0";
           name = "pinboard-api";
         };
@@ -43219,7 +43680,7 @@
           sha256 = "1wc31r5fpcia4n4vbpg7vv3rzrnjzh18yygi3kp4wvl2wzx2azqh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pinot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pinot";
           sha256 = "1kjzq02pddnkia637xz2mnjjyglyh6qzragnf7nnxbw9ayiim58i";
           name = "pinot";
         };
@@ -43240,7 +43701,7 @@
           sha256 = "096izagfjw8cnxjq3v70x8a55npyxnr40mg1fc9b1jnqw6qwf491";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pinyin-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pinyin-search";
           sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
           name = "pinyin-search";
         };
@@ -43253,15 +43714,15 @@
     pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pip-requirements";
-        version = "20150423.1558";
+        version = "20160131.1126";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "pip-requirements.el";
-          rev = "f8d3ecaee9090cee267476d4551c905c412d6017";
-          sha256 = "05ix3xwqhnxjvc6cr006hhcgzhrp88jz9x4iswb0sidwysidpgnx";
+          rev = "a3656a8949c78f3d64b9a13ae3ed868005d82119";
+          sha256 = "0j4h6q1s2s9dw1pp22xsajchwg8nh3x4x5qxbzf19i1xbpcghw7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pip-requirements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pip-requirements";
           sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
           name = "pip-requirements";
         };
@@ -43282,7 +43743,7 @@
           sha256 = "1sbwqrk9nciqwm53sfbq3nr9f9zzpz79dmxs8yp005dk7accdlls";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pivotal-tracker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pivotal-tracker";
           sha256 = "195wcfn434yp0p93zqih1snkkg1v7nxgb4gn0klajahmyrrjq2a2";
           name = "pivotal-tracker";
         };
@@ -43303,7 +43764,7 @@
           sha256 = "0nnvf2p593gn8sbyrvczyll030xgnkxn900a2hy7ia7xh0wmvddp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pixie-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pixie-mode";
           sha256 = "16z15yh78837k548xk5widdmy6fv03vym6q54i40knmgf5cllsl8";
           name = "pixie-mode";
         };
@@ -43324,7 +43785,7 @@
           sha256 = "14gn2qd72x3zfqzh2cngxcjpdiibyki1g4d1vdav5v9vcbglgm5d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pixiv-novel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pixiv-novel-mode";
           sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
           name = "pixiv-novel-mode";
         };
@@ -43345,7 +43806,7 @@
           sha256 = "1xkdbyhz9mgdz5zmjm4hh050klsl12w5lkckw2l77ihcxv0vjnf2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pkg-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pkg-info";
           sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
           name = "pkg-info";
         };
@@ -43366,7 +43827,7 @@
           sha256 = "077vp3fxwxj7b98ydw6iyi391w3acp73qwk6615yqdylpp66m750";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pkgbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pkgbuild-mode";
           sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
           name = "pkgbuild-mode";
         };
@@ -43387,7 +43848,7 @@
           sha256 = "0rpiyp95k14fsc5hdbnj4hs3snh0vm8a2skcplsdwkmb5j9547w1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plan9-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plan9-theme";
           sha256 = "0bvr877mc79s1shr82b33ipspz09jzc3809c6pkbw0jqpfid44cc";
           name = "plan9-theme";
         };
@@ -43408,7 +43869,7 @@
           sha256 = "0q4zdw58yawqp9rhx04lhq0v7iaf61ydbw19gpw4an85j2hxrkzq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/planet-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/planet-theme";
           sha256 = "1mhbydvk7brmkgmij5gpp6l9ixcyh1g3r4fw3kpq8nvgbwknsqc9";
           name = "planet-theme";
         };
@@ -43429,7 +43890,7 @@
           sha256 = "0jvs051ncpv7pwx2kr14fm1wqakabwc031xcv7lba0mx7shxzqdg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plantuml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plantuml-mode";
           sha256 = "0fg313mx9jz92lf9lr5apvma9ixfz02dvyzw1phsgzawi7hai264";
           name = "plantuml-mode";
         };
@@ -43450,7 +43911,7 @@
           sha256 = "1k3bqv5y2xp1jl2hpf8qhs11yzhcl8k40fxqjzv7mvc0ysq9y6wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/platformio-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/platformio-mode";
           sha256 = "022l20sfyfkvp6kmmqxr7gcmcdx6b1dgsakjjnx8fknrpxr5kyps";
           name = "platformio-mode";
         };
@@ -43471,7 +43932,7 @@
           sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plenv";
           sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
           name = "plenv";
         };
@@ -43492,7 +43953,7 @@
           sha256 = "07hspp4bkb3f5dm0l1arm0w1m04cq4glg81x4a9kf7bl601wzki2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plim-mode";
           sha256 = "0247fpvxki5jhxw6swv7pcw0qwxrqnp75acnfss2lf984vggzhxi";
           name = "plim-mode";
         };
@@ -43513,7 +43974,7 @@
           sha256 = "1r2yxa7gqr0z9fwhx38siwjpg73a93rdmnhr4h6nm6lr32vviyxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsense";
           sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
           name = "plsense";
         };
@@ -43534,7 +43995,7 @@
           sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsense-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsense-direx";
           sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
           name = "plsense-direx";
         };
@@ -43552,7 +44013,7 @@
           sha256 = "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsql";
           sha256 = "1jvppmfdll34b8dav5dvbabfxiapv92p7lciblj59a707bbdb7l1";
           name = "plsql";
         };
@@ -43571,7 +44032,7 @@
           sha256 = "0x3s9fj41n6a21la762qm1si9ysv3zj5bbp6ykfskr73sxq6s9ff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pmdm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pmdm";
           sha256 = "1zmy6cbnqhsbwc5vx30mx45xn88d2186hgrl75ws7vvbl197j03b";
           name = "pmdm";
         };
@@ -43592,7 +44053,7 @@
           sha256 = "1p1j2kfwj7gzir7q5ls34k8764kwbnb6d0dhlw4zb4kvwlidp6c1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/point-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/point-stack";
           sha256 = "17z9mc49x4092axs7lq6b6z7yrrhkl8bdx5f8gq6qy5lampgyzch";
           name = "point-stack";
         };
@@ -43610,7 +44071,7 @@
           sha256 = "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/point-undo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/point-undo";
           sha256 = "0by7ifj1lf0w9pp7v1j9liqjs40k8kk9yjnznxchq172816zbg3k";
           name = "point-undo";
         };
@@ -43631,7 +44092,7 @@
           sha256 = "016cjy5pnnqccjqb0njqc9jq6kf6p165nlki83b8c0sj75yxghav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pointback";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pointback";
           sha256 = "198q511hixvzc13b3ih89xs9g47rdvbiixn5baqakpmpx3a12hz4";
           name = "pointback";
         };
@@ -43652,7 +44113,7 @@
           sha256 = "0dlgmp1vmpvfjx19jz52xjmpg0fi1d0gy3zz7rsyjdkdw8dmr1v6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/polymode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/polymode";
           sha256 = "0ndavaan7k55l3ghm5h08i0slmmzc82c0gl4b8w91fa8bi2lq4h4";
           name = "polymode";
         };
@@ -43673,7 +44134,7 @@
           sha256 = "1dlk0ypw8316vgvb7z2p7fvaiz1wcy1l8crixypaya1zdsnh9v1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pomodoro";
           sha256 = "075sbypas8xlhsw8wg3mgi3fn5yf7xb3klyjgyy8wfkgdz0269f8";
           name = "pomodoro";
         };
@@ -43694,7 +44155,7 @@
           sha256 = "1g1yw0ykwswl9dnicyi7kxskqqry40wjykshgrqhs4k09j3jnacr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pony-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pony-mode";
           sha256 = "1hgiryhpxv30bjlgv9pywzqn2ypimwzdhx03znqvn56zrwn1frnl";
           name = "pony-mode";
         };
@@ -43704,19 +44165,40 @@
           license = lib.licenses.free;
         };
       }) {};
+    pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "pony-snippets";
+        version = "20160126.2307";
+        src = fetchFromGitHub {
+          owner = "seantallen";
+          repo = "pony-snippets";
+          rev = "91c17c8af222f8177df12122d36399ea1ec6e8b4";
+          sha256 = "139j696lvwpx5kwmk37xhaklid3zs431lyqyml2hy8wbz316jrra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pony-snippets";
+          sha256 = "06rrzfg20kzpscnqr2lin9jvrcydq4wnrv7nj1d0lm6988qz88jx";
+          name = "pony-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/pony-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
     ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ponylang-mode";
-        version = "20160116.845";
+        version = "20160123.1637";
         src = fetchFromGitHub {
-          owner = "abingham";
+          owner = "SeanTAllen";
           repo = "ponylang-mode";
-          rev = "f7349f5d74cc3aa408f4cd826258653ef56701be";
-          sha256 = "1jza1gprf21kmy8ysfg8iqz450c0gp3lbnp27gszwv8cn279x3rp";
+          rev = "d05425eca7c924109263bdac72083137a7967454";
+          sha256 = "0jlycv0ck5kbszwc0v2gbka6k5h39nz8763ws0v8jada7zzmyvxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ponylang-mode";
-          sha256 = "06fy4aiflsynnybbrahfcmg0swxrfnwn48gr8ly3sqfpc037h2f3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ponylang-mode";
+          sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1";
           name = "ponylang-mode";
         };
         packageRequires = [ dash ];
@@ -43736,7 +44218,7 @@
           sha256 = "0n1w1adglbavqgrv16rzhym72c3q083mh0c8yl5lj7adn4nr4gr3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pophint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pophint";
           sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
           name = "pophint";
         };
@@ -43757,7 +44239,7 @@
           sha256 = "0ja1kq4pl62zxlzwv2m8zzb55lg2fl366bi9pzvxl38frvbqg8qx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/poporg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/poporg";
           sha256 = "08s42689kd78h2fmw230ja5dd3c3b4lx5mzadncwq0lj91y86kd8";
           name = "poporg";
         };
@@ -43778,7 +44260,7 @@
           sha256 = "19sbdxs6l66nflfb4kmx4lb6z0shwpfq79b5h9hhi0xr70xacd4b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup";
           sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
           name = "popup";
         };
@@ -43799,7 +44281,7 @@
           sha256 = "1q9zajv6g7mi6k98kzq3498nhmdkp1z9d2b8vgzbk7745d39gm9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-complete";
           sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
           name = "popup-complete";
         };
@@ -43820,7 +44302,7 @@
           sha256 = "0fvj61n0kriniz1v96lxbdb9x6gbx00xwkcg83ajqv7f18j3m6wh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-imenu";
           sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
           name = "popup-imenu";
         };
@@ -43841,7 +44323,7 @@
           sha256 = "1zdwlmk3vr0mq0dxrnkqjncalnbmvpxc0lma2sv3a4czl8yv0inn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-kill-ring";
           sha256 = "1jfw669xi2983jj3hiw5lyhc0rc0318qrmqx03f7m4ylg70dgxip";
           name = "popup-kill-ring";
         };
@@ -43854,15 +44336,15 @@
     popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "popup-switcher";
-        version = "20160112.217";
+        version = "20160123.1600";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "popup-switcher";
-          rev = "a5de386b6fa0b8bbc2a58b7af36be9d32abe7ca9";
-          sha256 = "00qyc5kixb2y1a5rrylq2ln470ny3mihx07ybdim8s8q29dzajy6";
+          rev = "df48ac506dbd5b1c611d6cd0066ebeb91b4d97d1";
+          sha256 = "19c916bz354di7p4md8456xhf3i72db86mwlk2wrq0d4kx16dh0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-switcher";
           sha256 = "1888xiqhrn7fcpjnr3smchmmqwfayfbbyvdkdb79c6drzjcvidp1";
           name = "popup-switcher";
         };
@@ -43883,7 +44365,7 @@
           sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popwin";
           sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
           name = "popwin";
         };
@@ -43904,7 +44386,7 @@
           sha256 = "1pm4x74pw67m2izr9dir201dn5g9icgk6h2j8rqvasgx8v8krv3i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/portage-navi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/portage-navi";
           sha256 = "1wjkh8xj5120v9fz1nrpkd6x4f22ni8h2lfkd82df7kjz6bzdfwg";
           name = "portage-navi";
         };
@@ -43925,7 +44407,7 @@
           sha256 = "168hl76rhj6f5ncmrij4rd3z55228h6kb23384h2phsjw0avgf23";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pos-tip";
           sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
           name = "pos-tip";
         };
@@ -43946,7 +44428,7 @@
           sha256 = "1jzqav2lchr0ggckjq9rwlxwryi7m7xnmn8471zgiamd1h04ddqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pow";
           sha256 = "05wc4ylp0xjqbzrm046lcsv4aw2a6s2rfv1ra38bfr0dai6qrsrn";
           name = "pow";
         };
@@ -43967,7 +44449,7 @@
           sha256 = "0dq7fqlv72p72hbshzbwz5k40mqfdw10v9hsd1m18s2rf7082570";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powerline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powerline";
           sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
           name = "powerline";
         };
@@ -43988,7 +44470,7 @@
           sha256 = "1c8y4r7zdr6764kzs5bc64idv2pfjvi78lg2f1d2hp1595ia8y5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powerline-evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powerline-evil";
           sha256 = "0cdnmq9f06lzkj0hs948a7j5sgg6fl5f36bfnyaxgss23akbfjhr";
           name = "powerline-evil";
         };
@@ -44001,15 +44483,15 @@
     powershell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "powershell";
-        version = "20160101.2018";
+        version = "20160127.2323";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "powershell.el";
-          rev = "348560747fb4e0f47475be0fb3a11ad576d364fe";
-          sha256 = "0fi8a3l64brljmlbk5j65vj3n5x1ygi07fxvxq5xllbzg0h8x4hc";
+          rev = "7feddfc9ea073b374575c67a10692b7bfc35907b";
+          sha256 = "096dks3wib5x29k722d7qkgr61n3qk29gw3rzkwsrid23zhvgnkn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powershell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powershell";
           sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
           name = "powershell";
         };
@@ -44027,7 +44509,7 @@
           sha256 = "10gsdjdr8qngimqh57qxcljjnypbf38asxqb3zlfwc2ls52fc19q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pp-c-l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pp-c-l";
           sha256 = "0gbqxlrsh9lcdkrj8bqh1mpxyhdlwbaxz4ndp5s90inmisaqb83v";
           name = "pp-c-l";
         };
@@ -44045,7 +44527,7 @@
           sha256 = "0zlmcrg8gx812gm04cil7p2z0g4814c158yv1ghmrbxshn8p45fg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pp+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pp+";
           sha256 = "1ng5x7dp85y6yqj6q43h08qdnapg2j1ab8rmc47w4w79d1pryniq";
           name = "pp-plus";
         };
@@ -44066,7 +44548,7 @@
           sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ppd-sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ppd-sr-speedbar";
           sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
           name = "ppd-sr-speedbar";
         };
@@ -44087,7 +44569,7 @@
           sha256 = "0yrfd9qaz16nqcvjyjm9qci526qgkv6k51q5752h3iyqkxnss1pd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/preproc-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/preproc-font-lock";
           sha256 = "1ra0lgjv6713zym2h8pblf2ryf0f658l1khbxbwnxl023gkyj9v4";
           name = "preproc-font-lock";
         };
@@ -44108,7 +44590,7 @@
           sha256 = "1dyi9nc2q43jf87xiz9xw42irrbla2vyixifdiibh6nm9misnfj0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/preseed-generic-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/preseed-generic-mode";
           sha256 = "0c0zs07lspwczbcba56fai0rshjzx9zd3jqxgj9nwjf9xlcr8m3j";
           name = "preseed-generic-mode";
         };
@@ -44126,7 +44608,7 @@
           sha256 = "1fn24399wsn12453py0hw2vbbkrkakiwi06cjvjzsdk7g3326ma4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-lambdada";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-lambdada";
           sha256 = "16v5fgifz672c37xyzv557mm6za4rldvdrb26vdymxqg4fy62fd6";
           name = "pretty-lambdada";
         };
@@ -44147,7 +44629,7 @@
           sha256 = "0ccqym98c6zdyrparj5n97bpp9rspxb3z5lqfcrjypp0kn04z1ss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-mode";
           sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
           name = "pretty-mode";
         };
@@ -44168,7 +44650,7 @@
           sha256 = "1n0594msgy53ia58gjfkm3z3cnmq52wrq5992fm28s4jgazbgdfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-sha-path";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-sha-path";
           sha256 = "0qqsg383391dnsk46xm8plq7xmdmnis3iv7h7dmchpzd99bkm9lq";
           name = "pretty-sha-path";
         };
@@ -44189,7 +44671,7 @@
           sha256 = "1f00l9f6an1mh8yhf629mw0p37m4jcpl8giz47xbdyw1k6bqn830";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-symbols";
           sha256 = "0d1ad2x4md0n3fad3s2355wm8hl311qdhih1gkdqwdaj4i1d6gvb";
           name = "pretty-symbols";
         };
@@ -44210,7 +44692,7 @@
           sha256 = "0zng64f5vwnpkf9fk59yv1ndc646q608a6awr1y9qk0mhzbfzhqm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/private";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/private";
           sha256 = "1glpcwcyndyn683q9mg99hr0h3l8pz7rrhbnfak01v826d5cnk9g";
           name = "private";
         };
@@ -44231,7 +44713,7 @@
           sha256 = "1pxr5a9ik09k0f58lawhxiv179n5j8q24zhrs9vjk93yskl1ydwn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/private-diary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/private-diary";
           sha256 = "0dgnf375c00nlkp66kbkzsf469063l03b9miiplbhd63zshlv1i1";
           name = "private-diary";
         };
@@ -44252,7 +44734,7 @@
           sha256 = "0nly5h0d6w8dc08ifb2fiqcn4cqcn9crkh2wn0jzlz4zd2x75qrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/proc-net";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/proc-net";
           sha256 = "0562x2s3kk9vlaavak4lya1nlmn4mwlzlc7nw1l3687q023z4hmv";
           name = "proc-net";
         };
@@ -44273,7 +44755,7 @@
           sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/processing-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/processing-mode";
           sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
           name = "processing-mode";
         };
@@ -44294,7 +44776,7 @@
           sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/processing-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/processing-snippets";
           sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
           name = "processing-snippets";
         };
@@ -44315,7 +44797,7 @@
           sha256 = "18j0jwp8z4ff7xfiijyh09cvb14mbjfaygin2qjp6bxgx3c1mpin";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prodigy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prodigy";
           sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
           name = "prodigy";
         };
@@ -44336,7 +44818,7 @@
           sha256 = "0hx7rxa3smdippcpj4j63k0r5l4wflllb0vpnwwknc9j93r7042b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/professional-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/professional-theme";
           sha256 = "1l8nisn2c124cpylyahr76hfpdim2125zrns2897p466l5wcxcx5";
           name = "professional-theme";
         };
@@ -44357,7 +44839,7 @@
           sha256 = "1szxsbk470fg3jp70r20va9hnnf4jj0mb7kxdkn6rd7ky6w34lwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prognth";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prognth";
           sha256 = "0hr5a3s0ij4hvn424v885z7pcs62yqm9mamw5b096hgjxgjf6ylm";
           name = "prognth";
         };
@@ -44378,7 +44860,7 @@
           sha256 = "1yklm43d0ppyf4simhqab6m892z4mmxs2145lzw6kpizixavcv00";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/programmer-dvorak";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/programmer-dvorak";
           sha256 = "1w8r35hkl6qy9a89l0m74x9q2vcc4h2hvmi3r2hqcy2ypkn5l5bv";
           name = "programmer-dvorak";
         };
@@ -44399,7 +44881,7 @@
           sha256 = "04l4m3kxbwvyw9xy6cwakrdxxdswrrs7sya8zn6m738aawbr1mcd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-explorer";
           sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
           name = "project-explorer";
         };
@@ -44418,7 +44900,7 @@
           sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-local-variables";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-local-variables";
           sha256 = "0mrf7p420rmjm8ydwc5blpxr6299pdg3sy3jwz2zz0420gkp0ihl";
           name = "project-local-variables";
         };
@@ -44439,7 +44921,7 @@
           sha256 = "1fvjap0bsyw5q92q50wk8c81yv4g8nqb6jdlnarf80glwk50avrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-persist";
           sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
           name = "project-persist";
         };
@@ -44460,7 +44942,7 @@
           sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-persist-drawer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-persist-drawer";
           sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
           name = "project-persist-drawer";
         };
@@ -44480,7 +44962,7 @@
           sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-root";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-root";
           sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
           name = "project-root";
         };
@@ -44493,15 +44975,15 @@
     projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20160115.223";
+        version = "20160130.657";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "68f8f0c4e330e3eb2c4c140c1fbdf66ca11e45df";
-          sha256 = "09p4cgg8129lxalj5nja39a6827q973z0zdgxzi0n53xhzlsznag";
+          rev = "543841e3f6dc4d46c75755cf227b22acc1bfad48";
+          sha256 = "17w0nlr7h8dga8fl48lfb22i898cbgnqmxrqa7cah212yqyn4fp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
           name = "projectile";
         };
@@ -44522,7 +45004,7 @@
           sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-codesearch";
           sha256 = "0jgvs9is59q45wh2a7k5sb6vj179ixqgj5dlndj9r6fh59qgrzdk";
           name = "projectile-codesearch";
         };
@@ -44535,15 +45017,15 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20151126.1145";
+        version = "20160204.1003";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "cc1698f6ba4c54b1d19e73ea7fb3276234a285c5";
-          sha256 = "0hh2hwyhdb1k7ba8vy1ys2i8qvf7sxw8a3v24m3b2cmrg3hz3hcb";
+          rev = "21ce05e412b0efebfeab9f84d38c679758ddbf76";
+          sha256 = "0f0siz230xsv20h8wmwa1i8wdsp964y6qmb2i3l485yh03bz1x95";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-rails";
           sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
           name = "projectile-rails";
         };
@@ -44564,7 +45046,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-sift";
           sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
           name = "projectile-sift";
         };
@@ -44585,7 +45067,7 @@
           sha256 = "0lr3vx1byf0i9jdzbyrvvzyzi1nfddvw5r9f9wm7gpfp5l8772la";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-speedbar";
           sha256 = "0dli4gzsiycivh8dwa00lfpbimyg42qygfachzrhi8qy5413pwlp";
           name = "projectile-speedbar";
         };
@@ -44606,7 +45088,7 @@
           sha256 = "0y8zbywin99nhcrs5nzx4d179r84rdy39admajpi0j76v0b9pwl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projector";
           sha256 = "0hrinplk607wcc2ibn05pl8ghikv9f3zvymncp6nz95jw9brdapf";
           name = "projector";
         };
@@ -44627,7 +45109,7 @@
           sha256 = "0hvvlh24157qjxz82sbg22d4cbrf95xyx202cybp0n1vyxsmjcmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projekt";
           sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
           name = "projekt";
         };
@@ -44648,7 +45130,7 @@
           sha256 = "1sxxy0s96sgm6i743qwjs0qjpsdr03gqc1cddvvpxbryh42vw9jn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projmake-mode";
           sha256 = "192gvmhcz1anl80hpmcjwwd08dljyrap9sk6qj0y85mcnaafm882";
           name = "projmake-mode";
         };
@@ -44669,7 +45151,7 @@
           sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prompt-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prompt-text";
           sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
           name = "prompt-text";
         };
@@ -44690,7 +45172,7 @@
           sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prop-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prop-menu";
           sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
           name = "prop-menu";
         };
@@ -44711,7 +45193,7 @@
           sha256 = "0lch20njy248w7bnvgs7jz0zqasskf5dakmykxwpb48llm6kx95v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/propfont-mixed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/propfont-mixed";
           sha256 = "19k0ydpkiviznsngwcqwn4k30r6j8w34pchgpjlsfwq1bndaai9y";
           name = "propfont-mixed";
         };
@@ -44732,7 +45214,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prosjekt";
           sha256 = "1fn7ii1bq7bjkz27hihclpvx0aabgwy3kv47r9qibjl2jin97rck";
           name = "prosjekt";
         };
@@ -44749,11 +45231,11 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "bbe6e430f62fc89aac6712403a42121665f00a88";
-          sha256 = "0wiw59shlrg2wd2lmgwpjyqb4gazhljb3b43mn2rffx62s86hzij";
+          rev = "bd8a476510d17d3841ff2509fbd67b7f4b543c1c";
+          sha256 = "0x6419waryq14y1q8v53riwjnqfw6azf4sfpsik9qjsznzmlgxx9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/protobuf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/protobuf-mode";
           sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
           name = "protobuf-mode";
         };
@@ -44766,15 +45248,15 @@
     psc-ide = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20160106.415";
+        version = "20160203.1732";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "d5de1f88860ce6d343d39dcec666db0ebdc0f513";
-          sha256 = "0i5qdx76r0zchhv115nx2gr4r7915df08b9kiaa0i7s3dxc6zmg3";
+          rev = "43552df23d65a6ef9bf410c0fa992c9d2342fc67";
+          sha256 = "0awlkvbll2cxc9rzzm1ln5qhp05jikihcay1wz74dkwzwlfjlp17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psc-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psc-ide";
           sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9";
           name = "psc-ide";
         };
@@ -44795,7 +45277,7 @@
           sha256 = "08j31bg5vwgirv5n5fsw7w6gncrkpwpjlj2m00dhj8wbvhp503sn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psci";
           sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
           name = "psci";
         };
@@ -44816,7 +45298,7 @@
           sha256 = "1b8w9wnrwk4j2gn543phz9qp8813ksqakr5pi509m6ijwcv0cp7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psession";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psession";
           sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
           name = "psession";
         };
@@ -44837,7 +45319,7 @@
           sha256 = "1jz1g0igpnsjn2r144205bffj10iyp8izm8678mzkhnricxkn0d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psvn";
           sha256 = "1wdww25pjla7c8zf04mvgia1ws8cal9rb7z8g3vn2s3gp68py12n";
           name = "psvn";
         };
@@ -44847,18 +45329,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    psysh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "psysh";
+        version = "20160123.958";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "psysh.el";
+          rev = "14fa252628009463f05fdf573c23e166536d3b76";
+          sha256 = "1q8fk25qwnnm9z1zcf9f1k3b060lk6g6f16c8db90psp6za0xdwz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psysh";
+          sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5";
+          name = "psysh";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/psysh";
+          license = lib.licenses.free;
+        };
+      }) {};
     pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pt";
-        version = "20151024.1051";
+        version = "20160119.1017";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "pt.el";
-          rev = "17e8e743ac5fbbab14ad2635f0047c43c9d591b7";
-          sha256 = "1nn4m2z0wyp3ygx39c5racydixkis930ln8q5bdbhnjh4xgvgib1";
+          rev = "97e04eb77154234d946064a573762bcd72219f75";
+          sha256 = "0ca8j7xlqxbidqfz2iarwn7qq4v12pwvsq6vzj2473n2g1c09xzj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pt";
           sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
           name = "pt";
         };
@@ -44879,7 +45382,7 @@
           sha256 = "024g793y6vqhk5h6vqjv5hljvfyb0j6b6j51fjhijgdxmqhlk9vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/puml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/puml-mode";
           sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
           name = "puml-mode";
         };
@@ -44900,7 +45403,7 @@
           sha256 = "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/punctuality-logger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/punctuality-logger";
           sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
           name = "punctuality-logger";
         };
@@ -44921,7 +45424,7 @@
           sha256 = "1viw95y6fha782n1jw7snr7xc00iyf94r4whsm1a2q11vm2d1h21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pungi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pungi";
           sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
           name = "pungi";
         };
@@ -44942,7 +45445,7 @@
           sha256 = "11mkf9gvjz63szdvhwlqnd6j2r9ij2fh8l6zkf7hl2zlwyyivcmp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/puppet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/puppet-mode";
           sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
           name = "puppet-mode";
         };
@@ -44963,7 +45466,7 @@
           sha256 = "0k2plyvd6842yryzrfadbf4h7a9hrjvkcvixclbca2bkvfik3864";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/purescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/purescript-mode";
           sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
           name = "purescript-mode";
         };
@@ -44984,7 +45487,7 @@
           sha256 = "15myw5rkbnnpgzpiipm5xl4cyzymv8hh66x9al4aalb5nf52dckc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/purple-haze-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/purple-haze-theme";
           sha256 = "0ld8k53823786y6f0dqcp0hlqlnmy323vdkanjfs5wg5ib60az1m";
           name = "purple-haze-theme";
         };
@@ -45005,7 +45508,7 @@
           sha256 = "0qm2xv762cz196aqs445crqrmsks8hpwzpaykzn0chlvdk0m5cv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/purty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/purty-mode";
           sha256 = "1ackqv95sdphbsjwydbc4dmdzwpaj74v329f55zcwa8hn3li9d5m";
           name = "purty-mode";
         };
@@ -45026,7 +45529,7 @@
           sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pushbullet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pushbullet";
           sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
           name = "pushbullet";
         };
@@ -45047,7 +45550,7 @@
           sha256 = "10g4imxgpv7a0j40qkx7xf2qnyz80ypd0mv0lf47n9dwln5byln3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/px";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/px";
           sha256 = "0xjmz18m2dslh6yq5z32r43zq3svfxn8mhrfbmihglyv2mkwxw44";
           name = "px";
         };
@@ -45068,7 +45571,7 @@
           sha256 = "1iw94m1bvsmadlj16f8ymwx0q6f9lqysy7by76hkpiwqqhd2i8rv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-autopep8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-autopep8";
           sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
           name = "py-autopep8";
         };
@@ -45089,7 +45592,7 @@
           sha256 = "05803wi7rj73sy9ihkilr6pcn72szfsvgf2dgbdpnqra508rxyb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-gnitset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-gnitset";
           sha256 = "0f6ivq4ignb4gfxw2q8qvigvv3fbvvyr87x25wcaz6yipg1lr18r";
           name = "py-gnitset";
         };
@@ -45110,7 +45613,7 @@
           sha256 = "1416hbc64gwn9c8g9lxfx58w60ysi0x8rbps6mfxalavdhbs20sv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-import-check";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-import-check";
           sha256 = "1261dki0q44sw9h0g1305i2fj1dg9xgwzry50jbn2idcrqg4xf7k";
           name = "py-import-check";
         };
@@ -45131,7 +45634,7 @@
           sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-isort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-isort";
           sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
           name = "py-isort";
         };
@@ -45152,7 +45655,7 @@
           sha256 = "05gi17n488r2n6x33nj4a23ci89c9smsbanmap4i302dy0mnmwgd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-smart-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-smart-operator";
           sha256 = "1n0bdr9z2s1ikhmfz642k94gjzb88anwlb61mh27ay8wqdgm74c4";
           name = "py-smart-operator";
         };
@@ -45173,7 +45676,7 @@
           sha256 = "1s39407z3rxz10r5sshv2vj7s23ylkhg59ixasgnpjk82gl4igpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-test";
           sha256 = "1mbwbzg606winf5af7qkg6a1hg79lc7k2miq4d3mwih496l5sinb";
           name = "py-test";
         };
@@ -45194,7 +45697,7 @@
           sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-yapf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-yapf";
           sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
           name = "py-yapf";
         };
@@ -45215,7 +45718,7 @@
           sha256 = "09glwrb9q65qdm4yd0mbi5hwdy2434zm8699ywhs6hqpjacadlmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pycarddavel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pycarddavel";
           sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
           name = "pycarddavel";
         };
@@ -45236,7 +45739,7 @@
           sha256 = "1q9fmdrnsqmisykndxzy9bvjl6n1rsmfgvh3h8fkg6b44ypcyyw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pydoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pydoc";
           sha256 = "0sf52cb80yiridsl1pffdr3wpbgxrn2l8vnq03l70djckild477n";
           name = "pydoc";
         };
@@ -45256,7 +45759,7 @@
           sha256 = "1mzyr6yznkyv99x9q8zx2f270ngjh8s94zvnhcbhidi57inpd1nh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pydoc-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pydoc-info";
           sha256 = "0l80g0rzkk3a1wrw2riiywz9wdyxwr5i64jb2h5r8alp9qq1k7mf";
           name = "pydoc-info";
         };
@@ -45277,7 +45780,7 @@
           sha256 = "0017xk95293sc37127hg9bbbh5glq34sdc1b6bx6ykzny6g49fd3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyenv-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyenv-mode";
           sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
           name = "pyenv-mode";
         };
@@ -45287,6 +45790,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pyenv-mode-auto = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pyenv-mode, s }:
+    melpaBuild {
+        pname = "pyenv-mode-auto";
+        version = "20160123.141";
+        src = fetchFromGitHub {
+          owner = "ssbb";
+          repo = "pyenv-mode-auto";
+          rev = "714e322319ad7a8f5f2a3691aa431537b8a1b26c";
+          sha256 = "1sclhzv3w9fg54dg4qhlfbc0p1z5clyr8phrckhypvlwfgbar4b4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyenv-mode-auto";
+          sha256 = "1l7h4fas1vshkh4skxzpw7v2a11s1hwnb20n6a81yh701pbikqnd";
+          name = "pyenv-mode-auto";
+        };
+        packageRequires = [ f pyenv-mode s ];
+        meta = {
+          homepage = "http://melpa.org/#/pyenv-mode-auto";
+          license = lib.licenses.free;
+        };
+      }) {};
     pyfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pyfmt";
@@ -45298,7 +45822,7 @@
           sha256 = "1rp8zchvclh29rl9a1i82pcqghnhpaqnppaydxc2qx23y9pdgz9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyfmt";
           sha256 = "112kjsp763c2plhqlhydpngrabhc58ya7cszvi4119xqw2s699g6";
           name = "pyfmt";
         };
@@ -45311,15 +45835,15 @@
     pyimpsort = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pyimpsort";
-        version = "20150927.1317";
+        version = "20160129.2253";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "pyimpsort.el";
-          rev = "e90d1b09e35356e3eed890fe38875bc7216d0f4e";
-          sha256 = "003hd5igv152yr4fa47n2l5jhwvdlfhw7bap1dkm1i7i898i6yds";
+          rev = "d5c61d70896b642646dfd3c809c06174ae086c1a";
+          sha256 = "05qx1p19dw3nr264shihfn33k579hd0wf4cxki5cqrxi7xzpjgrc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyimpsort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyimpsort";
           sha256 = "0kdk3bmryfzvwf8vshfszbih8mwncf4xlb0n0n0yjn0p1n98q99k";
           name = "pyimpsort";
         };
@@ -45336,11 +45860,11 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "319c79d9b4e15e6600dd055370b6ad6e6392592f";
-          sha256 = "1qqvhabw0hly8c1lsgvh205c50fy5bk3r3r4w01wnrwsa9m8q0zj";
+          rev = "41f335f5942ba28c7e006d20b62a7a5e68a55a50";
+          sha256 = "1biqzjyrqkb2whscqz1h4x82h6jhvafbzx174apirc6h1vd1jhhq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pylint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pylint";
           sha256 = "1138a8dn9y4ypbphs1zfvr8gr4vdjcy0adsl4xfbgsls4kcdwpxx";
           name = "pylint";
         };
@@ -45361,7 +45885,7 @@
           sha256 = "1nlybqvy64lc0c65j9wbk4lx932lz0b8hxw8zm1vgmqppqcyn0p5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pytest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pytest";
           sha256 = "0ssib65wa20h8r6156f392l481vns5fcax6w70hcawmn84nficdh";
           name = "pytest";
         };
@@ -45382,7 +45906,7 @@
           sha256 = "1cnjdgw3x6yb5k06z57xifywlg0kdx9ai4f1ajc0wx9aax8r5gav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-cell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-cell";
           sha256 = "07i3vyci52jvslq28djwkgx1r157wvxd99rvqlxnmmsl5yj4k1jf";
           name = "python-cell";
         };
@@ -45403,7 +45927,7 @@
           sha256 = "1qckn5bi1ib54hgqbym5qqwzvbv70ria1w3c2x543xlr0l7zga6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-django";
           sha256 = "02whx8g8r02mzng7d7bnbkz5n7gyzp5hcnmvd6a3lq106c0h7w9k";
           name = "python-django";
         };
@@ -45424,7 +45948,7 @@
           sha256 = "1a2019172ycw7sdfjrxpyrg41ky9cp09mx30x6cr2qkc1w9pkyrv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-docstring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-docstring";
           sha256 = "1vi30y71vflsbprp5j4phbp7x1j24vxn9d6sifaddari0g0zxpfw";
           name = "python-docstring";
         };
@@ -45445,7 +45969,7 @@
           sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-environment";
           sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
           name = "python-environment";
         };
@@ -45466,7 +45990,7 @@
           sha256 = "0zk6014dzfrb3y3nhs890x082xf044w0a8nmy6rlrj375lvhfn99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-info";
           sha256 = "0kvpz1r2si94rs1iajn1ffmx7a5bgyjnzri36ajdgd5gcgh41dhy";
           name = "python-info";
         };
@@ -45479,15 +46003,15 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20160115.107";
+        version = "20160131.1407";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "546b676e6437532a0fa42933b076bd6bbd28201c";
-          sha256 = "1lgx0v67ha5nixz35gy80vdpizkfsxcn7gnr47svpnls5n4d6gq3";
+          rev = "ec3d421056af3fd88be31834e73b187c5a92422e";
+          sha256 = "00j0niji9764g933s484k7bz20kzkim3vafwb6cbadhiag74xicv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-mode";
           sha256 = "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k";
           name = "python-mode";
         };
@@ -45508,7 +46032,7 @@
           sha256 = "1254ng5fgmbfbn62wpjwmsx8y9j4vs3xcxpyqjb8s3npjjmv4kd8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-x";
           sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
           name = "python-x";
         };
@@ -45529,7 +46053,7 @@
           sha256 = "1w29l4zyvcchjdywz2py95qq7bszhldpga2ng75g7p07pq7f2w1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python3-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python3-info";
           sha256 = "1hma8sphxk95m25s56adgyk7d4blsc02gq5a7vw1pawwvxm2qlz3";
           name = "python3-info";
         };
@@ -45542,15 +46066,15 @@
     pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "pythonic";
-        version = "20150730.416";
+        version = "20160202.245";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "pythonic";
-          rev = "228db8970b4b6ed6992ac5490f859dc698c0afe9";
-          sha256 = "0ksccyh6da8v3f85zxjwa9rjrpqfr1qqqmm4d1y35nmw3pmlasmx";
+          rev = "9377f1c33d7ef21afb571211f60bf90ac7ffc2cd";
+          sha256 = "0p0pz88wf5vcva77vskz4picj8c3drbnz3jzi6yysgp7zw3friwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pythonic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pythonic";
           sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
           name = "pythonic";
         };
@@ -45571,7 +46095,7 @@
           sha256 = "1llm8vlmwkhdnr07xgcjx59d4na96kkhmfncww6rqkfc5i6zfarm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyvenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyvenv";
           sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
           name = "pyvenv";
         };
@@ -45592,7 +46116,7 @@
           sha256 = "0ggivlaj29rbbhkjpf3bf7vr96xjzffas0sf5m54qh6nyz6nnha5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/qiita";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/qiita";
           sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
           name = "qiita";
         };
@@ -45613,7 +46137,7 @@
           sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/qml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/qml-mode";
           sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
           name = "qml-mode";
         };
@@ -45634,7 +46158,7 @@
           sha256 = "0q7krn16dja0ifnc8h587lh5nilwbixxgsh5179clx5l57naix62";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quack";
           sha256 = "1l7jw8sx2llbzp3sg5755qdhhyq8jdaggxzzn7icjxxrmj1ji6ii";
           name = "quack";
         };
@@ -45655,7 +46179,7 @@
           sha256 = "09vw8nf9yj3v2ks25n39fbn2qk1fld0hmaq1dpzaqsavsbd4dwc1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quasi-monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quasi-monochrome-theme";
           sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
           name = "quasi-monochrome-theme";
         };
@@ -45676,7 +46200,7 @@
           sha256 = "0v5fcbjf7ndmywjsq9di3cwxsh2csv5pj3mqgqb340i2yp77r9wy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quelpa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quelpa";
           sha256 = "1g53fcy837hpyn9lnmmri0h4c5va61vszhblz4caadqq265hknvs";
           name = "quelpa";
         };
@@ -45697,7 +46221,7 @@
           sha256 = "00wnvyw2daiwwd1jyq1ag5jsws8k8jxs3lsj73dagbvqnlywmkm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quelpa-use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quelpa-use-package";
           sha256 = "0p09w419kldgl913hgqfzyv2pck27vqq2i1xsx7g29biwgnp9hl9";
           name = "quelpa-use-package";
         };
@@ -45718,7 +46242,7 @@
           sha256 = "0kh63nzdzwxksn2ar2i1ds7n96jga2dhhc9gg27p1g2ca66fs6h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quick-buffer-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quick-buffer-switch";
           sha256 = "1fsnha3x3pgq582libb3dmxb93aagv1avnc0rigpfd7hv6bagj40";
           name = "quick-buffer-switch";
         };
@@ -45739,7 +46263,7 @@
           sha256 = "1cp3z05qjy7qvjjv105ws1j9qykx8sl4s13xff0ijwvjza6ga44c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quick-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quick-preview";
           sha256 = "18janbmhbwb6a46fgc1sxl9ww591v60y3wgh2wqh62vdy4ix3bd9";
           name = "quick-preview";
         };
@@ -45760,7 +46284,7 @@
           sha256 = "1i7qqpqdwifd6vxpyyxyzq0b3wc82r7pqcw07bj0x2lhrjnqrxby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quickref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quickref";
           sha256 = "0jahi84ra9g7h0cvz3c02zkbkknrzgv48zq32n72lkxl958swqn1";
           name = "quickref";
         };
@@ -45773,15 +46297,15 @@
     quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quickrun";
-        version = "20160109.1849";
+        version = "20160202.2041";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-quickrun";
-          rev = "6ec3766554b5cb51a493da176c02de27be954d21";
-          sha256 = "1cpv44bmqydwmiswk2743jmjldnjvjbd0qyvapxdkczj86z52l6i";
+          rev = "ffd92ae15d9a4ffd8d0a4379a166c8a8a867bb45";
+          sha256 = "1l0l9rsjw49s1qmw70fm9a66wd1mlhka5cfvggsqpp56if0j8yyc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quickrun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quickrun";
           sha256 = "1szgirakfnkn9ksls16p233sr7x9ck5m1f1kbk6ancj36yja2nki";
           name = "quickrun";
         };
@@ -45802,7 +46326,7 @@
           sha256 = "0dhljmdlg4p832w9s7rp8vznkpjkwpg8k9hj95cn2h76c0afwz3j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/r-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/r-autoyas";
           sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
           name = "r-autoyas";
         };
@@ -45815,15 +46339,15 @@
     racer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
     melpaBuild {
         pname = "racer";
-        version = "20160109.1602";
+        version = "20160120.1429";
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "b1c1aafd14b239e16c68e3a6f00093e3c8db36d0";
-          sha256 = "1niymgv517g5gpchz337a0aarj63dmmspxxqk7l0s3midid0yhfh";
+          rev = "0d605b943a71279396c5a6251fac63498a91363c";
+          sha256 = "197llsjhxjvk5wp6iz3siyv3911y82r08s9bavma3dgzj2s978s6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/racer";
           sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
           name = "racer";
         };
@@ -45836,15 +46360,15 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20160102.1830";
+        version = "20160201.1957";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "d70140d54f74aa230155a3dcc96f8637bcdfe001";
-          sha256 = "0w25jmcim7fjabg1pshqsjrw86gfnn61nxmccy6r53a58kkl3j1g";
+          rev = "77473387fb693ece0aebf83d4f8547aace87efd2";
+          sha256 = "1sywpgp6a1syp2rgba0969xj01f5988l7fgf8j07i06i3drydadj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/racket-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/racket-mode";
           sha256 = "04sr55zrgwyi48sj4ssm4rmm327yxs7hvjhxclnkhaaigrmrv7jb";
           name = "racket-mode";
         };
@@ -45865,7 +46389,7 @@
           sha256 = "00x09vjd3jz5f73qkf5v1y402zn8vl8dsyfwlq9z646p18ba7gyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/railgun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/railgun";
           sha256 = "1a3fplfipk1nv3py1sy0p2adf3w1h4api01h2j5rjlq2jw06kyr0";
           name = "railgun";
         };
@@ -45886,7 +46410,7 @@
           sha256 = "1fh8wsb0pa2isr1kgh3v9zmmxq1nlmqwqk4z34dw5wpaiyihmk84";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rails-log-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rails-log-mode";
           sha256 = "0h7gfg0c5pwfh18qzg1mx7an9p958ygdfqb54s85mbkv8x3rh1a0";
           name = "rails-log-mode";
         };
@@ -45907,7 +46431,7 @@
           sha256 = "0cqp2vns7gq377bm6q9n5q0ra1d5yy2x2aiw9q1hswk82xpibj9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rails-new";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rails-new";
           sha256 = "0wgbm6qxqkpsbzj9wccicsphajaii07dl27b8x2vidsyw6ambj5h";
           name = "rails-new";
         };
@@ -45928,7 +46452,7 @@
           sha256 = "021x1l5kzsbm0qj5a3bngxa7ickm4lbwsdz81a2ks9pi1ivmw205";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/railscasts-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/railscasts-theme";
           sha256 = "1z5m8ccx2k18gbzqvg0051mp2myy2qncf4xvv47k80f83pk2hw6r";
           name = "railscasts-theme";
         };
@@ -45949,7 +46473,7 @@
           sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-blocks";
           sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
           name = "rainbow-blocks";
         };
@@ -45970,7 +46494,7 @@
           sha256 = "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-delimiters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-delimiters";
           sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
           name = "rainbow-delimiters";
         };
@@ -45991,7 +46515,7 @@
           sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-identifiers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-identifiers";
           sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
           name = "rainbow-identifiers";
         };
@@ -46012,7 +46536,7 @@
           sha256 = "1wcs8j8rdls0n3v8zdpk2n5riwzz2yvjf6b70a5bj7p20gyafhj2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rake";
           sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
           name = "rake";
         };
@@ -46033,7 +46557,7 @@
           sha256 = "0fmajgqf9j21qn7h35sky5di8cnma432g0ki9d5m41byxp9y1bdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rand-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rand-theme";
           sha256 = "0h0n1lsxnl12mjrjpra62vblrg8kbp1hk7w1v6makj074d037j2h";
           name = "rand-theme";
         };
@@ -46054,7 +46578,7 @@
           sha256 = "1z25xmz8pl3rsfahw6ay8wx5wbnlxabnzr2dq20m0i5jyci8lqll";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/random-splash-image";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/random-splash-image";
           sha256 = "1j454jy4ia2wrgi3fxzjfdqi3z8x13hq8kh62lnb84whs7a1nhik";
           name = "random-splash-image";
         };
@@ -46067,15 +46591,15 @@
     ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ranger";
-        version = "20160115.39";
+        version = "20160203.701";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ranger.el";
-          rev = "057150f6710ab2180ac9efd7fa2c9ad53595f16c";
-          sha256 = "1r020msciip8wgy5xrl5dm9idm89iyy51jz1r9zaja840fck95wc";
+          rev = "aa9a72d013a3d095bf92e91244241fc0867c8355";
+          sha256 = "0dm5k0g39dlwag3rqyiq8vzsg2z6ypajicjs7g5lcd88nypjl461";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ranger";
           sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
           name = "ranger";
         };
@@ -46096,7 +46620,7 @@
           sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rase";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rase";
           sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
           name = "rase";
         };
@@ -46117,7 +46641,7 @@
           sha256 = "0yd0rs6fnc6lsfi7pivw5sivh698055r8ifj9vrxb82dcx2y6v2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rbenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rbenv";
           sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
           name = "rbenv";
         };
@@ -46127,22 +46651,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rbt";
-        version = "20151030.2255";
+        version = "20160129.1251";
         src = fetchFromGitHub {
           owner = "joeheyming";
           repo = "rbt.el";
-          rev = "47cf236c732e9c5f468fb24c6a1c2db69a133797";
-          sha256 = "0ij2gqhg714ah812rhf1yg2n7ah1v4d5yldn1rixrzfcdng10mpi";
+          rev = "865c619f200afe877c56a44046f706361b676d0e";
+          sha256 = "0q5giixk6pv82cf34a0mxmnzh2gdiyq6dzv4ypkkdpz6wsm2ffhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rbt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rbt";
           sha256 = "1mrb6v8zybvhh242vvq0kdvg6cvws7gabfhcydrw5g2njhyqkygm";
           name = "rbt";
         };
-        packageRequires = [ popup ];
+        packageRequires = [];
         meta = {
           homepage = "http://melpa.org/#/rbt";
           license = lib.licenses.free;
@@ -46159,7 +46683,7 @@
           sha256 = "0xdyrp0zs2v2glpfwlajmj97wygwi0y492zbp6rp3caa5bj3j4z2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-alert";
           sha256 = "0lyd3gz1sflp93xb7xbvk1gh69w468ync1p144avyh2pybl40q4a";
           name = "rcirc-alert";
         };
@@ -46180,7 +46704,7 @@
           sha256 = "1mpk5rzsil298q3ppv5v9jrn274v71jffyz0jihrksh1wbjzwhlx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-alertify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-alertify";
           sha256 = "13448bykmy0jqcajhn2gjiar3m8cingyr8394vxybp2m1zvv0pws";
           name = "rcirc-alertify";
         };
@@ -46201,7 +46725,7 @@
           sha256 = "173lhi48dwfp9k7jmgivhcc9f38snz5xlciyjhrafpadq1pir497";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-color";
           sha256 = "1a8qqwdc0gw6m1xsnwrj3xldp05p7pabyj6l4bccpg3vf5wbgkn5";
           name = "rcirc-color";
         };
@@ -46222,7 +46746,7 @@
           sha256 = "0d99x7dfw5xrn62knvs65lvn6xyy7399xwqyy47bs4n81v25aqbh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-groups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-groups";
           sha256 = "1iws3f8vkwrflcj6ni8nmf1wcw1jrlnssm76kzzhag77ry3iswgx";
           name = "rcirc-groups";
         };
@@ -46243,7 +46767,7 @@
           sha256 = "1k4knsrca626pikgaalqbqwy7im4wz1vrmzzhdrdb4lhdz6sq3q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-notify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-notify";
           sha256 = "0mwhzkbzhpq4jws05p7qp0kbay8kcblb9xikznm0i8drpdyc617v";
           name = "rcirc-notify";
         };
@@ -46264,7 +46788,7 @@
           sha256 = "0yhmdkvswnn5rga5xzysfpivbz9wdkzbm49licilc2fp1dgcvd6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-styles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-styles";
           sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
           name = "rcirc-styles";
         };
@@ -46285,7 +46809,7 @@
           sha256 = "0r95fzi0x8r18x7r574mp503qaiqyicrq78zlggyz6qihi95pmqj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rdf-prefix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rdf-prefix";
           sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
           name = "rdf-prefix";
         };
@@ -46306,7 +46830,7 @@
           sha256 = "08l96bhghmnckar4i6afj9csqglasmpmby1r7j38ic9bp37z2yqd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rdp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rdp";
           sha256 = "0lj3idwv4fxz8pi8mnxkbhwhzaa1gs6ib4nzly3fc6yiix9ampkz";
           name = "rdp";
         };
@@ -46327,7 +46851,7 @@
           sha256 = "00j0iqa37yzd7xrgd8xcgpgmjcarhn0yx4zpbnr7z7kzmg24ywa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/react-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/react-snippets";
           sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73";
           name = "react-snippets";
         };
@@ -46348,7 +46872,7 @@
           sha256 = "0kg18ybgwcxhv5fiya5d3wn5w9si4914q946gjannk67d6jcq08g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/readability";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/readability";
           sha256 = "0kg91ma9k3p5ps467jjz2lw13rv1l8ivwc3zpg6c1rl474ds0qqv";
           name = "readability";
         };
@@ -46369,7 +46893,7 @@
           sha256 = "1j5b5xapflwzh8a297gva0l12ralwa9vl5z3bb75c9ksjkhi4nm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/readline-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/readline-complete";
           sha256 = "1qymk5ypv6ljk8x49z4jcifz7c2dqcg5181f4hqh67g1byvj2277";
           name = "readline-complete";
         };
@@ -46390,7 +46914,7 @@
           sha256 = "1kghhps8mqys5l59qwzv3fgy1fvb15cnyaxmk29v818a6khjc5l2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/real-auto-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/real-auto-save";
           sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
           name = "real-auto-save";
         };
@@ -46411,7 +46935,7 @@
           sha256 = "0v02kf8dcxrl09g72d1s8akn8qifvdwgxgnwrbdc1z6n53pi07z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/realgud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/realgud";
           sha256 = "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s";
           name = "realgud";
         };
@@ -46432,7 +46956,7 @@
           sha256 = "1xh9nxqfg9abcl41ni69rnwjfgyfr0pbl55dzyxsbh6sb36r3h8z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rebox2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rebox2";
           sha256 = "06ra50afjqac9ck1s9gaxy0sqxcb612wzd28s4q4imicqpgfxzjw";
           name = "rebox2";
         };
@@ -46450,7 +46974,7 @@
           sha256 = "15kwkphrlxq6nbmqm95sxv4rykl1d35sjm59ncy07ncqm706h33l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recentf-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recentf-ext";
           sha256 = "1m54w1n3ci5j7i1jhw6cs7dgzmxrj1hsrrarqlrd1d4iqhixjzbq";
           name = "recentf-ext";
         };
@@ -46471,7 +46995,7 @@
           sha256 = "0wk28blnfks987iby0p3qpd4nxnz6sqn4fx8g59gyddjhav51lri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recompile-on-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recompile-on-save";
           sha256 = "0bg2p7pk4jlpqc7lg48mxd6zkwnx15r0r7lmsxgx9dv1ilfwrmgn";
           name = "recompile-on-save";
         };
@@ -46492,7 +47016,7 @@
           sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recover-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recover-buffers";
           sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
           name = "recover-buffers";
         };
@@ -46513,7 +47037,7 @@
           sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rect+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rect+";
           sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
           name = "rect-plus";
         };
@@ -46534,7 +47058,7 @@
           sha256 = "14ysbjdndsmcc4j3zhc3nfjxhdm9310jx237mrp98ancxdhsh4q9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rectangle-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rectangle-utils";
           sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
           name = "rectangle-utils";
         };
@@ -46555,7 +47079,7 @@
           sha256 = "1mj7lyadzn3bwig3f9zariq5z4fg6liqnjvfd34yx88xc52nwf33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recursive-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recursive-narrow";
           sha256 = "1bx8l8wjxrkv949c73dp93knbn1iwnblcm8iw822mq2mgbgwsa7f";
           name = "recursive-narrow";
         };
@@ -46576,7 +47100,7 @@
           sha256 = "1rjpf23a8rggjmmxvm1997d3xz03kz84xams486b9ky0n2v02d57";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redis";
           sha256 = "1awnilb8bk0izp6yw0187ybh9slf1hc51014xvvmj90darxby79a";
           name = "redis";
         };
@@ -46594,7 +47118,7 @@
           sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redo+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redo+";
           sha256 = "1alfs7k5mydgvzsjmdifcizqgrqjrk2kbh3mabai7nlrwi47w9n2";
           name = "redo-plus";
         };
@@ -46615,7 +47139,7 @@
           sha256 = "0s38mi9w1dm9fzhd3l8xvq9x33rkb5vvd66jibza50dhn9dmakax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redpen-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redpen-paragraph";
           sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
           name = "redpen-paragraph";
         };
@@ -46635,7 +47159,7 @@
           sha256 = "5547c5db0caa147ae2fa0099b9c58a8629b47bf4facb6c5cc72cee45e84be392";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redshank";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redshank";
           sha256 = "07s4gja1w8piabkajbzrgq77mkdkxr0jy9bmy2qb9w2svfsyns9b";
           name = "redshank";
         };
@@ -46656,7 +47180,7 @@
           sha256 = "08kzi2jcfqnlanqzvbk5gq1if7k8qc9gmz5bmvd2mvmx6z436398";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/refheap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/refheap";
           sha256 = "0pzark1db9k2pavd5sn89a28gd9j5jlkx3wkhwfzln3y5c1wnvdk";
           name = "refheap";
         };
@@ -46677,7 +47201,7 @@
           sha256 = "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/regex-dsl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/regex-dsl";
           sha256 = "129sapsmvcqqqgcr9xlmxwszsxvsb4nj9g2fxsl4y6r383840jbr";
           name = "regex-dsl";
         };
@@ -46698,7 +47222,7 @@
           sha256 = "1wr12j16hckvc8bxxgxw280frl12h23cp44sxg28lczl16d9693l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/regex-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/regex-tool";
           sha256 = "1nd23vjij5h5gk5l7hbd5ks9ljisn054wp138jx2v6i51izxvh2v";
           name = "regex-tool";
         };
@@ -46719,7 +47243,7 @@
           sha256 = "02kfi3c6ydnr7xw611ck66kfjyl5w86dr9vfjv3wjl6ad9jya4zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/region-bindings-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/region-bindings-mode";
           sha256 = "141q4x6rilidpnsm9s78qks9i1v6ng0ydhbzqi39xcaccfyyjb69";
           name = "region-bindings-mode";
         };
@@ -46740,7 +47264,7 @@
           sha256 = "0gsh0x1rqxvzrszdyna9d8b8w22mqnd9yqcwzay2prc6rpl26g1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/region-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/region-state";
           sha256 = "1iq2x1w8lqjjiwjja7r3qki6drvydnk171k9fj9g6rk7wslknz8x";
           name = "region-state";
         };
@@ -46761,7 +47285,7 @@
           sha256 = "01k3v4yiilz1k6drv7b2x6zbjx6dlz7cch8rq63mwc7v8kvdnqmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/register-channel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/register-channel";
           sha256 = "037i2fgxxsfb85vd6xk17wyh7ny6fqfixvb0a18lf8m1hib1gyhr";
           name = "register-channel";
         };
@@ -46782,7 +47306,7 @@
           sha256 = "023fwcqyy5gg234m772vpws751pharjwn3b0433i2sszna2z6xrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relative-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relative-buffers";
           sha256 = "131182yb0pr0d6jibqd8aag4w8hywdyi87ldp77b95gw4bqhr96i";
           name = "relative-buffers";
         };
@@ -46803,7 +47327,7 @@
           sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relative-line-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relative-line-numbers";
           sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
           name = "relative-line-numbers";
         };
@@ -46824,7 +47348,7 @@
           sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relax";
           sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
           name = "relax";
         };
@@ -46845,7 +47369,7 @@
           sha256 = "0w40cx58c0hmc0yzs8maq1389hwha0qwfbz76pc6kpcx14v1gkhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/remark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/remark-mode";
           sha256 = "1zl8k3h4acbgb3hmjs2b4a14g0s0vl3xamrqxrr742zmqpr1h0w0";
           name = "remark-mode";
         };
@@ -46866,7 +47390,7 @@
           sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repeatable-motion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repeatable-motion";
           sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
           name = "repeatable-motion";
         };
@@ -46879,15 +47403,15 @@
     repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }:
     melpaBuild {
         pname = "repl-toggle";
-        version = "20160118.827";
+        version = "20160119.621";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "repl-toggle";
-          rev = "22ac44d0251d4f65591e4e48a03f8ab188429656";
-          sha256 = "0lxadfwyflcp8bgz8xp19f150faby023icbljyk5q52s2fl9g79w";
+          rev = "0249c2a72e6bf782c2c15b0cb1d925410543184f";
+          sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repl-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repl-toggle";
           sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
           name = "repl-toggle";
         };
@@ -46906,7 +47430,7 @@
           sha256 = "1clxkzxqsm91zbzv8nffav224ldr04ww5lppga2l41xjfl6z12qb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/replace-from-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/replace-from-region";
           sha256 = "19q8hz2xiyamhw8hzpahqwd4352k1m9r9wlh9kdh6hbb6sjgllnb";
           name = "replace-from-region";
         };
@@ -46924,7 +47448,7 @@
           sha256 = "1af4sdhkzxknqzdkzc5gpm5j3s5k776j293hqq7cqzk533fdh4iz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/replace+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/replace+";
           sha256 = "1imsgr3v8g2p2mnkzp92ga3nvckr758pblmlha8gh8mb80089krn";
           name = "replace-plus";
         };
@@ -46945,7 +47469,7 @@
           sha256 = "0ks884jhxqkr8j38r9m4s56krm2gpkm0v5d51zzivcfhs30s6nff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/replace-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/replace-symbol";
           sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
           name = "replace-symbol";
         };
@@ -46966,7 +47490,7 @@
           sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repo";
           sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
           name = "repo";
         };
@@ -46987,7 +47511,7 @@
           sha256 = "05a88r2jp169x99abz9wrr1i8ch0bg3dlmaalxwqfmlzci0lksx2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/req-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/req-package";
           sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
           name = "req-package";
         };
@@ -47008,7 +47532,7 @@
           sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/request";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/request";
           sha256 = "09gxfy34a13wr0agmhn0nldxaiyc72rx9xi56jirsvji4dg5j6mm";
           name = "request";
         };
@@ -47029,7 +47553,7 @@
           sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/request-deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/request-deferred";
           sha256 = "19s8q9a01v0g897s9ass1mr5wbzy82rrfcnqpvcvp05q4y787dn9";
           name = "request-deferred";
         };
@@ -47050,7 +47574,7 @@
           sha256 = "1bfj2zjn3x41jal6c136wnwkgmag27bmrwbfwdylafc7qqk6dflv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/requirejs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/requirejs";
           sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
           name = "requirejs";
         };
@@ -47071,7 +47595,7 @@
           sha256 = "02wva5q8mvc0a5kms2wm1gyaag2x3zd6fkkpl4218nrbb0mbficv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/requirejs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/requirejs-mode";
           sha256 = "1sq1kim17bcmh39106vfgm7gq9nj9943lw8by0bpi5qr8xdjsn5r";
           name = "requirejs-mode";
         };
@@ -47092,7 +47616,7 @@
           sha256 = "055km3g4bwl73kca6ky3qzzmy103w0mqcfscj33ppdhg2n7m94n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/resize-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
           name = "resize-window";
         };
@@ -47113,7 +47637,7 @@
           sha256 = "0gbm208hmmmpjyj0x3z0cszphawkgvjqzi5idbdca3gikyiqw80n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/restart-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/restart-emacs";
           sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
           name = "restart-emacs";
         };
@@ -47134,7 +47658,7 @@
           sha256 = "08j4m70j9xdl731bwa4vh656lji0w0f9mm1aki0qqd5msglw6kvx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/restclient";
           sha256 = "14wxfhb17n2f9wil68lb05abj7m0whwkqvrm3y9dg9mh14lcpbvc";
           name = "restclient";
         };
@@ -47155,7 +47679,7 @@
           sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reveal-in-osx-finder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reveal-in-osx-finder";
           sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
           name = "reveal-in-osx-finder";
         };
@@ -47173,7 +47697,7 @@
           sha256 = "1h27kg2k8f6smbqxandmvg859qk66jydbbbiwwjmk7316k66w8qa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reveal-next";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reveal-next";
           sha256 = "0fp6ssd4fad0s2pbxbw75bnx7fcgasig8xvcx7nls8m9p6zbbmh2";
           name = "reveal-next";
         };
@@ -47194,7 +47718,7 @@
           sha256 = "002ywhjms8ybk7cma2p2i11z3fz6kb0w8mlafysm911rvcq2hg5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reverse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reverse-theme";
           sha256 = "1lq8nwhf8n5i280v0kqksndm4b3n6x34wnd5fa5i48ljwr5cinih";
           name = "reverse-theme";
         };
@@ -47215,7 +47739,7 @@
           sha256 = "0lzsy68k7sm9d3r8lzhzx9alc1f0cgfclry40pa4x0ilkcr7ysch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/review-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/review-mode";
           sha256 = "0wapicggkngpdzi0yxc0b24s526fs819rc2d6miv6ix3gnw11n0n";
           name = "review-mode";
         };
@@ -47236,7 +47760,7 @@
           sha256 = "037sac5fvz6l2zgzlf8ykk4jf9zhj7ybzyz013jqzjj47a6sn1r1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/revive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/revive";
           sha256 = "1l7c6zq3ga2k1488qb0hgxlk08p3vrcf0sx116c1f8z8nf4c8ny5";
           name = "revive";
         };
@@ -47257,7 +47781,7 @@
           sha256 = "0zmby92mjszh77r5wh8sccqv3a5bb9sfhac8g55nasavw8hfplvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reykjavik-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reykjavik-theme";
           sha256 = "1f0q2gfzkmpd374jryrd1lgg8xj6rwdq181jhppj3rfjizgw4l35";
           name = "reykjavik-theme";
         };
@@ -47275,7 +47799,7 @@
           sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rfringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rfringe";
           sha256 = "171gzfciz78l6b653acgfailxpwmh8m1dm0dzpg0b1k0ny3aiwf6";
           name = "rfringe";
         };
@@ -47296,7 +47820,7 @@
           sha256 = "1qlpv5lzj4yfyjgdykhm6q9izg6g0z5pf5nmynj42vsx7v8bhy1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rhtml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rhtml-mode";
           sha256 = "038j5jkcckmhlq3vz4h07s5y2scljh1fdn9r614hiyxwgk48lc35";
           name = "rhtml-mode";
         };
@@ -47317,7 +47841,7 @@
           sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rich-minority";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rich-minority";
           sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
           name = "rich-minority";
         };
@@ -47338,7 +47862,7 @@
           sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rigid-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rigid-tabs";
           sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
           name = "rigid-tabs";
         };
@@ -47359,7 +47883,7 @@
           sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rinari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rinari";
           sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
           name = "rinari";
         };
@@ -47380,7 +47904,7 @@
           sha256 = "0imsc44mcy5abmfin28d13l8mjjvyx6hxcsk81r0i8h12mxlmfkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rings";
           sha256 = "1ncsb4jip07hbrf1l4j9yzn3l0kb63ylhzzsb4bb2yx6as4a66k7";
           name = "rings";
         };
@@ -47401,7 +47925,7 @@
           sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rnc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rnc-mode";
           sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q";
           name = "rnc-mode";
         };
@@ -47414,15 +47938,15 @@
     robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "robe";
-        version = "20151230.649";
+        version = "20160121.1751";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "robe";
-          rev = "af3d1a8deb7f1531b95112b955fce91d5f5d1ea6";
-          sha256 = "1blpkd9sb7wcn4mkjbn20ppva47v1rm0j43hm337cbcsw5f63x6s";
+          rev = "7c56895b6c2fd5d6c9572182f5de10ebe5bfc977";
+          sha256 = "01xd3nc7bmf4r4d37x08rw2dlsg6gns8mraahi4rwkg6a9lwl44n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/robe";
           sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
           name = "robe";
         };
@@ -47435,15 +47959,15 @@
     roguel-ike = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "roguel-ike";
-        version = "20140227.929";
+        version = "20160119.2102";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "roguel-ike";
-          rev = "6d9322ad9d43d0c7465f125c8e08b222866e6923";
-          sha256 = "108j3106n9anas07mj26xlrvscsl5irshd39czkippla84gwmgyc";
+          rev = "706dcb0687e8016d7d776f9d9e5ace9fdbbca43c";
+          sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/roguel-ike";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/roguel-ike";
           sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
           name = "roguel-ike";
         };
@@ -47464,7 +47988,7 @@
           sha256 = "0k88zjz4v2qllz9bkrhza91ckw5xx4aimgmcqpzcq3zl5py36h4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rope-read-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rope-read-mode";
           sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
           name = "rope-read-mode";
         };
@@ -47485,7 +48009,7 @@
           sha256 = "0spgpq2cmckpl7j2193axy5yqws5dwrhik69d0bv0ylwzxp3npvg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rotate";
           sha256 = "0dygdd24flbgqp049sl4p8rymvv8h881hz9lvz8hnfwq687yyclx";
           name = "rotate";
         };
@@ -47506,7 +48030,7 @@
           sha256 = "04jbnm9is2cis75h40znqzjvyjq27ncr2vfank6zglzi4fhxsl0r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/roy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/roy-mode";
           sha256 = "0ch0hamvw4gsqs2pap0h6w4cj6n73jqa75if0ymh73hk5i3acm8g";
           name = "roy-mode";
         };
@@ -47527,7 +48051,7 @@
           sha256 = "01rb6qfsk4f33nkfdzvvjkw96ip1dv0py8i30l8ix9cqbk07svsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rpm-spec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rpm-spec-mode";
           sha256 = "01vggdv8sac4p0szwk7xgxcglmd5a1hv5q0ylf8zcp1lsyyh8ypd";
           name = "rpm-spec-mode";
         };
@@ -47548,7 +48072,7 @@
           sha256 = "0i5qwbhhdnspgs2y67kkgbk9zq6fx2j509q92mgfzbvjnf54h1r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rpn-calc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rpn-calc";
           sha256 = "04dj2r4035k0c3x6iyjydshzmq381d60pmscp2hg5m7sp7bqn5xs";
           name = "rpn-calc";
         };
@@ -47569,7 +48093,7 @@
           sha256 = "0xkr1qn8fm3kv5c11janq5acp1q02abvxc463zijvm2qk735yl4d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rsense";
           sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
           name = "rsense";
         };
@@ -47582,15 +48106,15 @@
     rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "rspec-mode";
-        version = "20160113.1658";
+        version = "20160124.1607";
         src = fetchFromGitHub {
           owner = "pezra";
           repo = "rspec-mode";
-          rev = "5dbf9c33ca09510f66980fa948a42c692e60fedc";
-          sha256 = "11yb93sfp9ppbp7fsxr3z2pv37hcig1k6g096b3c438f01z51ha6";
+          rev = "c6eb793e46e6ce5a9be8871235f0911a412f68ad";
+          sha256 = "1zbpp9n35l589i7yla4l93nvp5ngwsj9p44glhz9jxzlkjwig9a1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rspec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rspec-mode";
           sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
           name = "rspec-mode";
         };
@@ -47603,16 +48127,16 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20160114.1314";
+        version = "20160204.136";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "76bfbf25d35dbef636398ce95afcaae0b0437347";
-          sha256 = "144drv24hpjvy2y8ds24nxf6cwmgmiq8z9ndvri4y69kdspqlv5z";
+          rev = "b40a299bbd0b96d25680fe1fe24e3d512afc2673";
+          sha256 = "1bs4ylnkzkj6ckhhhbna2ah3y570zm1wh5wy77m425gji8fgsph6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rtags";
-          sha256 = "16jvbr4nm48p3dj9wmysjaxyz4ajcay19risqrs9fzrifkr21c9p";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rtags";
+          sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
           name = "rtags";
         };
         packageRequires = [];
@@ -47632,7 +48156,7 @@
           sha256 = "1gqvp0h5zy2023gdzf7pw28rl27lzml87vpbi1zaw4bmj82zgh3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rtm";
           sha256 = "1ni2610svxziq1gq6s6igkhqyafvgn02gnw7jbm3ir7ks4w2imzf";
           name = "rtm";
         };
@@ -47653,7 +48177,7 @@
           sha256 = "1y5z0kr4qwd4fyvhk0rhpbbp6dw2jpzrawx62jid5539wrdjcabk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rubocop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rubocop";
           sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
           name = "rubocop";
         };
@@ -47669,11 +48193,11 @@
         version = "20091002.545";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "53578";
+          rev = "53740";
           sha256 = "0wrjx25qg1dpgw0gih7fd679fv3q78cwaqyrf5dh1kq8g8cr5xhs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-additional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-additional";
           sha256 = "0h0cxik8lp8g81bvp06mddikkk5bjdlch2wffcvsvi01is408w4w";
           name = "ruby-additional";
         };
@@ -47691,7 +48215,7 @@
           sha256 = "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-block";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-block";
           sha256 = "0jfimjq1xpwxkxya452kp27h0fdiy87aj713w3zsm04k7l6i12hm";
           name = "ruby-block";
         };
@@ -47712,7 +48236,7 @@
           sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-compilation";
           sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
           name = "ruby-compilation";
         };
@@ -47733,7 +48257,7 @@
           sha256 = "1cy5zmdfwsjw8jla8mxjm1cmvrv727fwq1kqhjr5nxj0flwsm4x1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-dev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-dev";
           sha256 = "0mf2ra3p5976qn4ryc2s20vi0nrzwcg3xvsgppsc0bsirjw2l0fh";
           name = "ruby-dev";
         };
@@ -47749,11 +48273,11 @@
         version = "20150424.952";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "53578";
+          rev = "53740";
           sha256 = "0wrjx25qg1dpgw0gih7fd679fv3q78cwaqyrf5dh1kq8g8cr5xhs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-electric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-electric";
           sha256 = "04j04dsknzb7xc8v6alawgcbymdfmh27xnpr98yc8b05nzafw056";
           name = "ruby-electric";
         };
@@ -47774,7 +48298,7 @@
           sha256 = "1x4nvrq5nk50c1l3b5wcr4g1n5nmwafcz1zzc12qzsl5sya7si55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-end";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-end";
           sha256 = "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis";
           name = "ruby-end";
         };
@@ -47795,7 +48319,7 @@
           sha256 = "15b2rs6m4d511qqkc2gc8k15mbqzrgv6s3hpypajl8nvqa79xnyd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-factory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-factory";
           sha256 = "0v8009pad0l41zh9r1wzcx1h6vpzhr5rgpq6rb002prxz2lcbd37";
           name = "ruby-factory";
         };
@@ -47808,15 +48332,15 @@
     ruby-guard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ruby-guard";
-        version = "20141218.2114";
+        version = "20160131.1952";
         src = fetchFromGitHub {
           owner = "cheunghy";
           repo = "ruby-guard";
-          rev = "c0bc5c58ad32e1786001aa5cd84f490096a00a4b";
-          sha256 = "034dbz225xxqpi202h4z8zqz3cdfbd8m7vlnh30cb0p8lvgygmj1";
+          rev = "bc864cadb241be855ada148f07e5048cce0991a0";
+          sha256 = "080hmrh7pgpaj33w1rkhcqb1yp70w4cap0rq9hsxaaajj0sn47z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-guard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-guard";
           sha256 = "0hwxhirdvaysw9hxcgfdf0l12wilr6b9f9w91pk1hfwfi1w0lfwr";
           name = "ruby-guard";
         };
@@ -47837,7 +48361,7 @@
           sha256 = "0knl8zrd4pplnzk5z19cf9rqdfr3ymzfssrwp6jhndjzjdwvc2bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-hash-syntax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-hash-syntax";
           sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
           name = "ruby-hash-syntax";
         };
@@ -47858,7 +48382,7 @@
           sha256 = "1r2f5jxi6wnkmr1ssvqgshi97gjvxvf3qqc0njg1s33cy39wpqq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-interpolation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-interpolation";
           sha256 = "07idndxw8vgfrk5zfmjjhmixza35mqxwjhsrbjrq5yy72i5ivznp";
           name = "ruby-interpolation";
         };
@@ -47879,7 +48403,7 @@
           sha256 = "0dk9vkrjncawf4j4y5dky215m0hgl266d9w6mr7g0rgy6m7wfcyq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-refactor";
           sha256 = "0nwinnnhy72h1ihjlnjl8k8z3yf4nl2z7hfv085gwiacr6nn2rby";
           name = "ruby-refactor";
         };
@@ -47900,7 +48424,7 @@
           sha256 = "06fhrn04whqb3n40wkzrwmzbzv7b1m48rd18rx8zpgxhbw8v7rdc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-test-mode";
           sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
           name = "ruby-test-mode";
         };
@@ -47921,7 +48445,7 @@
           sha256 = "0jd9acycpbdd90hallrl0k5055rypp502qv4c6i286p7f9is4kvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-tools";
           sha256 = "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y";
           name = "ruby-tools";
         };
@@ -47942,7 +48466,7 @@
           sha256 = "17dzr5w12ai2q15yv81gchk360yjs71w74vsgs2fyy2yznvclpq9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/runner";
           sha256 = "09apmk22swj05z77ziij31jj6b3g221qv3mw3mymffzxn5ap2rbx";
           name = "runner";
         };
@@ -47963,7 +48487,7 @@
           sha256 = "18w6gkpxp0g7rzvnrk8vvr267y768dfik447ssq8jpz3jlr5jnq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/runtests";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/runtests";
           sha256 = "0m9rqjb5c0yqr2wv5dsdiba21knr63b5pxsqgbkbybi15zgxcicb";
           name = "runtests";
         };
@@ -47984,7 +48508,7 @@
           sha256 = "0m8ywaa9hccsss4gp1gr6v8faj503gr8l9a6gsdnvf3m5g9wxm6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rust-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rust-mode";
           sha256 = "0h4gblg6ls8a2wa43r990lanl6ykx8j7c8yg5i3n151imzic2n33";
           name = "rust-mode";
         };
@@ -48005,7 +48529,7 @@
           sha256 = "0i2r14ifpqjcxcflhl38iayk53920vl616y770lwf77zvhnxrmm9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rustfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rustfmt";
           sha256 = "1znav2pbax0rsvdl85mmbgbmxy7gnrm4nx54ij1ff6yd831r5jyl";
           name = "rustfmt";
         };
@@ -48026,7 +48550,7 @@
           sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rvm";
           sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
           name = "rvm";
         };
@@ -48047,7 +48571,7 @@
           sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/s";
           sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
           name = "s";
         };
@@ -48068,7 +48592,7 @@
           sha256 = "06ng960fj2ivnwb0hrn0qic5x8hb0sswjzph01zmwhbfnwykhr85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/s-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/s-buffer";
           sha256 = "07kivgzv24psjq1240gwj9wkndq4bhvjh38x552k90m9v6jz8l6m";
           name = "s-buffer";
         };
@@ -48089,7 +48613,7 @@
           sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sackspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sackspace";
           sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
           name = "sackspace";
         };
@@ -48110,7 +48634,7 @@
           sha256 = "060xvh5qwqbvvb5ykyflwps2p2by9p1mm5dz7gkxla5zq0a73vmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sage-shell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sage-shell-mode";
           sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx";
           name = "sage-shell-mode";
         };
@@ -48131,7 +48655,7 @@
           sha256 = "1hl227bmjch0vq7n47mwydkyxnd6wkbz9klk3c4398qmc2qxm5kn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/salt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/salt-mode";
           sha256 = "1r5k7022vxgj3p5l16y839lff85z0m9hpifq59knij61g9hxadsp";
           name = "salt-mode";
         };
@@ -48152,7 +48676,7 @@
           sha256 = "1r6b6n2bzjznjfimgcm0vnmln4sbyasm4icmdgbpzahdmbkfzq3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sane-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sane-term";
           sha256 = "0iz63b62x5jrz7c23i850634k4bk73kg1h4wj1ravx3wlgvzs8y8";
           name = "sane-term";
         };
@@ -48173,7 +48697,7 @@
           sha256 = "0srz4j7484v5h7hmdlyrcl2k27jhy414689wphbbyj63rvg321cm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sass-mode";
           sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
           name = "sass-mode";
         };
@@ -48194,7 +48718,7 @@
           sha256 = "0y6a0z2ydc5li3990mfhcgz5mrb89sj8s8dvdgmnv8pgdhn1xmb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sauron";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sauron";
           sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
           name = "sauron";
         };
@@ -48212,7 +48736,7 @@
           sha256 = "1p8p5b85sdnq45rdjq5wcr3xz7c22mr5bz41a21mkabc4j4fvd3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/save-load-path";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/save-load-path";
           sha256 = "01hm1rm9x3bqs6vf65l4xv2n4ramh3qwgmrp632fyfz5dlrvbssi";
           name = "save-load-path";
         };
@@ -48233,7 +48757,7 @@
           sha256 = "0jdsndq9nqqqfn821qy66y5x3yvmxca9zfk9j9q4a9sbbychqc9c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/save-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/save-sexp";
           sha256 = "12jx47picdpw668q75qsp9gncrnxnlk1slhzvxsk5pvkdwh26h66";
           name = "save-sexp";
         };
@@ -48254,7 +48778,7 @@
           sha256 = "00jvl1npc889f3isi7cbdzwvf9x4rq67zgl7br8npxf8jlc2mwhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/save-visited-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/save-visited-files";
           sha256 = "1pmjz27dlp5yrihgsy8q1bwbhkkj3sn7d79ccvljvzxg5jn1grkd";
           name = "save-visited-files";
         };
@@ -48272,7 +48796,7 @@
           sha256 = "1qfq83cb4qixdl15j28rlslkq6g88ig55ydg747jqb3dqyp3qaah";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/savekill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/savekill";
           sha256 = "1l14p6wkzfhlqxnd9fpw123vg9q5k20ld7rciyzbfdb99pk9z02i";
           name = "savekill";
         };
@@ -48285,15 +48809,15 @@
     sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, scala-mode2 }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20151231.1322";
+        version = "20160201.1059";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "9d86487c77d652ca12e8084f0f64b840536a9e6e";
-          sha256 = "1m9lrcknhvxxxalhbnrx652p9zxsq249s39cv9cj5kx57x8fz4sm";
+          rev = "cc166f2407ea9dfde5d24273298a73cfdd35d579";
+          sha256 = "1dsdafb6mavdb14qjf8q0723gxdfxra823f0rn31vak2klwq8zdj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sbt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sbt-mode";
           sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
           name = "sbt-mode";
         };
@@ -48310,11 +48834,11 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "84c9f7699d5a49daa38e7260c877e9bb294a2a18";
-          sha256 = "0ykgbj059m1cxkdp29dd3sxp1cq68ma92dg9jp0qv7bp5x0r708l";
+          rev = "be4fd23dc6b9f4de44c5a4c5cee94894dc139393";
+          sha256 = "0v0gffwcn70kyhpvbgdzrsx7f97ksza1han794wx5v9plxj366ld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scad-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scad-mode";
           sha256 = "04b4y9jks8sslgmkx54fds8fba9xv54z0cfab52dy99v1301ms3k";
           name = "scad-mode";
         };
@@ -48335,7 +48859,7 @@
           sha256 = "1mx5bg4mbgj828mwjd9nlxli4ibcrgpzn9i6ns2g9zpgm932zlbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scad-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scad-preview";
           sha256 = "0wcd2r60ibbc2mzpq8fvyfc1fy172rf9kzdj51p4jyl51r76i86z";
           name = "scad-preview";
         };
@@ -48356,7 +48880,7 @@
           sha256 = "0qd3yi2as30kacr74vbzvyq97684s8sz585z30d47shqcvp6l1a6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-mode";
           sha256 = "1vbgphmvvsj5jl8f78rpsidlmlgyp1kq3nkmziqhwkcq8hfywssm";
           name = "scala-mode";
         };
@@ -48377,7 +48901,7 @@
           sha256 = "07928cll5n3s7xx75nfbil73zilrhdfh19hp4s75c7hh8sdwmig6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-mode2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-mode2";
           sha256 = "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch";
           name = "scala-mode2";
         };
@@ -48398,7 +48922,7 @@
           sha256 = "1wf3d5spvi9kr4q2w7f18g1bm10fh2zbh4sdbqkf78afv6sbqzrz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-outline-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-outline-popup";
           sha256 = "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7";
           name = "scala-outline-popup";
         };
@@ -48419,7 +48943,7 @@
           sha256 = "0m7hanpc2skmsz783m0212xd10y31gkj5n6w8gx9s989l1y4i1b8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scf-mode";
           sha256 = "0acbrw94q6cr9b29mz1wcbwi1g90pbm7ly2xbaqb2g8081r5rgg0";
           name = "scf-mode";
         };
@@ -48439,7 +48963,7 @@
           sha256 = "13pym1kwi8ah3h2l557pvbg4lgpp5lhldj3qxyg7gyvgkwr91a7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scheme-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scheme-complete";
           sha256 = "1nam7xzw8hrykz73q9x24szpjv2kpkp48lcmzf02kzj3cg6l76qm";
           name = "scheme-complete";
         };
@@ -48460,7 +48984,7 @@
           sha256 = "09cvrphrnbj8avnlqqv6scjz17cn6zm6mzghjn3vxfr4hql66rir";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scheme-here";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scheme-here";
           sha256 = "137qqfnla3hjm6qcnzpsgrw173px0k5dwq9apns5cdryxx3ahcvv";
           name = "scheme-here";
         };
@@ -48481,7 +49005,7 @@
           sha256 = "0ark720g0nrdqri5bjdpss6kn6k3hz3w3zdvy334wws05mkb17y4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scion";
           sha256 = "17qmc7fpvbamqkzyk8jspp2i0nw93iya4iwddvas7vdpjy7mk81d";
           name = "scion";
         };
@@ -48502,7 +49026,7 @@
           sha256 = "0v36zd8lnsbc7jvnhv5pidfxabq2qqmwg1nm2jdxfj6vvcg3vx0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sclang-extensions";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sclang-extensions";
           sha256 = "00nirxawsngvlx7bmf5hqg2wk0l1v5pi09r6phzd0q8gyq3kmbbn";
           name = "sclang-extensions";
         };
@@ -48523,7 +49047,7 @@
           sha256 = "0vbcghgapwdf3jgjnjdla17dhf5mkmwapz4a8fmlr7sw1wqvj857";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sclang-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sclang-snippets";
           sha256 = "0q1bh316v737a0hm9afijk1spvg144cgrf45jm0bpd60zhiv7bb2";
           name = "sclang-snippets";
         };
@@ -48544,7 +49068,7 @@
           sha256 = "1jgg116rhhgs5qrngrmqi8ir7yj1h470f57dc7fyijw0ly5mp6ii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scpaste";
           sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
           name = "scpaste";
         };
@@ -48565,7 +49089,7 @@
           sha256 = "0ykhr24vpx3byn2n346nqqvmwcg34hk22s3lpdx7lpnkrn5z41aq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch";
           sha256 = "1c6vxpd9c24d2flzwgvzqz0wr70xzqqs3f59pp897h0f7j91im5d";
           name = "scratch";
         };
@@ -48586,7 +49110,7 @@
           sha256 = "0ng0by647r49mia7vmjqc97gwlwgs8kmaz0lw2y54jdz8m0bbngp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch-ext";
           sha256 = "031wxz10k1q4bi5hywhcw1vzi41d5pv5hc09x8jk9s5nzyssvc0y";
           name = "scratch-ext";
         };
@@ -48607,7 +49131,7 @@
           sha256 = "030mcq0cmamizvra8jh2x76f71g5apiavwb10c28j62rl0r5bisk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch-log";
           sha256 = "1yp3p0dzhmqrd0krqii3x79k4zc3p59148cijhk6my4n1xqnhs69";
           name = "scratch-log";
         };
@@ -48628,7 +49152,7 @@
           sha256 = "00b4r8bqlxc29k18vig0164d5c9fp5bp5q26d28lwr4f0s4a71d2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch-palette";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch-palette";
           sha256 = "0m6hc2amwnnii4y189kkridhapl9jipkmadvrmwvspgy3lxhlafs";
           name = "scratch-palette";
         };
@@ -48649,7 +49173,7 @@
           sha256 = "1yvmfiv1s83r0jcxzbxyrx3b263d73lbap6agansmrhkxp914xr1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch-pop";
           sha256 = "0s7g1fbnc5hgz8gqmp1lynj5g7vvxisj7scxx5wil9qpn2zyggq1";
           name = "scratch-pop";
         };
@@ -48670,7 +49194,7 @@
           sha256 = "10hmy0p4pkrzvvyisk4rjc6hqqyk2sir1rszqgmkhrdywl010vlc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratches";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratches";
           sha256 = "0409v1wi10q48rrh8iib6dw9icmswfrpjx9x7xcma994z080d2fy";
           name = "scratches";
         };
@@ -48688,7 +49212,7 @@
           sha256 = "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/screenshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/screenshot";
           sha256 = "0aw2343as38y26r2g7wpn1rq1n6xpw4y5c7ir8qh1crkc1y513hs";
           name = "screenshot";
         };
@@ -48709,7 +49233,7 @@
           sha256 = "113pi7nsaksaacy74ngbvrvr6qcl7199xy662nj58bz5307yi9q0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scss-mode";
           sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
           name = "scss-mode";
         };
@@ -48730,7 +49254,7 @@
           sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/search-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/search-web";
           sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
           name = "search-web";
         };
@@ -48751,7 +49275,7 @@
           sha256 = "0zs08vxmjb3y4dnfq6djnrhmkgyhhwd5zylrjisrd4y7f089fyh4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/searchq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/searchq";
           sha256 = "0flsc07v887pm62mslrv7zqnhl62l6348nkm77mizm1592q3kjgr";
           name = "searchq";
         };
@@ -48772,7 +49296,7 @@
           sha256 = "15cjhwjiwmrfzmr74hbw5s92si2qdb8i97nmkbsgkj3444rxg239";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seclusion-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seclusion-mode";
           sha256 = "0ff10x6yr37vpp6ffbk1nb027lgmrydwjrb332fskwlf3xmy6v0m";
           name = "seclusion-mode";
         };
@@ -48790,7 +49314,7 @@
           sha256 = "143vg6z3aa0znmsx88r675vv5g2c13giz25dcbzazsp4wcr46wvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/second-sel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/second-sel";
           sha256 = "1nzy5ms5qf5big507kg3z5m6d6zgnsv2fswn359r2j59cval3fvr";
           name = "second-sel";
         };
@@ -48811,7 +49335,7 @@
           sha256 = "19p3zp4cj7ik2gwzc5k6klqc4b8jc2hvm80yhczc5b7k223gp2bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seeing-is-believing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seeing-is-believing";
           sha256 = "05aja5xycb3kpmxyi234l50h98f5m1fil6ll4f2xkpxwv31ba5rb";
           name = "seeing-is-believing";
         };
@@ -48832,7 +49356,7 @@
           sha256 = "0qd462qbqdx53xh3ddf76chiljxf6s43r28v2ix85gsig7nm5pgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seethru";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seethru";
           sha256 = "1lcwslkki9s15xr2dmh2iic4ax8ia0j20hjnjmkv612wv04b806v";
           name = "seethru";
         };
@@ -48853,7 +49377,7 @@
           sha256 = "1as3llcs7jgcw9pafz4mbfml1cqd1fw8yl64bb4467nmhq2p18p7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sekka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sekka";
           sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
           name = "sekka";
         };
@@ -48874,7 +49398,7 @@
           sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/selectric-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/selectric-mode";
           sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
           name = "selectric-mode";
         };
@@ -48895,7 +49419,7 @@
           sha256 = "1s1wjk2ba5spqc0vhj8kmfsm8vzmza06pnjkwal084v8dnwz0zz3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/semi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/semi";
           sha256 = "01wk3lgln5lac65hp6v83d292bdk7544z23xa1v6a756nhybwv25";
           name = "semi";
         };
@@ -48916,7 +49440,7 @@
           sha256 = "0g4jfcc5k26yh192bmmxnim9mqv993v2jjd9g9ssvnd42ihpx1n3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sensitive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sensitive";
           sha256 = "0v988k0x3mdp7ank2ihghphh8sanvv96s4sg6pnszg5hczak1vr3";
           name = "sensitive";
         };
@@ -48935,7 +49459,7 @@
           sha256 = "01qj57zpqpr4rxk9bsx828c7baac1xaa58cz22fncirdx00svn2k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sentence-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sentence-highlight";
           sha256 = "16kh6567hb9lczh8zpqwbzz5bikg2fsabifhhky8qwxp4dy07v9m";
           name = "sentence-highlight";
         };
@@ -48956,7 +49480,7 @@
           sha256 = "0ikiv12ahndvk5w9pdayqlmafwj8d1vkcshfnqmgy6ykqbcdpqk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sentence-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sentence-navigation";
           sha256 = "1p3ch1ab06v038h130fsxpbq45d1yadl67i2ih4l4fh3xah5997m";
           name = "sentence-navigation";
         };
@@ -48977,7 +49501,7 @@
           sha256 = "15vmd1qmj8a6a5mmvdcnbav6mi5rhrp39m85idzv02zm0x9x6lyc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seoul256-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seoul256-theme";
           sha256 = "0mgyq725x5hmhs3h8v5macv8bfkginjghhwr9kli60vdb4skgjvp";
           name = "seoul256-theme";
         };
@@ -48998,7 +49522,7 @@
           sha256 = "1np6ip28ksms6fig67scwvwj43zgblny50ccvz8aclbl0z8nxswl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sequences";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sequences";
           sha256 = "12wnkywkmxfk2sx40h90k53d5qmc8hiky5vhlyf0ws3n39zvhplh";
           name = "sequences";
         };
@@ -49017,7 +49541,7 @@
           sha256 = "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sequential-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sequential-command";
           sha256 = "03qybacgy5fs3lam73x0rds4f68s173mhbah6rr97272nikd50v1";
           name = "sequential-command";
         };
@@ -49038,7 +49562,7 @@
           sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/servant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/servant";
           sha256 = "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h";
           name = "servant";
         };
@@ -49059,7 +49583,7 @@
           sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/serverspec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/serverspec";
           sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
           name = "serverspec";
         };
@@ -49080,7 +49604,7 @@
           sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/session";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/session";
           sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
           name = "session";
         };
@@ -49101,7 +49625,7 @@
           sha256 = "18igxblmrbxwhd2d68cz1bpj4524djh2dw2rwhxlij76f9v805wn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seti-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seti-theme";
           sha256 = "1mwkx3hynabwr0a2rm1bh91h7xf38a11h1fb6ys8s3mnr68csd9z";
           name = "seti-theme";
         };
@@ -49122,7 +49646,7 @@
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sexp-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sexp-move";
           sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
           name = "sexp-move";
         };
@@ -49143,7 +49667,7 @@
           sha256 = "1nfvb2vmbdqfyj25hvwrz7ajb4ilxgrvd3rbf3im3mb3skic1wn9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shackle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shackle";
           sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
           name = "shackle";
         };
@@ -49164,7 +49688,7 @@
           sha256 = "0phivbhjdw76gzrx35rp0zybqfb0fdy2hjllf72qf1r0r5gxahl8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shadchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shadchen";
           sha256 = "1r1mfmv4cdlc8kzjiqz81kpqdrwbnyciwdgg6n5x0yi4apwpvnl4";
           name = "shadchen";
         };
@@ -49185,7 +49709,7 @@
           sha256 = "0l094nrrvan8v6j1xdgb51cbjvwicvxih29b7iyga13adb9dy9j4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shader-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shader-mode";
           sha256 = "12y84fa1wc82js53rpadaysmbshhqf6wb97889qkksx19n3xmb9g";
           name = "shader-mode";
         };
@@ -49227,7 +49751,7 @@
           sha256 = "0vkxl3w4y4yacs1s4v0gwggvzrss8g74d3dgk8h3gphl4dlgx496";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shakespeare-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shakespeare-mode";
           sha256 = "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd";
           name = "shakespeare-mode";
         };
@@ -49248,7 +49772,7 @@
           sha256 = "15a8gs4lrqxn0jyfw16rc6vm7z1i10pzzlnp30x6nly9a7xra47x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shampoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shampoo";
           sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
           name = "shampoo";
         };
@@ -49266,7 +49790,7 @@
           sha256 = "0jr5sbmg4zrx2dfdrajh2didm6dxx9ri5ib9qnwhc1jlppinyi7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-command";
           sha256 = "1jxn721i4s1k5x1qldiynnl5khsl22x9k3whm698nzv8m786spxl";
           name = "shell-command";
         };
@@ -49287,7 +49811,7 @@
           sha256 = "1w42j5cdddr0riz1xjq3wiz5i9f71i9jdzd1l92ir0mlj05wjyic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-current-directory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-current-directory";
           sha256 = "0bj2gs96ivm5x8l7gwvfckyalr1amh4cb1v2dbl323zmrqddhgkd";
           name = "shell-current-directory";
         };
@@ -49308,7 +49832,7 @@
           sha256 = "0z04z07r7p5p05zhaka37s48y82hg2dbk0ynap4inph3frn4yyfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-here";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-here";
           sha256 = "0csi70v89bqdpbsizji6c5z0jmkx4x4vk1zfclkpap4dalmxxcsh";
           name = "shell-here";
         };
@@ -49326,7 +49850,7 @@
           sha256 = "0biqjm0fpd7c7jilgkcwp6c32car05r5akimbcdii3clllavma7r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-history";
           sha256 = "1blad7ggv27qzpai2ib1pmr23ljj8asq880g3d7w8fhqv0p1pjs7";
           name = "shell-history";
         };
@@ -49347,7 +49871,7 @@
           sha256 = "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
           name = "shell-pop";
         };
@@ -49368,7 +49892,7 @@
           sha256 = "16srngml5xmpaxb0wzhx91jil0r0dmn673bwai3lzxrkmjnl748l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-split-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-split-string";
           sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
           name = "shell-split-string";
         };
@@ -49389,7 +49913,7 @@
           sha256 = "1bcrxq43a45alv6x0wms4d4nykiqz2mzk04kwk5lmf5pw3dqm900";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-switcher";
           sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
           name = "shell-switcher";
         };
@@ -49410,7 +49934,7 @@
           sha256 = "0ssaccdacabpja9nqzhr8x8ggfwmlian7y4p0fa6gvr7qsvjpgr9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-toggle";
           sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
           name = "shell-toggle";
         };
@@ -49427,11 +49951,11 @@
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-shelldoc";
-          rev = "20eb889f3d3d9bd01aafdc699e712a75db42d8f3";
-          sha256 = "0i6xp6g3ggs4fkr410blxa4mkb1y05pcygkdbvb7y3gh878q5b5k";
+          rev = "5df2264eb60e45066f3633df4f34834751667346";
+          sha256 = "1mc7y79h5p9cxqwsl40b1j5la5bm8b70n6fn4rx9wr4bi7rwph5i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shelldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shelldoc";
           sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
           name = "shelldoc";
         };
@@ -49452,7 +49976,7 @@
           sha256 = "1ns2w7zhbi96a3gilmzs69187jngqhcvik17ylsjdfrk42hw5s6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shelltest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shelltest-mode";
           sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
           name = "shelltest-mode";
         };
@@ -49473,7 +49997,7 @@
           sha256 = "13zsws8gq9a8nfk4yzlvfsvqjh9zbnanmw68rcna93yc5nc634nr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shift-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shift-text";
           sha256 = "1v9zk7ycc8k1qk1cfs2y1knygl686msmlilqy5a7mh0w0z9f3a2i";
           name = "shift-text";
         };
@@ -49494,7 +50018,7 @@
           sha256 = "1lgvdaghzj1fzh8p6ans0f62zg1bfp086icbsqmyvbgpgcxia9cs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shimbun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shimbun";
           sha256 = "0k54886bh7zxsfnvga3wg3bsij4bixxrah2rrkq1lj0k8ay7nfxh";
           name = "shimbun";
         };
@@ -49507,15 +50031,15 @@
     shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shm";
-        version = "20151127.133";
+        version = "20160204.414";
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "structured-haskell-mode";
-          rev = "a305ca94059d31c60d549494756d5b4eabec20b0";
-          sha256 = "1cr83az4xm20i2v8bd5dbqll3d8vhjb3m2ypzwbxlizjcxpa638c";
+          rev = "e34d4d9b1b6c4fd18e726da1dd5b73f64bb883e9";
+          sha256 = "1xjkcdxyz3q17jr036gc4zjryc497dbhi4g89y4zkfc68c4m89xy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shm";
           sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
           name = "shm";
         };
@@ -49536,7 +50060,7 @@
           sha256 = "19p47a4hwl6h2w5ay09hjhl4kf7cydwqp8s2iyrx2i0k58az8i8i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shoulda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shoulda";
           sha256 = "0lmlhx34nwvn636y2wvw3sprhhh6q3mdg7dzgpjj7ybibvhp1lzk";
           name = "shoulda";
         };
@@ -49546,22 +50070,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    show-css = callPackage ({ dom, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    show-css = callPackage ({ doom, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "show-css";
-        version = "20140816.1208";
+        version = "20160121.1004";
         src = fetchFromGitHub {
           owner = "smmcg";
           repo = "showcss-mode";
-          rev = "1b8c330644c06e6d99ec5da8a9722c918b2ea039";
-          sha256 = "0n38dbyw039lpdxzbhngndqfhcfgsx570bpflrb5wdh2mq5w57md";
+          rev = "1c0fe0aa8ece480f63d0a516c9d6a35f0406c570";
+          sha256 = "15v2cr1dmk5iha3brikbhxnsfi84b9jdnrbnaqy9xyxbdw7cs0r5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/show-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/show-css";
           sha256 = "1b3n8h39m85inxsqvzwgb9fqnqn2sgib91hrisn1gpgfyjydzkr7";
           name = "show-css";
         };
-        packageRequires = [ dom ];
+        packageRequires = [ doom ];
         meta = {
           homepage = "http://melpa.org/#/show-css";
           license = lib.licenses.free;
@@ -49578,7 +50102,7 @@
           sha256 = "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/show-marks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/show-marks";
           sha256 = "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb";
           name = "show-marks";
         };
@@ -49596,7 +50120,7 @@
           sha256 = "0pq88kz5h0hzgfk8fyf3lppxalmadg5czbik824bpykp9l9gnf1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/showkey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/showkey";
           sha256 = "1m280ll07i5c6s4w0s227jygdlpvd87dq45039v0sljyxm4bfrsv";
           name = "showkey";
         };
@@ -49614,7 +50138,7 @@
           sha256 = "01ibg36lvmdk7ac1k0f0r6wyds4rq0wb7gzw26nkiwykn14gxaql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/showtip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/showtip";
           sha256 = "1fdhdmkvyz1dcy3x0im1iab6yhhh8gqvxmm6ccwr6rl1r1m5zwc8";
           name = "showtip";
         };
@@ -49635,7 +50159,7 @@
           sha256 = "1mizhbwvnsxxjz6m94qziibvhghhp8v8db3wxrq3z9gsaqqkcndn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shpec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shpec-mode";
           sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
           name = "shpec-mode";
         };
@@ -49656,7 +50180,7 @@
           sha256 = "07zzyfibs2c7w4gpvdh9003frznbg7zdnrx0nv8bvn0b68d3yz0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shrink-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shrink-whitespace";
           sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
           name = "shrink-whitespace";
         };
@@ -49677,7 +50201,7 @@
           sha256 = "00c11s664hwj1l1hw7qshygy3wb6wbd0hn6qqnyq1xr0r87nnhjs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shut-up";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shut-up";
           sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
           name = "shut-up";
         };
@@ -49698,7 +50222,7 @@
           sha256 = "0cjqh6qbbmgxd6zgqnikw6bh8wpjydydkkqs5wcmblpi5awqmnb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sibilant-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sibilant-mode";
           sha256 = "0jd6dsk93nvwi5yia3623hfc4v6zz4s2n8m1wx9bw8x6kv3h3qbq";
           name = "sibilant-mode";
         };
@@ -49719,7 +50243,7 @@
           sha256 = "102ssiz4sp7y816s1iy8i98c314jbn3sy0v87b0qgpgjiq913ffq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sicp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sicp";
           sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz";
           name = "sicp";
         };
@@ -49740,7 +50264,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sift";
           sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
           name = "sift";
         };
@@ -49761,7 +50285,7 @@
           sha256 = "1g4rr7hpy9r3y4vdpv48xpmy8kqvs4j64kvnhnj2rw2wv1grw78j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/signature";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/signature";
           sha256 = "11n3id1iiip99lj8c0iffbrf59s2yvmwlhqbf8xzxkhws7vwdl5q";
           name = "signature";
         };
@@ -49782,7 +50306,7 @@
           sha256 = "1m8azyb4nxxdh6pwik9qb0zqp4z8z4vk3dlpfgklsq9rss8gwbaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simp";
           sha256 = "0x4lssjkj3fk9fw603f0sggvcj25iw0zbzsm5c949lhl4a3wvc9c";
           name = "simp";
         };
@@ -49803,7 +50327,7 @@
           sha256 = "09blcc1aj1lbqr1jcjm8dlq13s3plrg1qbp9vr3sp4dxyhjpimjj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-call-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-call-tree";
           sha256 = "1cbv4frsrwd8d3rg8r4sylwnc1hl3hgh595qwbpx0zd3dp5na2yl";
           name = "simple-call-tree";
         };
@@ -49824,7 +50348,7 @@
           sha256 = "0jn46fk0ljqs40kz6ngp0sk6hg1334835r2rmagx4qm0mdaqy7p8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-httpd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-httpd";
           sha256 = "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59";
           name = "simple-httpd";
         };
@@ -49845,7 +50369,7 @@
           sha256 = "1bnc3ykgf727lc0ajxa8qsx616baljdgav78fkz57irm65dqr18q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-mpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-mpc";
           sha256 = "05x2xyys5mf6k7ndh0l6ykyiygaznb4f8bx3npbhvihrsz9ilf8r";
           name = "simple-mpc";
         };
@@ -49864,7 +50388,7 @@
           sha256 = "01fdk790jlpxy95y67yv6944ws4zjh7gs6ymnj1yflf19ccsdsnn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple+";
           sha256 = "12fsgjk53fq2316j8nm6wvdckpyg9hq3v65j5c52i0g0cwmx62ra";
           name = "simple-plus";
         };
@@ -49885,7 +50409,7 @@
           sha256 = "15y1kxck6gxqs6pv4qxz8rrc61bsk73pzbz6f30f5l0r0750i1rm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-rtm";
           sha256 = "1aadzaf73clhyny2qiryg6z84k34yx3ghy6pyl0px9qhqc1ak271";
           name = "simple-rtm";
         };
@@ -49906,7 +50430,7 @@
           sha256 = "0zf9wgyp0n00i00zl1lxr0d60569zgcjdnmdvgpcibvny5s1fp2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-screen";
           sha256 = "16zvsmqn882w320h26hjjz5lcyl9y0x4amkf2zfps77xxmkmi5n0";
           name = "simple-screen";
         };
@@ -49927,7 +50451,7 @@
           sha256 = "09286h2q9dqghgfj9a4cniz6djw7867vcy3ixs7cn4wghvhyxm8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simpleclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simpleclip";
           sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
           name = "simpleclip";
         };
@@ -49948,7 +50472,7 @@
           sha256 = "0xq4vy3ggdjiycd3aa62k94kd43zcpm8bfdgi8grwkb1lpvwq9i9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplenote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplenote";
           sha256 = "0rnvm3q2spfj15kx2c8ic1p8hxg7rwiqgf3x2zg34j1xxayn3h2j";
           name = "simplenote";
         };
@@ -49969,7 +50493,7 @@
           sha256 = "1a0l0f6by1nmnnq0n52la9g3d357bmwak4qgy6p8g66qb9rx6rzv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplenote2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplenote2";
           sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
           name = "simplenote2";
         };
@@ -49990,7 +50514,7 @@
           sha256 = "0108q2b5h73rjxg9k2kmc8z6la9kgqdnz9z1x7rn61v3vbxlzqvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplezen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplezen";
           sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
           name = "simplezen";
         };
@@ -50003,15 +50527,15 @@
     sisyphus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
     melpaBuild {
         pname = "sisyphus";
-        version = "20160111.308";
+        version = "20160126.1619";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "sisyphus";
-          rev = "83973f404749595d6921adde37e2d600931224de";
-          sha256 = "1wzzk1j2404cvwy9hwwwqa2njncy73py5m90w41v5kgjrrkiy84j";
+          rev = "f521db4101ac853da8d7a7ce4e83872b33038e20";
+          sha256 = "1v7xn0a1x4036spmzrfi6syhpbm6bg9a22h6ybzmvzmbp90cs25a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sisyphus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sisyphus";
           sha256 = "08400jazj7w63l8g9ypy6w9dj8r0xh4d2yg3nfwqqf5lhfnj9bnj";
           name = "sisyphus";
         };
@@ -50032,7 +50556,7 @@
           sha256 = "0kbgxjfdf88h7hfds1kbdxx84wvkvy773r98ym1fzfm54m2kddvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skeletor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skeletor";
           sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
           name = "skeletor";
         };
@@ -50053,7 +50577,7 @@
           sha256 = "16757xz5ank3jsh8xglyly7pwdn5xm0yngampy1n1vgcwsp5080a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-less";
           sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
           name = "skewer-less";
         };
@@ -50074,7 +50598,7 @@
           sha256 = "0yj7r5f751lra9jj7lg90qp66sgnb7fcjw5v9hfna7r13qdn9f20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-mode";
           sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
           name = "skewer-mode";
         };
@@ -50095,7 +50619,7 @@
           sha256 = "1q0qc4jc83k7dfhq2y06zy0fg38kvp219gb3icysdhs88zi2v9s3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-reload-stylesheets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-reload-stylesheets";
           sha256 = "1rxn0ha2yhvyc195alg31nk1sjghnbha33xrqwc9z3j71w211frm";
           name = "skewer-reload-stylesheets";
         };
@@ -50116,7 +50640,7 @@
           sha256 = "0gzj7cf42nhp3ac1a2gxcfbmn80z1z46zxsfr2f5xil2gjag39fx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skype";
           sha256 = "06p5s5agajbm9vg9xxpzv817xmjw2kmcahiw4iypn5yzwhv1aykl";
           name = "skype";
         };
@@ -50129,15 +50653,15 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20160118.752";
+        version = "20160201.2108";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "d0bce55f11dbf4497c02955f406d4a31dacb5add";
-          sha256 = "07hpalcn3fj09bd5fs7ddnai9n8x91mqrysdf1kvivxq695a5hsz";
+          rev = "455bff044ad3d2e789a605c5f1716f7a4fb24d01";
+          sha256 = "184hc4wvm3y33g6ka8m90ysh1s8cdynsnni5abf2lzmgl4jgpcpl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slack";
           sha256 = "0mybjx08yskk9vi06ayiknl5ddyd8h0mnr8c0a3zr61p1x4s6anp";
           name = "slack";
         };
@@ -50158,7 +50682,7 @@
           sha256 = "108zcb7hdaaq3sxjfr9nrwzqxx71q6aygzik7l3ab854xknkjfad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slamhound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slamhound";
           sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
           name = "slamhound";
         };
@@ -50179,7 +50703,7 @@
           sha256 = "11p1pghx55a4gcn45cadw7c594134b21cdim723k2h99z14f89az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slideview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slideview";
           sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
           name = "slideview";
         };
@@ -50200,7 +50724,7 @@
           sha256 = "0vgyc2ny9qmn8f5r149y4g398mh4gnwsp4yim85z4vmdikqg8vi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slim-mode";
           sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
           name = "slim-mode";
         };
@@ -50210,22 +50734,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20160113.830";
+        version = "20160202.1146";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "7f950dac7b4fd5925509626b69a0ab2c6397ec93";
-          sha256 = "0awxgn4vpwkkf0m2gwy5ivqpin4szc2y1xrz5v75h4hpfr5pqz4x";
+          rev = "837ffe761f24ab612c0523ff3bb5b17efa2d3b1e";
+          sha256 = "0hik0idwn24mrfgp9ki3wp80w79bdklg5xz2gn08g4bqiavxbrld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime";
           sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
           name = "slime";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib macrostep ];
         meta = {
           homepage = "http://melpa.org/#/slime";
           license = lib.licenses.free;
@@ -50242,7 +50766,7 @@
           sha256 = "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-annot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-annot";
           sha256 = "14x9lzpkgkc96jsbfpahl027qh6y5azwdk0cmk9pbd1xm95kxj6n";
           name = "slime-annot";
         };
@@ -50263,7 +50787,7 @@
           sha256 = "1yi89hmnawf1pf9nv3f6i8a168wvri3zc40wgbbgnda8hxrcqkjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-company";
           sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
           name = "slime-company";
         };
@@ -50284,7 +50808,7 @@
           sha256 = "0rsh0bbhyx74yz1gjfqyi0bkqq5n3scpyh5mmc3d6dkpv8wa7bwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-ritz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-ritz";
           sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
           name = "slime-ritz";
         };
@@ -50305,7 +50829,7 @@
           sha256 = "13rm9pmshgssmydhpirri38s38z3kvkhqama40qdzqq96dsxlnjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-theme";
           sha256 = "1b709cplxip48a6qjdnzcn5qcgsy0jq1m05d7vc8p5ywgr1f9a00";
           name = "slime-theme";
         };
@@ -50326,7 +50850,7 @@
           sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-volleyball";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-volleyball";
           sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
           name = "slime-volleyball";
         };
@@ -50339,15 +50863,15 @@
     slirm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slirm";
-        version = "20160118.929";
+        version = "20160201.825";
         src = fetchFromGitHub {
           owner = "fbie";
           repo = "slirm";
-          rev = "bf66b9c512fc1955cadb4e573d07877dcda10df2";
-          sha256 = "186q8mcfk1p14nf97rqrqm6zgd6pzw7g96pj7kcazpndnl1my8zx";
+          rev = "9adfbe1fc67580e7d0d90f7e927a25d63a797464";
+          sha256 = "0srj0zcvzr0sjcs37zz11xz8w0yv94m69av9ny7mx8ssf4qp0pxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slirm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slirm";
           sha256 = "061xjj3vjdkkvd979fhp7bc12g5zkxqxywvcz3z9dlkgdks41ld7";
           name = "slirm";
         };
@@ -50368,7 +50892,7 @@
           sha256 = "1y1gay1h91c0690gly4qibx1my0l1zpb6s3x58lks8m21jdwfw28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slovak-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slovak-holidays";
           sha256 = "1dcw8pa3r9b7n7dc8fgzijz7ywwxb3nlfg7n0by8dnvpjq2c30bg";
           name = "slovak-holidays";
         };
@@ -50381,15 +50905,15 @@
     sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sly";
-        version = "20151228.955";
+        version = "20160122.424";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "8ac6fe5286eed3f778895581c5315a9c9dbd03a6";
-          sha256 = "1svawfb46066jnap7k188j5fwyqwkd5mql3x14zrm6gjl5mv2a5z";
+          rev = "adadc9ca765bf8804a8de93c444a1e83cd1b9212";
+          sha256 = "16h4xkaa1cdnal7ydsv0rdj1ldyb1ax0776x9a3abj5n9zf3pwxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly";
           sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
           name = "sly";
         };
@@ -50410,7 +50934,7 @@
           sha256 = "0qpw345ch5b9dbznk916f6h9f9dnf03wfyvpgnzdf30ffvf4q01w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-company";
           sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
           name = "sly-company";
         };
@@ -50423,15 +50947,15 @@
     sly-hello-world = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
     melpaBuild {
         pname = "sly-hello-world";
-        version = "20160118.449";
+        version = "20160119.836";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly-hello-world";
-          rev = "4f5047a3b79e14d84ccf908cd29d5663815c05f6";
-          sha256 = "03pprkhsczfvlnpf15xx3dp5a1jvqskf2w14yz3xn9k9hgy5sa13";
+          rev = "1bfcca692b6ec0670ed309ffe29eb9384397c183";
+          sha256 = "1fxsv83fcv5l7cndsysd8salvfwsabvd84sm7zli2ksf678774gp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly-hello-world";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-hello-world";
           sha256 = "03ybjgczp6ssk4hmwd486vshlk7ql27k1lyhmvk26gmrf554z90n";
           name = "sly-hello-world";
         };
@@ -50441,6 +50965,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sly-macrostep = callPackage ({ fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild, sly }:
+    melpaBuild {
+        pname = "sly-macrostep";
+        version = "20160119.634";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "sly-macrostep";
+          rev = "eb16778d104413a3e2a8d5537437c4ad76c2954b";
+          sha256 = "00lw6hkxs71abjyi7nhzi8j6n55jyhzsp81ycn6f2liyp4rmqgi7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-macrostep";
+          sha256 = "1i004mb0bg13j3zhdsjz1795dh0ry8winzvdghr1wardc9np60h7";
+          name = "sly-macrostep";
+        };
+        packageRequires = [ macrostep sly ];
+        meta = {
+          homepage = "http://melpa.org/#/sly-macrostep";
+          license = lib.licenses.free;
+        };
+      }) {};
     sly-named-readtables = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
     melpaBuild {
         pname = "sly-named-readtables";
@@ -50452,7 +50997,7 @@
           sha256 = "1xi625pn3mg77mjvr94v6a5pjyvgjavpkdbbh1lqjx1halaa2qb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly-named-readtables";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-named-readtables";
           sha256 = "11ymzbj1ji7avfjqafj9p5zx0m4y1jfjcmyanpjq1frdcz639ir9";
           name = "sly-named-readtables";
         };
@@ -50470,7 +51015,7 @@
           sha256 = "0sm4nxynwhwypzw008fz56axai9lrphjczwzfdy7da3akan18rbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-compile";
           sha256 = "0vgxqyzl7jw2j96rmjw75b5lmjwrvzajrdvfyabss4xmv96dy2r3";
           name = "smart-compile";
         };
@@ -50491,7 +51036,7 @@
           sha256 = "1xbd42q60pmg0hw4bn2fndjwgrfgj6ggm757fyp8m08jqh0zkarn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-cursor-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-cursor-color";
           sha256 = "11875pwlx2rm8d86541na9g3yiq0j472vg63mryqv6pzq3n8q6jx";
           name = "smart-cursor-color";
         };
@@ -50512,7 +51057,7 @@
           sha256 = "19l47xqzjhhm9j3izik0imssip5ygg3lnflb9ixsz1js571aaxha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-forward";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-forward";
           sha256 = "032yc45c19fl886jmi5q04r6q47xz5rphb040wjvpd4fnb06hr8c";
           name = "smart-forward";
         };
@@ -50533,7 +51078,7 @@
           sha256 = "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-indent-rigidly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-indent-rigidly";
           sha256 = "12qggg1m28mlvkdn52dig8bwv58pvipkvn1mlc4r7w569arar44x";
           name = "smart-indent-rigidly";
         };
@@ -50554,7 +51099,7 @@
           sha256 = "0sqvm7iwdjk057fwid4kz6wj71igiqhdarj59s17pzy6xz34afhg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mark";
           sha256 = "1vv65sa0pwl407mbxcp653kycgx8jz87n6wshias1dp9lv21pj6v";
           name = "smart-mark";
         };
@@ -50567,15 +51112,15 @@
     smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
     melpaBuild {
         pname = "smart-mode-line";
-        version = "20160111.1134";
+        version = "20160125.1100";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "25db8758068bd7495b1f2fe25a221cdb9c4dde80";
-          sha256 = "10d6skkl9skq1y669sma2pyahri5lcn48fq0lvpmbh8397rb94pk";
+          rev = "76bc5cc9f6810b252c0e312a4f3ad5869e2b9504";
+          sha256 = "0jr0yvaih5d2a5fkwszhf25cyk3q0fqfbgybb3nbrbkcf0mja22q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mode-line";
           sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
           name = "smart-mode-line";
         };
@@ -50592,11 +51137,11 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "25db8758068bd7495b1f2fe25a221cdb9c4dde80";
-          sha256 = "10d6skkl9skq1y669sma2pyahri5lcn48fq0lvpmbh8397rb94pk";
+          rev = "76bc5cc9f6810b252c0e312a4f3ad5869e2b9504";
+          sha256 = "0jr0yvaih5d2a5fkwszhf25cyk3q0fqfbgybb3nbrbkcf0mja22q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mode-line-powerline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mode-line-powerline-theme";
           sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
           name = "smart-mode-line-powerline-theme";
         };
@@ -50617,7 +51162,7 @@
           sha256 = "1q74b0mbhly84g252a0arbyxc720rgs9a3yqf8b8s2fpfkzb95sg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-newline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-newline";
           sha256 = "1kyk865vkgh05vzlggs3ii81v86fcbcxybfkv5rkyl3fyqpkza1w";
           name = "smart-newline";
         };
@@ -50638,7 +51183,7 @@
           sha256 = "0h559cdyln5f4ignx1r86ryi7wizys0gj03dj7lfzaxr7wkd0jaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-region";
           sha256 = "1bcvxf62bfi5lmhprma9rh670kka9p9ygbkgmv6dg6ajjfsplgwc";
           name = "smart-region";
         };
@@ -50659,7 +51204,7 @@
           sha256 = "0azhfffm1bkgjx4i3p9f6x2gmw8kc3fafzqj4vxxdibhn0nizqk8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-shift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-shift";
           sha256 = "0azahlflnh6sk081k5dcqal6nmwkjnj4dq8pv8ckwf8684zp23d3";
           name = "smart-shift";
         };
@@ -50680,7 +51225,7 @@
           sha256 = "0aighpby8khrljb67m533bwkzlsckyvv7d09cnzr1rfwxiil0ml4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-tab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-tab";
           sha256 = "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5";
           name = "smart-tab";
         };
@@ -50701,7 +51246,7 @@
           sha256 = "1s65hr7b8aggvdd1i6gkkpz6j1kqilggfnf46xvjnvdw9awmwk6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-tabs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-tabs-mode";
           sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
           name = "smart-tabs-mode";
         };
@@ -50722,7 +51267,7 @@
           sha256 = "15834lnh7dq9kz31k06ifpnc0vz86rycz0ryildi5qd2nb7s3lw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-window";
           sha256 = "1x1ncldl9njil9hhvzj5ac1l5aiyfm0f7j0d7lw8ady7xx2cy26m";
           name = "smart-window";
         };
@@ -50739,11 +51284,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "8f94974ec25b82fbab49eeae2054db52a00e274d";
-          sha256 = "1kwn1k6yyi2s83qkhl30zc1c2l8xlwy6bs8mqffss9y3bknli6px";
+          rev = "444c89a555b0ca25ff8d06e74665fbbc3a45a8b7";
+          sha256 = "1h9z7b10ihva6sg0p40xs4kv4dh5apd72zzqayns8jd9zasw4grm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartparens";
           sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
           name = "smartparens";
         };
@@ -50764,7 +51309,7 @@
           sha256 = "1sjwqi8w83qxihqmcm7z0vwmrz1az0y266qgj2nwfv39bri6y4i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartrep";
           sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
           name = "smartrep";
         };
@@ -50785,7 +51330,7 @@
           sha256 = "193cxfnh263yw628ipf9gssvyq3j7mffrdmnjhvzzcsnhd1k145p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartscan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartscan";
           sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
           name = "smartscan";
         };
@@ -50806,7 +51351,7 @@
           sha256 = "1qfa6i59zhi8d6175py8id8gq7b3hdaqq4naa86r1rb7x8ringff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartwin";
           sha256 = "0rg92j0aa8qxhr91hjj2f4w8vj5w9b4d2nmkggng44nxk8zafdif";
           name = "smartwin";
         };
@@ -50827,7 +51372,7 @@
           sha256 = "1vl3nx0y2skb8sibqxvmc3wrmmd6z88hknbry348d0ik3cbr0ijx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smarty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smarty-mode";
           sha256 = "06cyr2330asy2dlx81g3h9gq0yhd4pbnmzfvmla7amh4pfnjg14v";
           name = "smarty-mode";
         };
@@ -50848,7 +51393,7 @@
           sha256 = "1smv91ggvaw37597ilvhra8cnj4p71n6v5pfazii8k85kvs6x460";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smeargle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
           name = "smeargle";
         };
@@ -50869,7 +51414,7 @@
           sha256 = "0xrbkpc3w7yadpjih169cpp75gilsnx4y9akgci5vfcggv4ffm26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smex";
           sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
           name = "smex";
         };
@@ -50889,7 +51434,7 @@
           sha256 = "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sml-modeline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sml-modeline";
           sha256 = "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd";
           name = "sml-modeline";
         };
@@ -50910,7 +51455,7 @@
           sha256 = "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smooth-scroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smooth-scroll";
           sha256 = "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf";
           name = "smooth-scroll";
         };
@@ -50931,7 +51476,7 @@
           sha256 = "05kf3hb3nb32jzw50a2z9vlf3f0pj40klzxvqj4fxlci777imsvk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smooth-scrolling";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smooth-scrolling";
           sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
           name = "smooth-scrolling";
         };
@@ -50952,7 +51497,7 @@
           sha256 = "1a097f1x9l0m4dizvnb742svlqsm6hlif73rk7qjar081sk1gjxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smotitah";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smotitah";
           sha256 = "1m5qjl3r96riljp48il8k4rb6rwys1xf1pl93d4qjhprwvz57mv2";
           name = "smotitah";
         };
@@ -50973,7 +51518,7 @@
           sha256 = "0rhpnijp72jsl4gzhwz0z387f55vv3fp0zwki0fi5jlkzjamnnqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smtpmail-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smtpmail-multi";
           sha256 = "0nc3k8ly4nx7fm3b2apga3p4svz5c9sldnlk86pz2lzra5h3b4ss";
           name = "smtpmail-multi";
         };
@@ -50994,7 +51539,7 @@
           sha256 = "1z2sdnf11wh5hz1rkrbg7fs4ha3zrbj9qnvfzq9005y89d7cs95x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smyx-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smyx-theme";
           sha256 = "1r85yxr864df5akqknl3hsrmzikr4085bqr6ijrbdj27nz00vl61";
           name = "smyx-theme";
         };
@@ -51015,7 +51560,7 @@
           sha256 = "01kixhbl2q7qd173zv6prgr81gnmhf95bjyraysw45wza72amkqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/snakemake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/snakemake-mode";
           sha256 = "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4";
           name = "snakemake-mode";
         };
@@ -51036,7 +51581,7 @@
           sha256 = "17nbm8692ihrlcikihspdqg8wvp80ryq4h06da34d0awqm0w027m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/snapshot-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/snapshot-timemachine";
           sha256 = "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p";
           name = "snapshot-timemachine";
         };
@@ -51057,7 +51602,7 @@
           sha256 = "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/snippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/snippet";
           sha256 = "1lgpw69k5a82y70j7nximdj0bl5nzr4jhjr5fkx1cvz8hhvgdz6j";
           name = "snippet";
         };
@@ -51078,7 +51623,7 @@
           sha256 = "07056pnjgsgw06c67776qp7jci96iqbzlprbavzz2l1j8ywz8cwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soft-charcoal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soft-charcoal-theme";
           sha256 = "0i29ais1m2h9v4ghcg41zfbnaj8klgm4509nkyfkxm7wqnjd166a";
           name = "soft-charcoal-theme";
         };
@@ -51099,7 +51644,7 @@
           sha256 = "06q82v1hndvznsqg0r6jrxvgxhycg9m65kay4db4yy0gmc66v2xf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soft-morning-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soft-morning-theme";
           sha256 = "0lzg478ax6idzh6m5sf2ds4gbv096y0c0gn15dai19f58bs63xzr";
           name = "soft-morning-theme";
         };
@@ -51120,7 +51665,7 @@
           sha256 = "030mf8b0sf9mmzwhg85zh0ccvcg768kckwvbm0yzg7vmq1x46hjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soft-stone-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soft-stone-theme";
           sha256 = "05jjw9z6hqln9yj8ya2xrmjnylp7psfdj9206n30m3lwnlwx399v";
           name = "soft-stone-theme";
         };
@@ -51141,7 +51686,7 @@
           sha256 = "1vkrl8xvr5la8rj5gmafamzlqr0q2l1immyfnmfzf3r4n14kdywk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/solarized-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/solarized-theme";
           sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
           name = "solarized-theme";
         };
@@ -51162,7 +51707,7 @@
           sha256 = "0drb237750lry18arbfx37drf16znwz8fhx5fawxy1q4z7bl7z5n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/solidity-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/solidity-mode";
           sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx";
           name = "solidity-mode";
         };
@@ -51183,7 +51728,7 @@
           sha256 = "1ga35d3rhdf6ffd36q58ay6380gjvkmaiid4vscga3v7ca0dkhl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sonic-pi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sonic-pi";
           sha256 = "07qxm1rkw2cbxf4g2vqk3s7xnqldqkdm2zw1qh2kqjscg5gwpkqp";
           name = "sonic-pi";
         };
@@ -51204,7 +51749,7 @@
           sha256 = "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soothe-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soothe-theme";
           sha256 = "000hikpsmqpbb6v13az2dv319d0f7jjpkkpgi4vzv59z6cdlrlp3";
           name = "soothe-theme";
         };
@@ -51225,7 +51770,7 @@
           sha256 = "16x039imyf4p5d4rn92nlqcsvb5vlvdgq1m5g856b9dzwa89x733";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sos";
           sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
           name = "sos";
         };
@@ -51238,15 +51783,15 @@
     sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }:
     melpaBuild {
         pname = "sotclojure";
-        version = "20151225.1913";
+        version = "20160121.1240";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "speed-of-thought-clojure";
-          rev = "f2f7ed52dba57752804810992c35f991c9f7dfc4";
-          sha256 = "0s6nfszyk0qprdpd55yfcn6xv1fym43yra0j4ys6wf65lai9kr2p";
+          rev = "6ffb9f002b9fe94cba397e4aa75f9233346c7a24";
+          sha256 = "0wl21pgjf9p6cf4d51cd2z974m6ph1cjspi3vdbf91pd13b72sdq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sotclojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sotclojure";
           sha256 = "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090";
           name = "sotclojure";
         };
@@ -51267,7 +51812,7 @@
           sha256 = "027jmqx4240hym2is9q1iyjdws9ijyyck8dnsbm9xc5lhpsdrl69";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sotlisp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sotlisp";
           sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
           name = "sotlisp";
         };
@@ -51288,7 +51833,7 @@
           sha256 = "1h6h65gwxb07pscyhhhdn11h3lx3jgyfw8v1kw5m2qfrv5kh6ylq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sound-wav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sound-wav";
           sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
           name = "sound-wav";
         };
@@ -51309,7 +51854,7 @@
           sha256 = "1m8wcm6y80gq5rrm4brd3f20kmk54s6ph26j4lz4cmilxk6gj56v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soundcloud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soundcloud";
           sha256 = "1jl9sk372j4162av9kfcbqp0cc5wpm86nkqg8rskfgmsi4ncp4ph";
           name = "soundcloud";
         };
@@ -51337,7 +51882,7 @@
           sha256 = "1ipg4vvh6vgf0az8p31br1xkb8ndjmd6fybcx11r3c479sg0y6k7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soundklaus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soundklaus";
           sha256 = "0b63sbgwp99ff94dxrqqp2p99j268fjkkzx0g42g726hv80d4fxb";
           name = "soundklaus";
         };
@@ -51358,7 +51903,7 @@
           sha256 = "18iv7jhy08smpdksplngj1mxcm2mm9gvbylimgr3211l8jr9gq8r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcegraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcegraph";
           sha256 = "0rl6s1d0y2pggbfiq4f4xg9qp7nhkd708himzilfqyfa4jwna8yz";
           name = "sourcegraph";
         };
@@ -51379,7 +51924,7 @@
           sha256 = "1xzwalchl9lnq9848dlvhhbzyh1wkwbciz20d1iw0fsigj5g156c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
           name = "sourcekit";
         };
@@ -51400,7 +51945,7 @@
           sha256 = "085xd5fqxgv9bam9k4aa3w0sa9q41cg275i60c8njy3bkbqcalh5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcemap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
           name = "sourcemap";
         };
@@ -51421,7 +51966,7 @@
           sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcetalk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcetalk";
           sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
           name = "sourcetalk";
         };
@@ -51442,7 +51987,7 @@
           sha256 = "1a8jp7m9zarvljg5d9c8ydir3qcmwx05c3frs696p9nwvapf6lsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spacegray-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spacegray-theme";
           sha256 = "0khiddpsywpv9qvynpfdmybd80lbrhm68j3py6ranxlv7p79j9dx";
           name = "spacegray-theme";
         };
@@ -51455,15 +52000,15 @@
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
-        version = "20160107.826";
+        version = "20160120.559";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "e140876cf75d5dbbac3a45428640d9d573a8c4c5";
-          sha256 = "0l2qvh01m1r8gfi055slgz96k7mcl0pqw8bbfw1saq5wfr2s95zh";
+          rev = "88e22c1c9c69093efc7310ca996d2efb3cbbba1d";
+          sha256 = "1ncwv6sqm1ch396qi1c8276dc910rnm0f3m8xjkskplv3cjaq0ai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spaceline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spaceline";
           sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
           name = "spaceline";
         };
@@ -51476,15 +52021,15 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20160118.708";
+        version = "20160121.1443";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "afbb2c89ab574e9851da2fff7aa7d992f59f5780";
-          sha256 = "10q9n4iygp7r7rnp15jh2rq4d38v38xsmmbg6isykampwcxpwfq4";
+          rev = "6b49a05e7aed1318f7680984a5d21827026013fa";
+          sha256 = "01ylny2kfdlc73qmyy3xp5pwir459jryg0ci9k1qbzb7vb38v8vj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spacemacs-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spacemacs-theme";
           sha256 = "0riiim6qb6x9g5hz0k3qgdymgikynlb9l07mrbfmybkv4919p992";
           name = "spacemacs-theme";
         };
@@ -51505,7 +52050,7 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spaces";
           sha256 = "152x7fzjnjjdk9d9h0hbixdp3haqn5vdx3bq1nfqfrkvzychyr06";
           name = "spaces";
         };
@@ -51526,7 +52071,7 @@
           sha256 = "1fqd3ycywxxmln2kzqwflc69xmqlvi9gwvmf7frn0rfv73w09cvp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sparkline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sparkline";
           sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
           name = "sparkline";
         };
@@ -51547,7 +52092,7 @@
           sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sparql-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
           name = "sparql-mode";
         };
@@ -51565,7 +52110,7 @@
           sha256 = "1i2z57aasljia6xd2xn1mryklc2gc9c2q1fad8wn7982sl277d10";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speck";
           sha256 = "19h3syk4kjmcy7jy9nlsbq6gyxwl4xsi84dy66a3cpvmknm25kyg";
           name = "speck";
         };
@@ -51586,7 +52131,7 @@
           sha256 = "05qx3wqsqs9lxv5lgpaw1wsd6qb5hh599ggi3c17ig5663q7pjsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speech-tagger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speech-tagger";
           sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
           name = "speech-tagger";
         };
@@ -51606,7 +52151,7 @@
           sha256 = "2c1bff3e5a182b8150c6ba6c3be7e70ab2b733cac0a758521c0b941dff215c32";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speechd-el";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speechd-el";
           sha256 = "07g6jwymmwkx26p3as3r370viz1cqq360cagw9ji6i0hvgrr66a0";
           name = "speechd-el";
         };
@@ -51627,7 +52172,7 @@
           sha256 = "102hjyr9ii2rmq8762irbwansbi023s7dg4a8n6lkadcvzfibmag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speed-type";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speed-type";
           sha256 = "14q423an7v5hhfx1x039fizxcn5hcscqf2jfn9rqifg4jpq8bq5g";
           name = "speed-type";
         };
@@ -51648,7 +52193,7 @@
           sha256 = "1wif9wf8hwxk0q09cdnrmyas7zjg8l5b8jd6sjxd40ypn6dmz2ch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sphinx-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sphinx-doc";
           sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
           name = "sphinx-doc";
         };
@@ -51669,7 +52214,7 @@
           sha256 = "1mfp4777ppg7zg7zqj755zpfk9lmcq73hxv055ig66pz30m7x5rw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sphinx-frontend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sphinx-frontend";
           sha256 = "0hdn6zjnhzyka0lzdxqfzbj3lrj767ij406zha9zw8ibbkk7cmag";
           name = "sphinx-frontend";
         };
@@ -51690,7 +52235,7 @@
           sha256 = "1qdy9nc2h7mwxh7zg2p1x7yg96hxkwxqimjp6zb1119jx0s8grjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/splitjoin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/splitjoin";
           sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
           name = "splitjoin";
         };
@@ -51711,7 +52256,7 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/splitter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/splitter";
           sha256 = "02vdhvipzwnh6mlj25lirzxkc0shfzqfs1p4gn3smkxqx6g7mdb2";
           name = "splitter";
         };
@@ -51721,22 +52266,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    spotify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    spotify = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spotify";
-        version = "20150108.1003";
+        version = "20160128.306";
         src = fetchFromGitHub {
           owner = "remvee";
           repo = "spotify-el";
-          rev = "07a44ecdbdaa93977e97f2a2e5d280ef0b2e8545";
-          sha256 = "05y8xv6zapspwr5bii41lgirslas22wsbm0kgb4dm79qbk9j1kzw";
+          rev = "08d341c981ee218c18f4806d83d803ceb4e46466";
+          sha256 = "1f0dl2zzxnqsyic87jl9wbg6lf42d8g61sj4d9fb3yhxy6jf07jv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spotify";
           sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
           name = "spotify";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/spotify";
           license = lib.licenses.free;
@@ -51753,7 +52298,7 @@
           sha256 = "05knlca2dvpyqp9lw8dc47fl5kh2jb04q57cygkzfjjkzvywdwq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spotlight";
           sha256 = "0mmr1spr21pi8sfy95dsgqcxn8qfsphdkfjm5w5q97lh7496z65p";
           name = "spotlight";
         };
@@ -51774,7 +52319,7 @@
           sha256 = "0fvywcwn0zd06yy4b6cxpasiwfbps17jz9dy3jr0y0mdx5lzfxa9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spray";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spray";
           sha256 = "11b3wn53309ws60w8sfpfxij7vnibj6kxxsx6w1agglqx9zqngz4";
           name = "spray";
         };
@@ -51795,7 +52340,7 @@
           sha256 = "14py5amh66jzhqyqjz5pxq0g19vzlmqnrr5wij1ix64xwfr3xdy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/springboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/springboard";
           sha256 = "17rmsidsbb4p08vr07mfn25m17wnpadcwr4nxvp79glp5a0wyyib";
           name = "springboard";
         };
@@ -51816,7 +52361,7 @@
           sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sprintly-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sprintly-mode";
           sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
           name = "sprintly-mode";
         };
@@ -51837,7 +52382,7 @@
           sha256 = "11igl9n2zwwar1xg651g5v0r0w6xl0grm8xns9wg80351ijrci7x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sproto-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sproto-mode";
           sha256 = "19l6si3sx2i542r5lyr9axby9hblx76m77f17vnsjf32n3r0qgma";
           name = "sproto-mode";
         };
@@ -51858,7 +52403,7 @@
           sha256 = "17nbcaqx58fq4rz501xcqqcjhmibdlkaavmmzwcfwra7jv8hqljy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sql-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sql-indent";
           sha256 = "13s38zdd9j127p6jxbcj4d4va8mkri5dx5zh39g465mnlzx7fp8g";
           name = "sql-indent";
         };
@@ -51879,7 +52424,7 @@
           sha256 = "0zlrx8sk7gwwr6a23mc22d7iinwf8p9ff16r9krqp86fyzbhnq1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sqlite";
           sha256 = "1j23rqgq00as90nk6csi489ida6b83h1myl3icxivj2iw1iikgj1";
           name = "sqlite";
         };
@@ -51897,7 +52442,7 @@
           sha256 = "0xixdddcrzx6k0s8w9rp6q7b9qjpdb4l888gmcis42yvawb1i53d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sqlplus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sqlplus";
           sha256 = "1z9pf36b1581flykis9cjv7pynnp94fm4ijzjy6hvqyj81aikxpz";
           name = "sqlplus";
         };
@@ -51918,7 +52463,7 @@
           sha256 = "0p2g4ss3bf2asxcibrd8l70ll04nm47znr99l5xyzzwhyfzi61w4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sqlup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sqlup-mode";
           sha256 = "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7";
           name = "sqlup-mode";
         };
@@ -51936,7 +52481,7 @@
           sha256 = "1ffnm2kfh8cg5rdhrkqmh4krggbxvqg3s6lc1nssv88av1c5cs3i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sr-speedbar";
           sha256 = "1zq3ysz1vpc98sz2kpq307v1fp1l4ivwgrfh2kdqkkdjm4fkya23";
           name = "sr-speedbar";
         };
@@ -51957,7 +52502,7 @@
           sha256 = "1n5p51iy79z60fnhxklc03pp0jbs5rgyb02z3wndbyzy73bhfh7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/srefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/srefactor";
           sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
           name = "srefactor";
         };
@@ -51978,7 +52523,7 @@
           sha256 = "1rdhdkwdhb727rj53xyxk6i00sjr58a48hfig14m12niy1k739vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ssh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ssh";
           sha256 = "1jywn8wlqzc2mfylp0kbpzxv3kwzak3vxdbjabiawqv1m4bfpk5g";
           name = "ssh";
         };
@@ -51999,7 +52544,7 @@
           sha256 = "0076g1yb8xvn6s8gz5jxiz8mn448fmab574yizgakbxaxd91s1dj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ssh-agency";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ssh-agency";
           sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8";
           name = "ssh-agency";
         };
@@ -52020,7 +52565,7 @@
           sha256 = "1v6srqiqq5xsjiw4d3kfgp218dks8mm6f9i88ngjri6sb3slpfb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ssh-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ssh-config-mode";
           sha256 = "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb";
           name = "ssh-config-mode";
         };
@@ -52041,7 +52586,7 @@
           sha256 = "10a5havjg4yjshpfzkhgjdwbrvl44narg09ddzynczmyzm4f01wh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ssh-tunnels";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ssh-tunnels";
           sha256 = "0zlf22wg9adkhycsasv6bfim2h0cknsvihyi1q2l2l4pjdp9ypqj";
           name = "ssh-tunnels";
         };
@@ -52062,7 +52607,7 @@
           sha256 = "1f2dxlc3dsf9ay417h1l43fxjkrb0a4gg96zd3asx9v2alpzgcim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stack-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stack-mode";
           sha256 = "0s0m2lj40php7bc2i3fy9ikd5rmx4v7zbxfkp9vadmlc5s7w25gf";
           name = "stack-mode";
         };
@@ -52083,7 +52628,7 @@
           sha256 = "0nkrpx1rmzg48mi5871mgdizasv80vpald513ycx4nshyln0ymv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stan-mode";
           sha256 = "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy";
           name = "stan-mode";
         };
@@ -52104,7 +52649,7 @@
           sha256 = "0nkrpx1rmzg48mi5871mgdizasv80vpald513ycx4nshyln0ymv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stan-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stan-snippets";
           sha256 = "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85";
           name = "stan-snippets";
         };
@@ -52121,11 +52666,11 @@
         src = fetchFromGitHub {
           owner = "lueck";
           repo = "standoff-mode";
-          rev = "09b4b2dfeadf0b9c2f3e2897be5e9b728c07b9b6";
-          sha256 = "1fn97aw91g02hgz5c9dvnxh4zdd9wrdhs44s0gnj570za1m4cbiv";
+          rev = "1f401b5faf953e68af92596bc247a432ebd1fe03";
+          sha256 = "09gjhg923jck35c1nvcdfk4dc0r559myzmfbcd9jvjamzh50ngcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/standoff-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/standoff-mode";
           sha256 = "127bzpm1cz103f1pb860yqrh7mr0rdaivrm9p6ssd01kchl9nskp";
           name = "standoff-mode";
         };
@@ -52146,7 +52691,7 @@
           sha256 = "1v3rzy842mfzm850vs273ssr4hg00q1wz2rpky8lk3wbbw2qq3f0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/start-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/start-menu";
           sha256 = "1k1lc9i9vcl2am9afq0ksrxwsy6kppl4i0v10h0w2fq5z374rdkv";
           name = "start-menu";
         };
@@ -52167,7 +52712,7 @@
           sha256 = "0cl2y72iagmv87kg72a46a3kap2xigwnrbk2hjgvsbxv2ng5f9cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stash";
           sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
           name = "stash";
         };
@@ -52188,7 +52733,7 @@
           sha256 = "1b17v4xghmki0g9yr5855891mlcrrbkr68xc3qyals5xw0dhb3xb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/state";
           sha256 = "19y3n8wnbpgbpz4jxy2p7hjqxykg09arjp7s5v22yz7il3gn48l2";
           name = "state";
         };
@@ -52209,7 +52754,7 @@
           sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/status";
           sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
           name = "status";
         };
@@ -52230,7 +52775,7 @@
           sha256 = "0w1qb8r6nrxi5hbf8l4247yqq754zfbxz64pqqcnw43cxk0qd4j3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stekene-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stekene-theme";
           sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
           name = "stekene-theme";
         };
@@ -52251,7 +52796,7 @@
           sha256 = "1xc4v8a35c2vpfhza15j4f89x7vyg9bbgm7xnprij7814k8iy7p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stem";
           sha256 = "1625nbi2bmb7vzjz0s7y1cy7dp8lp83dayiib3nr2bfkv76fwkcq";
           name = "stem";
         };
@@ -52270,7 +52815,7 @@
           sha256 = "c5d424f34ca33d2c19e3888a9dc249d0398203e5199bf2b4bdd9e604390b500b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stgit";
           sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
           name = "stgit";
         };
@@ -52288,7 +52833,7 @@
           sha256 = "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sticky";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sticky";
           sha256 = "1xjkdwphq3m4jrazsfnzrrcrqikfdxzph3jdzkpbzk3grd4af96w";
           name = "sticky";
         };
@@ -52309,7 +52854,7 @@
           sha256 = "16dxjsr5nj20blww4xpd4jzgjprzzh1nwvb810ggdmp9paf4iy0g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stickyfunc-enhance";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stickyfunc-enhance";
           sha256 = "13dh19c3bljs83l847syqlg07g33hz6sapg6j4s4xv4skix8zfks";
           name = "stickyfunc-enhance";
         };
@@ -52330,7 +52875,7 @@
           sha256 = "191sg32z1iagyxmbn49i1lpfihld9g9741cw2kj830s4vag4kinx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stock-ticker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stock-ticker";
           sha256 = "1slcjk2avybr4v9s7gglizmaxbb3yqg6s6gdbg12m3vvj3b72lfi";
           name = "stock-ticker";
         };
@@ -52351,7 +52896,7 @@
           sha256 = "1xgsdr75p52vg34s1gm16ffkr3s7gdsln56xjxpdirnwr78glbmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/strie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/strie";
           sha256 = "0i1bgjlwcc2ks8hzjkyrw924q4k8pcz8335z9935m73js0sq0lxl";
           name = "strie";
         };
@@ -52372,7 +52917,7 @@
           sha256 = "0nx303bdi8mq18isgf79y8f1cjhqnxv3g3ynm09llrg73qr7r4zw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-edit";
           sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
           name = "string-edit";
         };
@@ -52393,7 +52938,7 @@
           sha256 = "06qs8v2pai3pyg0spmarssmrq06xg9q60wjj46s5xxichlw9pgcf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-inflection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-inflection";
           sha256 = "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2";
           name = "string-inflection";
         };
@@ -52414,7 +52959,7 @@
           sha256 = "1frdspm1qgksa8cpx5gkj50xk9mgz8202pgp11lqir6l3yjcj3wq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-utils";
           sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
           name = "string-utils";
         };
@@ -52432,7 +52977,7 @@
           sha256 = "1sa6wd2z2qkcnjprkkm9b945qz8d0l702sv9w15wl0lngbhw84na";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/strings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/strings";
           sha256 = "0n3239y7biq3rlg74m7nqimhf654w4snnw2zm7z84isgwzz2dphk";
           name = "strings";
         };
@@ -52453,7 +52998,7 @@
           sha256 = "0dxajh72wdcwdb9ydbcm19fmp0p1drmh1niq4r69jnbn8sah0zax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stripe-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stripe-buffer";
           sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
           name = "stripe-buffer";
         };
@@ -52473,7 +53018,7 @@
           sha256 = "3547616b9e5694fd09014bbbf29458ee0dea828428b6bf7a6231670aacfb8271";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stumpwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stumpwm-mode";
           sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
           name = "stumpwm-mode";
         };
@@ -52493,7 +53038,7 @@
           sha256 = "242b90e4c403fbcadd40777cd98899c96aab78b84dea88dfa97583b734c9876b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stupid-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stupid-indent-mode";
           sha256 = "12y8qxxs04qzy09m734qg0857g4612qdswx2bh9jk7dp886fpd7p";
           name = "stupid-indent-mode";
         };
@@ -52514,7 +53059,7 @@
           sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stylus-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stylus-mode";
           sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
           name = "stylus-mode";
         };
@@ -52527,15 +53072,15 @@
     subatomic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "subatomic-theme";
-        version = "20150704.1009";
+        version = "20160126.938";
         src = fetchFromGitHub {
           owner = "cryon";
           repo = "subatomic";
-          rev = "2543881f9bbb8520f845b7fe8f370793c36f7df2";
-          sha256 = "1njfwjyrh9m00jyy65zl31gxa66941mvvrk7nn5yizsbdadrbq0z";
+          rev = "6a4086af748b1ecb27f6ba2aa2614988db16d594";
+          sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subatomic-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subatomic-theme";
           sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc";
           name = "subatomic-theme";
         };
@@ -52556,7 +53101,7 @@
           sha256 = "1w7mimyqc25phlww20l49wlafnxp6c7dwibvphg3vwl61g0llpq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subatomic256-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subatomic256-theme";
           sha256 = "1whjlkpkkirpnvvjryhlpzwphr1syz5zfyg4pb66i0db03hxwwcy";
           name = "subatomic256-theme";
         };
@@ -52577,7 +53122,7 @@
           sha256 = "10pirwc7g9vii5cyk4vg6m5g5hlap0yg9w4qy257744c67jmaxvg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subemacs";
           sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
           name = "subemacs";
         };
@@ -52598,7 +53143,7 @@
           sha256 = "0lhbmcpzpxlqvw4mgh79v9y2f0xqjd1m36dbxcvhb67rwq6nrw3r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sublime-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sublime-themes";
           sha256 = "1nahcfcy831c7w3c69i2na0r8jsdgprffgfdvh4c41cnk4rkgdqj";
           name = "sublime-themes";
         };
@@ -52619,7 +53164,7 @@
           sha256 = "1kpq7kpmhgq3vjd62rr4qsc824qcyjxm50m49r7invgnmgd78h4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sublimity";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sublimity";
           sha256 = "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw";
           name = "sublimity";
         };
@@ -52637,7 +53182,7 @@
           sha256 = "1xxf8kgxzcwwjm96isj4zg31vw63ahivr6xch5dw8wsvk0mjks9y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subr+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subr+";
           sha256 = "1vrv64768f7rk58mqr4pq1fjyi5n5kfqk90hzrwbvblkkrmilmfs";
           name = "subr-plus";
         };
@@ -52658,7 +53203,7 @@
           sha256 = "09izm28jrzfaj469v6yd1xgjgvy6pmxarcy0rzn2ihn3c0z7mdg4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subshell-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subshell-proc";
           sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
           name = "subshell-proc";
         };
@@ -52679,7 +53224,7 @@
           sha256 = "1007xz4x1wgvxilv1qwf0a4y7hd7sqnnzwk2bdr12kfk7vq9cw2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sudden-death";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sudden-death";
           sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
           name = "sudden-death";
         };
@@ -52697,7 +53242,7 @@
           sha256 = "0fpz73r52j7sk1w7my0002wg7isrp54w28nnrwk9xb9il4qpxag2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sudo-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sudo-ext";
           sha256 = "1iirrpa4rnz7rm85yjg60vdfca1ipxbk3qkld8lgwwm242pvvkw3";
           name = "sudo-ext";
         };
@@ -52715,7 +53260,7 @@
           sha256 = "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/summarye";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/summarye";
           sha256 = "1znd96ixg1n90yjiny84igb7m8qsbiibn7s6bky8g6n2k7zzmq65";
           name = "summarye";
         };
@@ -52736,7 +53281,7 @@
           sha256 = "0mhyhkjjwszwl5wzkys9pgvgx9sps9r46k1s1hpzzf4s3vi015mc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sunny-day-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sunny-day-theme";
           sha256 = "1wsfnmmbzzyggzip66vr38yyzy27blxp91wx97bafj7jpg5cyhzw";
           name = "sunny-day-theme";
         };
@@ -52757,7 +53302,7 @@
           sha256 = "1x3ivhwyapxw7v3ygam3bn2i9djrsp9mcd5zdn8q84c583ppanll";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sunshine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sunshine";
           sha256 = "1lxiqw7k8cpq0v6p5whgxgzqrbx3sd9174r0d4qlkrpn6rcp44vv";
           name = "sunshine";
         };
@@ -52778,7 +53323,7 @@
           sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/suomalainen-kalenteri";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/suomalainen-kalenteri";
           sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
           name = "suomalainen-kalenteri";
         };
@@ -52791,15 +53336,15 @@
     super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "super-save";
-        version = "20160114.652";
+        version = "20160131.418";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "super-save";
-          rev = "f3a126a22e2e8c7bc33cd59326c61a172cfffe78";
-          sha256 = "02wgdhb3ap6zp7jw0nf5c0dy8f363r5w00nq4p3h8q40492khgyk";
+          rev = "cf7a60afc6173ba59627f920ecaf6e69942071b8";
+          sha256 = "0jbij0wnw6rylchnhihl82harg29275ljpdh3nmcjnjhk6za60vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/super-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/super-save";
           sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
           name = "super-save";
         };
@@ -52820,7 +53365,7 @@
           sha256 = "0m02snzka243adhwwgriml133n4312lhdia3wdqjcq8y2mlp3331";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/supergenpass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/supergenpass";
           sha256 = "0ldy6j6l6rf72w0hl195rdnrabml2a5k91200s186k0r5aja4b95";
           name = "supergenpass";
         };
@@ -52830,6 +53375,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    suscolors-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "suscolors-theme";
+        version = "20160201.1004";
+        src = fetchFromGitHub {
+          owner = "TheSuspiciousWombat";
+          repo = "suscolors-emacs";
+          rev = "d6e7b1a7ac7ee98a9e958702f15bcfb96463aa51";
+          sha256 = "0bwmgmc12rlhcicdy6fhsq96wsvd3hdnz8w545ykiwb5wci52j0m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/suscolors-theme";
+          sha256 = "08sh20lmhqzpxb55nmqwsfv4xd6sjirh592in7s6vl52r3hl0jkh";
+          name = "suscolors-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/suscolors-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     svg-mode-line-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xmlgen }:
     melpaBuild {
         pname = "svg-mode-line-themes";
@@ -52841,7 +53407,7 @@
           sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/svg-mode-line-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/svg-mode-line-themes";
           sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
           name = "svg-mode-line-themes";
         };
@@ -52862,7 +53428,7 @@
           sha256 = "1kn70570r6x0h1xfs1vr8as27pjfanyhml140yms60gdjb4ssf9r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swap-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swap-buffers";
           sha256 = "0ih5dhnqy3c9nlfz9m2zwy4q4jaam09ykbdqhsxx2hnwjk7p35bw";
           name = "swap-buffers";
         };
@@ -52880,7 +53446,7 @@
           sha256 = "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swbuff-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swbuff-x";
           sha256 = "1wglcxgfr839lynwsl8i7fm70sxxjidy3ib6ibz0kgiwr41rh49y";
           name = "swbuff-x";
         };
@@ -52901,7 +53467,7 @@
           sha256 = "10blwlwg1ry9jznf1a6iss5s0z8sj9gc02ayf5qv92mgxvjhrhdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sweetgreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sweetgreen";
           sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
           name = "sweetgreen";
         };
@@ -52914,15 +53480,15 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "20151018.120";
+        version = "20160124.436";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "a5e1acf5826ccd489617f9255da0aab7e5e920ee";
-          sha256 = "03pxizbw02bp9mp0b0vwiys4vncna73ymmbbmxpw9m6mn1ql2fjv";
+          rev = "1563e8b248bc74613f381e7bd82a43df90064a68";
+          sha256 = "08397a8y8hgyzwny4z9f6kgwy8d37h0iypcjps3l6lhnk35mshv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swift-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swift-mode";
           sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
           name = "swift-mode";
         };
@@ -52935,15 +53501,15 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20160118.710";
+        version = "20160204.837";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "bcb81dde6e1abba02256d716426797a3e1b306f1";
-          sha256 = "0r1i6ck37yq92h7hc9pm6kqlh0751j8jj7vqrligghxk9d42r479";
+          rev = "00f08f74f1568b6f835abadecff32cd7c9a7a556";
+          sha256 = "0hnqw1mhaa7ybldd6mvz9lyv32yspn3x2bgx3fsrh8rhsmns06qh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swiper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swiper";
           sha256 = "13lld7kjz1n1ryxvrfsy0iym5l9m9ybrf7bpcmkzsalpp15j3mvm";
           name = "swiper";
         };
@@ -52964,7 +53530,7 @@
           sha256 = "1fr9vs0574g93mq88d25nmj93hrx4d4s2d0im6wk156k2yb8ha2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swiper-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swiper-helm";
           sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
           name = "swiper-helm";
         };
@@ -52985,7 +53551,7 @@
           sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/switch-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/switch-window";
           sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
           name = "switch-window";
         };
@@ -52998,15 +53564,15 @@
     swoop = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, pcre2el }:
     melpaBuild {
         pname = "swoop";
-        version = "20140605.1610";
+        version = "20160120.1115";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
           repo = "emacs-swoop";
-          rev = "80a5df8edb86efd9885073b3ec6f475d8b969adf";
-          sha256 = "0qp078q9jrfm0k8sjq6qglfilwgqy1n0bbhyjk3hrf7rjxlkfkx7";
+          rev = "a5e475db7a9f5db02ba3d08cd3c1c3594e2e01d7";
+          sha256 = "10ka6f86n07xlf0z7w35db0mzp2zk4xhr6jd19kjdrn2j0ynlcw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swoop";
           sha256 = "0r265rwfbl1iyclnspxpbzf2w1q0w8dnc0wv5mz5g6hhcrr0iv6g";
           name = "swoop";
         };
@@ -53027,7 +53593,7 @@
           sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sws-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sws-mode";
           sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
           name = "sws-mode";
         };
@@ -53040,15 +53606,15 @@
     sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }:
     melpaBuild {
         pname = "sx";
-        version = "20160106.1852";
+        version = "20160125.1801";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "sx.el";
-          rev = "e850df66ef6d98d6a8733a6e096a8c83c9ad0e3c";
-          sha256 = "1g94lh59sdhsa4xw2cjydzysa6crf81qs6mkdjqv9p9c1dlimya5";
+          rev = "4b8f0c335a6fb055284773dfd480106e8c82fd81";
+          sha256 = "0d0c2i8hh0wrz8vnhxpxzwj7vlrjx6lrb3cx56pn4ny9qyqfzmw3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sx";
           sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
           name = "sx";
         };
@@ -53069,7 +53635,7 @@
           sha256 = "1mb068vgf0bbj0bdxjhd6c794bwc3wp7r6q1s49w8b24g1pfrjkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/symon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/symon";
           sha256 = "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz";
           name = "symon";
         };
@@ -53090,7 +53656,7 @@
           sha256 = "030bglxnvrkf1f9grbhd8n11j4c6sxpabpjdr1ryx522v01fvx8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/symon-lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/symon-lingr";
           sha256 = "0kyhmw25cn10b4jv2yx7bvp8zkwcswiidpk4amyaisw25820gkv1";
           name = "symon-lingr";
         };
@@ -53111,7 +53677,7 @@
           sha256 = "00lx6081h1nzwga5jg4cik4h667vfkn128yvnhkd0vw7b5g4ji5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sync-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sync-recentf";
           sha256 = "17aji2vcw6zfd823anzwj8pcgyxamxr87bnni085jvlz0vx6gh9c";
           name = "sync-recentf";
         };
@@ -53132,7 +53698,7 @@
           sha256 = "02xnfkmpvjicckmp9is42fnavy9pd95s99zmf1wylxdji2hhpjxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/synonymous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/synonymous";
           sha256 = "0vawa9qwvv6z1i7vzhkjdl1l9r1yham48yn5y8w8g1xyhxxp6rs5";
           name = "synonymous";
         };
@@ -53150,7 +53716,7 @@
           sha256 = "01l7z6l9pdxzvh851pbq2fn62r28gzwldibffb69jkdln47bph50";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/synonyms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/synonyms";
           sha256 = "0rnq97jpr047gpkxhw22jj3gw09r45vn6fwkzxnxjzcmsyk492d0";
           name = "synonyms";
         };
@@ -53171,7 +53737,7 @@
           sha256 = "1zz9rnwaclr95fpjyabv5rlhk36n2k8f1lzz6yqh964hv8i9562s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/synosaurus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/synosaurus";
           sha256 = "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg";
           name = "synosaurus";
         };
@@ -53192,7 +53758,7 @@
           sha256 = "0zi11540wwcl93xcgd2yf6b72zv01zkaqbf1jfbksg82k9038m2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syntactic-sugar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syntactic-sugar";
           sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
           name = "syntactic-sugar";
         };
@@ -53212,7 +53778,7 @@
           sha256 = "1p9bp09nibw7rra3r6nj496zdx09db6k82dxnxs1lfgdiswfdq2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syntax-subword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syntax-subword";
           sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
           name = "syntax-subword";
         };
@@ -53233,7 +53799,7 @@
           sha256 = "1sxpda380c9wnnf5d72lrcqm6dkihf48cgsjcckzf706cc00ksf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syslog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syslog-mode";
           sha256 = "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19";
           name = "syslog-mode";
         };
@@ -53254,7 +53820,7 @@
           sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/system-specific-settings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/system-specific-settings";
           sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
           name = "system-specific-settings";
         };
@@ -53275,7 +53841,7 @@
           sha256 = "1z7zi0wcms55x0ar9jv02g7gbzsn4k887aigpgv4xghbdiyp7lp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/systemd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/systemd";
           sha256 = "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir";
           name = "systemd";
         };
@@ -53296,7 +53862,7 @@
           sha256 = "0343ss3y9i40y3i9rr7p7bb4k9dj950zyvdv44q1abw2xrfd2xwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/systemtap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/systemtap-mode";
           sha256 = "1l2jx6mvph0q2pdlhq7p4vwfw72rfl8k1rwi504bbkr5n5xwhhhz";
           name = "systemtap-mode";
         };
@@ -53317,7 +53883,7 @@
           sha256 = "054l3imxk9ivq361cr15q1wym07mw3s8xzjkzqlihrfvadsq37ym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ta";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ta";
           sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
           name = "ta";
         };
@@ -53338,7 +53904,7 @@
           sha256 = "0lfvgbgvsm61kv5mcjnhnfjcnr7fy1015y0hndkf9xvdlw4hahr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tab-group";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tab-group";
           sha256 = "1i5lxpf3wmqnqj9mzgcn4gp1gjxp737awrzl1dml5wnarbbj4fs9";
           name = "tab-group";
         };
@@ -53359,7 +53925,7 @@
           sha256 = "0h7sfbca1nzcjylwl7zp25yj6wxnlx8g8a50zc6sg6jg4rggi2fm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tab-jump-out";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tab-jump-out";
           sha256 = "0nlbyzym8l8g9w2xvykpcl5r449v30gal2k1dnz74rq4y8w4rh7n";
           name = "tab-jump-out";
         };
@@ -53380,7 +53946,7 @@
           sha256 = "0n23nnig1lgjamrzsa91p2aplh7gpj2vkp951i9fpf49c6xpyj3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tabbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tabbar";
           sha256 = "1y376nz1xmchwns4fz8dixbb7hbqh4mln78zvsh7y32il98wzvx9";
           name = "tabbar";
         };
@@ -53390,22 +53956,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    tabbar-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, tabbar }:
+    tabbar-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mode-icons, powerline, tabbar }:
     melpaBuild {
         pname = "tabbar-ruler";
-        version = "20160115.1123";
+        version = "20160124.2028";
         src = fetchFromGitHub {
           owner = "mattfidler";
           repo = "tabbar-ruler.el";
-          rev = "dcb480c77632f28b0c6eabfe703911935c44a974";
-          sha256 = "06igfnwih98kp36whw1gb25grj5hkmh4h08dzxg1q1j9wjildb6d";
+          rev = "605bf3b755f228f7a22e440e54a2224ffc06e2e4";
+          sha256 = "1xb9g1qzpsliprcdazr4bk05kfk9dnjazx5hxiv74h33ph1xg4a6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tabbar-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tabbar-ruler";
           sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
           name = "tabbar-ruler";
         };
-        packageRequires = [ powerline tabbar ];
+        packageRequires = [ mode-icons powerline tabbar ];
         meta = {
           homepage = "http://melpa.org/#/tabbar-ruler";
           license = lib.licenses.free;
@@ -53422,7 +53988,7 @@
           sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tablist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tablist";
           sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
           name = "tablist";
         };
@@ -53443,7 +54009,7 @@
           sha256 = "1dbjfq9a7a5s9c18nrp4kcda64jkg5cp8na31kxw0hjcn98dgqa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tabula-rasa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tabula-rasa";
           sha256 = "186lph964swg7rs5gvby3p1d0znq9x3xzsmirfb3cdbazvz6hhxi";
           name = "tabula-rasa";
         };
@@ -53464,7 +54030,7 @@
           sha256 = "00hjc6ax4659ww6vygpzzsb3zzr2ddz2z33mkp5j6hmj2s4g2viy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tagedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tagedit";
           sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
           name = "tagedit";
         };
@@ -53485,7 +54051,7 @@
           sha256 = "13zwlb5805cpv0pbr7fj5b4crlg7lb0ibslvcpszm0cz6rlifcvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/take-off";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/take-off";
           sha256 = "05vlajmirbp62rpbdwa2bimpzyl9xc331gg0lhn2rkivc0hma2ar";
           name = "take-off";
         };
@@ -53505,7 +54071,7 @@
           sha256 = "7342a670559cd296dba4b676607641a05d6203255951b17473ccdda4e35713d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tango-2-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tango-2-theme";
           sha256 = "1a9qmz99h99gpd0sxqb71c08wr8pm3bzsg3p4cvf3vcirvav9lq6";
           name = "tango-2-theme";
         };
@@ -53526,7 +54092,7 @@
           sha256 = "1gfn1yyyb9p2fi17wra1yf2j96cfjw0sifgk3c0vl63h3vmiyvjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tango-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tango-plus-theme";
           sha256 = "1bx9qcwvybgd0rg8a9rag8xvb5ljrwfnm5nvq793ncvbdvq6vrh5";
           name = "tango-plus-theme";
         };
@@ -53547,7 +54113,7 @@
           sha256 = "00v2y2gfb44kmzfdbp6f4nmxlwn8gf6y3hvgqzggmlbqb5m8hg8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tangotango-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tangotango-theme";
           sha256 = "05cnvyqmh5h5mqys7qs7d9knzxzmi2x0j1avp77x5l5njzzv59s2";
           name = "tangotango-theme";
         };
@@ -53568,7 +54134,7 @@
           sha256 = "1zhr6vrzf511mxrj4fkc9k8wfr1hixn733f5g28j4qzykr4zl2mh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tao-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tao-theme";
           sha256 = "0gl6zzk5ha6vl2xxf5fcnv1k42cw4axdjdcirr1c4r8jwdq3nl3a";
           name = "tao-theme";
         };
@@ -53589,7 +54155,7 @@
           sha256 = "1jp80qywcphql1ngd4fr24lqdfwrw0bw6q9hgq5vmzgjwfxwxwd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tbx2org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tbx2org";
           sha256 = "1yvkw65la4w12c4w6l9ai73lzng170wv4b8gry99m2bakw3wr8m8";
           name = "tbx2org";
         };
@@ -53610,7 +54176,7 @@
           sha256 = "1xpkrlfqb0np9zyxk41f3pxfkw98ii4q0xh8whq4llv5bmfxynzk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tc";
           sha256 = "13qdnfslnik4f97lz9bxayyhgcp1knh5gaqy00ps863j3vpzjb9s";
           name = "tc";
         };
@@ -53631,7 +54197,7 @@
           sha256 = "1krway6iw62dlr4ak3kj9llqh48xjf3d84nlincap7gkrw886l4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tco";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tco";
           sha256 = "0hfrzwjlgynk3mydrpmic9mckak37r22fdglrfas6zdihgrg152f";
           name = "tco";
         };
@@ -53652,7 +54218,7 @@
           sha256 = "1jyz6z5bk1gvmknphcnvjvbl329zm8m40yl0a1hfaj8fvhwyzdw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tdd-status-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tdd-status-mode-line";
           sha256 = "0z1q1aw14xq72nfx7mmvz7pr2x4960l45z02jva35zxzvb1mvsgq";
           name = "tdd-status-mode-line";
         };
@@ -53673,7 +54239,7 @@
           sha256 = "0b4cwkwkc4i8lc4j30xc9d6xskm3gqrc2dij60ya75h92aj0lj40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tea-time";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tea-time";
           sha256 = "18fsbh78c5408zg5bk44gxdynp6kn8253xdg7ap2pr3mjknq9kld";
           name = "tea-time";
         };
@@ -53694,7 +54260,7 @@
           sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/telepathy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/telepathy";
           sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
           name = "telepathy";
         };
@@ -53715,7 +54281,7 @@
           sha256 = "0mg870s60by22ripxhqrgxjx16506n4llj9nnxlqgr4mdsi77cf5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/telephone-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
           name = "telephone-line";
         };
@@ -53736,7 +54302,7 @@
           sha256 = "0sa3chk16s830lqhcd8d3bwdfmjg239ywb7jm6lhwshydssh34nk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-alert";
           sha256 = "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n";
           name = "term-alert";
         };
@@ -53757,7 +54323,7 @@
           sha256 = "11xk11i99d17x5bl7glrwj2dhvl3f54slipj034dbf07dd5b2jih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-cmd";
           sha256 = "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy";
           name = "term-cmd";
         };
@@ -53778,7 +54344,7 @@
           sha256 = "1ayr34smxf94c09ssdwl4hyhzgahsmbj7j4h25cdm6wcwii2br86";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term+";
           sha256 = "12lvfspqmyrapmbz3x997vf160927d325y50kxdx3s6p81r7n2n8";
           name = "term-plus";
         };
@@ -53799,7 +54365,7 @@
           sha256 = "1dql2w8xkdw52zlrc2p9x391zn8wv4dj8a6293p4s08if7gg260w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term+key-intercept";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term+key-intercept";
           sha256 = "1564a86950xdwsrwinrs118bjsfmbv8gicq0c2dfr827v5b6zrlb";
           name = "term-plus-key-intercept";
         };
@@ -53820,7 +54386,7 @@
           sha256 = "12gfvcf7hl29xhg231cx76q04ll7cvfpvhkb0qs3qn1sqb50fs2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term+mux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term+mux";
           sha256 = "129kzjpi5nzagqkjfikx9i7k6489dy7d3pd7ggn59p4cnh3r2rhh";
           name = "term-plus-mux";
         };
@@ -53841,7 +54407,7 @@
           sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-run";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-run";
           sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
           name = "term-run";
         };
@@ -53862,7 +54428,7 @@
           sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/termbright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/termbright-theme";
           sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
           name = "termbright-theme";
         };
@@ -53879,11 +54445,11 @@
         src = fetchFromGitHub {
           owner = "marijnh";
           repo = "tern";
-          rev = "ddb2438867524e422a0baa807cb89cd7403b5622";
-          sha256 = "0w2hnb3yhrzywl9wjz228i4jwj1nn9xfa0b19sc79jwpz7m37rdv";
+          rev = "5d9d95f976402604db161a40103e34ea90665ef0";
+          sha256 = "1lnfibvs2v7byk6l1vpz7nr8jkg3fbs0ijviwxmfjqpjbaglnksv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern";
           sha256 = "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif";
           name = "tern";
         };
@@ -53900,11 +54466,11 @@
         src = fetchFromGitHub {
           owner = "marijnh";
           repo = "tern";
-          rev = "ddb2438867524e422a0baa807cb89cd7403b5622";
-          sha256 = "0w2hnb3yhrzywl9wjz228i4jwj1nn9xfa0b19sc79jwpz7m37rdv";
+          rev = "5d9d95f976402604db161a40103e34ea90665ef0";
+          sha256 = "1lnfibvs2v7byk6l1vpz7nr8jkg3fbs0ijviwxmfjqpjbaglnksv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern-auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern-auto-complete";
           sha256 = "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1";
           name = "tern-auto-complete";
         };
@@ -53921,11 +54487,11 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "tern-django";
-          rev = "455326a1732daa58d4d963b0b11bb1a9fd2f2b86";
-          sha256 = "1yb416py93sxnkfnfnbwrlfg68gkp97wpfsrdpc83sai888p44wc";
+          rev = "18cbf415fba5109e311aadb4a6b9d8b12507daa3";
+          sha256 = "061mkj5vhyhl4fav7q0r2yxidh0jcyajznb76slkakk6n2wmv7q0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern-django";
           sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
           name = "tern-django";
         };
@@ -53946,7 +54512,7 @@
           sha256 = "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/terraform-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
           name = "terraform-mode";
         };
@@ -53967,7 +54533,7 @@
           sha256 = "1r3fmb8cshgh9pppdvydfcrzlmb9cgz4m04rgv69c5xv8clwcmbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-case-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-case-mode";
           sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
           name = "test-case-mode";
         };
@@ -53988,7 +54554,7 @@
           sha256 = "125k13sqgxk963c04zn49jidvzx0hl0s4vvc9jpffgq8aq0mnnmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-kitchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-kitchen";
           sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
           name = "test-kitchen";
         };
@@ -54009,7 +54575,7 @@
           sha256 = "0h2g02r1spj8vbwgvjn3dddyj89j1qcqzdf2kdggvyyisssj81s3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-simple";
           sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
           name = "test-simple";
         };
@@ -54030,7 +54596,7 @@
           sha256 = "1qcd7vdg63q80zwz8ziaznllq1x7micmljm72s6sh3720rb5aiz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textile-mode";
           sha256 = "0c1l7ml9b1zipk5fhmhirrh070h0qwwiagdk84i04yvdmmcjw2nf";
           name = "textile-mode";
         };
@@ -54051,7 +54617,7 @@
           sha256 = "1b7xxz1i84azmbz8rqpxdn18avmnqlj87hfrpbngbf6pj5h9jqjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textmate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textmate";
           sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
           name = "textmate";
         };
@@ -54072,7 +54638,7 @@
           sha256 = "1idhhfp0jhnykyms7dp3lfk6imddg6a315pfklbjpcys4y3fdz89";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textmate-to-yas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textmate-to-yas";
           sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
           name = "textmate-to-yas";
         };
@@ -54090,7 +54656,7 @@
           sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tfs";
           sha256 = "10szb9mni37s2blvhl1spj96narmkrv8zhrryw9q1251z8laq5v0";
           name = "tfs";
         };
@@ -54111,7 +54677,7 @@
           sha256 = "0njmn5dy773v9kmwclw1m79rh52xnxl8mswcaagni2z3dvlvw4m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/theme-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/theme-changer";
           sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
           name = "theme-changer";
         };
@@ -54132,7 +54698,7 @@
           sha256 = "1kd4mazrcy5xamkvvrwsmcx63g0gp5w4264kxbk3d25bjqcf8rmj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/theme-looper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/theme-looper";
           sha256 = "02hz9k4ybpp4i8ik2av9rg240sjgicbf6w24zn67dmw4nc4lp9c5";
           name = "theme-looper";
         };
@@ -54153,7 +54719,7 @@
           sha256 = "12kz4alyf3y2i7lkvi26hcxy55v0blsrxv5srx9fv5jhxkdz1vq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/therapy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/therapy";
           sha256 = "0y040ghb0y6aq0nchqr09vapz6h6112rkwxkqsx0v7xmqrqfjvhh";
           name = "therapy";
         };
@@ -54171,7 +54737,7 @@
           sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thesaurus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thesaurus";
           sha256 = "1nyjk9jr1xvdkil13ylfsgg7q2sx71za05gi8m2v5f45pbmbi50h";
           name = "thesaurus";
         };
@@ -54190,7 +54756,7 @@
           sha256 = "1nclwxb63ffbc4wsga9ngkfcxsw88za0c4663fh9x64rl4db4hn8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thing-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thing-cmds";
           sha256 = "133bm2cw9ar6m2amj0rrq4wbj9c3zl61gaprx0vlasxj2cyxs7yw";
           name = "thing-cmds";
         };
@@ -54208,7 +54774,7 @@
           sha256 = "0ijz0mj095wycpc3as5fiikrwazljk0c04rh089ch0mzc95g3vqq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thingatpt+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thingatpt+";
           sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa";
           name = "thingatpt-plus";
         };
@@ -54229,7 +54795,7 @@
           sha256 = "0imzrb3vqnm36illqnpfc6x7rbq9rrrlpcw9n2yzl4n309mqdwr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thingopt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thingopt";
           sha256 = "0yvzq1z2nrldr8vhcvxqgzvh4gbrjjwfmprg59p4v5hlxvhxsb1y";
           name = "thingopt";
         };
@@ -54250,7 +54816,7 @@
           sha256 = "0rjcrvw9v2y10ahycra53bwbccpwqxxwn2c21wjj1kfs0kdwhs9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thread-dump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thread-dump";
           sha256 = "0dzr86jyf2j49gq40q6qd6lppa57n65n94xzpdjjbs182hxzavp2";
           name = "thread-dump";
         };
@@ -54267,11 +54833,11 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "e917a278d836ad9cceba8ea5054346b22b3bbbb7";
-          sha256 = "0vp076m7lydl19rk7f7fa9lmlwn5dczc3g79y6pyxyhqsdr6sa3f";
+          rev = "c1a78ba6d5ff0c015768a5b0969112895b4e7723";
+          sha256 = "1dq9a26vvv3a9nkdf7yb42a4dklg91g2wpnh3yv1zdcxh8hk2nx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thrift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thrift";
           sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
           name = "thrift";
         };
@@ -54290,7 +54856,7 @@
           sha256 = "0nyp1sp55l3mlhlxw8kyp6hxan3rbgwc4fmfs174n6hlj3zr5vg8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thumb-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thumb-frm";
           sha256 = "1fjjd80drm8banni909lww9zqazr1kk9m40xwwa1ln2zicaf091c";
           name = "thumb-frm";
         };
@@ -54311,7 +54877,7 @@
           sha256 = "0nypcryqwwsdawqxi7hgsv6fp28zqslj9phw7zscqqxzc3svaywn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thumb-through";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thumb-through";
           sha256 = "1krn7zn2y8p51m8dxai5nbrwbdviz6zrjzz0kykya9cqz4n9dhln";
           name = "thumb-through";
         };
@@ -54324,15 +54890,15 @@
     tide = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20151201.245";
+        version = "20160130.243";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "0c0f95b9e5abdbe60ccfcefc81f02178bfa940ab";
-          sha256 = "045c1fmmig88lc7c85vy8532mx0lhl666m5lrrv4i6r5n6sf68s3";
+          rev = "a68c70c3eebaa15394d96978019186b4d0a6aac2";
+          sha256 = "1qgnmsvslyqip0x8k6yd7cl47c9biyxwqk69hnsvpjjbsv2l3y8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tide";
           sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1";
           name = "tide";
         };
@@ -54350,7 +54916,7 @@
           sha256 = "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tidy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tidy";
           sha256 = "09xb2k3k99hp3m725f31s6hlaxgl4fsaa1dylahxvdfddhbh290m";
           name = "tidy";
         };
@@ -54368,7 +54934,7 @@
           sha256 = "0kxgzjwgd979aypjak07k8ss6hnm3x9f96z1rz2zsz2i3vvh6sqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/time-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/time-ext";
           sha256 = "15b3m1jvr7kg5sc4c8cp0aaiiyivfx8ip1zf7w5m702krv4lfvpk";
           name = "time-ext";
         };
@@ -54389,7 +54955,7 @@
           sha256 = "1hidvbd1xzz9m0fc55wac1mpv4dpcf8qnw1myh3646bfvivj9c2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/timer-revert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/timer-revert";
           sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
           name = "timer-revert";
         };
@@ -54410,7 +54976,7 @@
           sha256 = "1ghvnmswq6rg17pjnys58mak6crfcvv1vb6q7spagq143y2ar24z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/timesheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/timesheet";
           sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
           name = "timesheet";
         };
@@ -54431,7 +54997,7 @@
           sha256 = "0rf177kr0qfhg8g5xrpi405dhp2va1yk170zm3f8hghi2575ciy2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tinkerer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tinkerer";
           sha256 = "0qh6pzjn98jlpxcm9zf25ga0y3d3v53275a9zgswyhz33mafd7pd";
           name = "tinkerer";
         };
@@ -54452,7 +55018,7 @@
           sha256 = "0mmz8b0fzffybc2jws9fif982zfx0l6kn1l4qxc67mf9nafbdca3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tiny";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tiny";
           sha256 = "183qczyb6c8zmdgmsjsj4hddmvnzzq4c7syslm861xcyxia94icy";
           name = "tiny";
         };
@@ -54473,7 +55039,7 @@
           sha256 = "1n8cn6mr26hgmsm2mkbj5gs6dv61d0pap8ija4g0n1vsibfhzd8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tinysegmenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tinysegmenter";
           sha256 = "005yy2f8vghvwdcwakz5sr9n1gzk6cfyglm6d8b74y90d8fng0r6";
           name = "tinysegmenter";
         };
@@ -54494,7 +55060,7 @@
           sha256 = "1wr8m7yivz4z8rsiiqdlvdv3s2i0japvbpsz3x7nxr1y75fax2mz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tj-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tj-mode";
           sha256 = "1i7dvxgj00p4n2fh8irgdfsjl2dpvfjjnkkv0cw71441f79p79mf";
           name = "tj-mode";
         };
@@ -54507,15 +55073,15 @@
     tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tldr";
-        version = "20160116.1131";
+        version = "20160203.1020";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "tldr.el";
-          rev = "138725e0849b698914502adb5240e700b7927cf2";
-          sha256 = "11316dz3f44qvla120hb7hwsj3968670ipf9y1k0wvc53vxc0aqq";
+          rev = "56b0cefcbc0e81f94652f8e17b34b0dfadc8e7c4";
+          sha256 = "1qwd84fmgifs12xw02mlrpkyvmxa58c0xfk0zjsnxb7nldfmbbj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tldr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tldr";
           sha256 = "1f1xsmkbf4j1c876qqr9h8fgx3zxjgdfzvzf6capxlx2svhxzvc9";
           name = "tldr";
         };
@@ -54534,7 +55100,7 @@
           sha256 = "0pq9x73hrp7qwhms7x3dvjfh9imapglba9yd7nkyw68mc0b9wlnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tmmofl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tmmofl";
           sha256 = "1hqv2xqnhwnbj4sqcbdial4987yj1y3ry7niaaz2hh0f5qzrzwa8";
           name = "tmmofl";
         };
@@ -54555,7 +55121,7 @@
           sha256 = "0gzv45yxjy0bkdnx9kki0svmc7gxrdaarblvi1pyvl7id31ssw70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toc-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toc-org";
           sha256 = "06mx2b0zjck82vp3i4bwbqlrzn05i2rkf8080cn34nkizi59wlbs";
           name = "toc-org";
         };
@@ -54573,7 +55139,7 @@
           sha256 = "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/todochiku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/todochiku";
           sha256 = "1iq08s5ji6hd8as80qxqkbavnjbx0kcmmjjvhjchmvv93vsn1f96";
           name = "todochiku";
         };
@@ -54594,7 +55160,7 @@
           sha256 = "0ms4mapjg9mbpmcmpn68r0mhwaibwfr4v25sin74b2281h4q7gal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/todotxt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/todotxt";
           sha256 = "13jcbkasvcczf7qnrh89ncqp6az6hm1s0ycrv7msva145n5bk1kr";
           name = "todotxt";
         };
@@ -54615,7 +55181,7 @@
           sha256 = "1k9ywi7cdgb6i600wr04r2l00423l6vr7k93qa7i7svv856nbbc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/todotxt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/todotxt-mode";
           sha256 = "1bs4air13ifx3xkhcfi80z29alsd63r436gnyvjyxlph2ip37v7k";
           name = "todotxt-mode";
         };
@@ -54636,7 +55202,7 @@
           sha256 = "1falf86mm2206szkkwiwa5yk65y12asv84j1pdbcy6n8y6hha796";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/togetherly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/togetherly";
           sha256 = "01ks160dfmgh05lx0lmyg020hba8nw49mj51dp1afcsmx4dkis2f";
           name = "togetherly";
         };
@@ -54657,7 +55223,7 @@
           sha256 = "109il2s5ynfam510yli4xmi5zgw7xhr5gv096li24idqdp0gpf9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toggle";
           sha256 = "08lk8h2dk5s8k93j5vmxdlgg453pif8wbcx2w3xkjlh43dw1vdfq";
           name = "toggle";
         };
@@ -54678,7 +55244,7 @@
           sha256 = "1w1lmqgzn9bp59h9y9plv80y53k6qhjgfmnnlqyyqfl45z3si7kg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toggle-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toggle-quotes";
           sha256 = "16w453v4g7ww93bydim62p785x7w4vssp9l5liy0h3ppfmgvmxhp";
           name = "toggle-quotes";
         };
@@ -54699,7 +55265,7 @@
           sha256 = "0sgaslqxj806byidh06h5pqmqz8jzjfz9ky8jvkif3cq3a479jby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toggle-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toggle-test";
           sha256 = "0n8m325jcjhz8g75ysb9whsd12gpxw8598y5065j7c7gxjzv45l1";
           name = "toggle-test";
         };
@@ -54720,7 +55286,7 @@
           sha256 = "0f86aij1glmvgpbhmfpi441zy0r37zblb0q3ycgq0dp92x8yny5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toggle-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toggle-window";
           sha256 = "1z080jywqj99xiwbvfclr6gjkc6spr3dqjb9kq1g4971vx4w8n9g";
           name = "toggle-window";
         };
@@ -54741,7 +55307,7 @@
           sha256 = "0a3zvhy3jxs88zk4nhdc7lzybz4qji9baw5gm88sxlgcjgn7ip6n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tomatinho";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tomatinho";
           sha256 = "1ad3kr73v75vjrc09mdvb7a3ws834k5y5xha3v0ldah38cl1pmjz";
           name = "tomatinho";
         };
@@ -54762,7 +55328,7 @@
           sha256 = "1b3bkla6i5nvanifxchph6ab6ldrskdf240hy4d27dkmmnr3pban";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toml";
           sha256 = "0kqv6zkywa7kqh8kg1dzcgkbi91lwx335przdakndm1lfai38i9b";
           name = "toml";
         };
@@ -54783,7 +55349,7 @@
           sha256 = "1w9vkh6c4g80zykcy77k3r0bdc99mq8yh58bqkyd6gsr7pnp16gj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toml-mode";
           sha256 = "0yghf2ixl3dkcaxnkr4qzxfa9k1rrac7w5qpw1jx2bvic0cfs40l";
           name = "toml-mode";
         };
@@ -54804,7 +55370,7 @@
           sha256 = "0pwbd5gzmpr6js20438870w605671930291070nhmhswvxfcdvay";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tommyh-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tommyh-theme";
           sha256 = "0nb9r407h08yxxdihxqx0c645bcz6qywbh2l654s3zfzdsqi1aj4";
           name = "tommyh-theme";
         };
@@ -54822,7 +55388,7 @@
           sha256 = "1sqflxj3hzxdlwn5qmpqm4dwik5vsyp7lypkvshcghdplxymb38a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tool-bar+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tool-bar+";
           sha256 = "07nsas600w5kxx7yzg52ax9avry8kq429mqlrs38jg5ycf3b1l6d";
           name = "tool-bar-plus";
         };
@@ -54840,7 +55406,7 @@
           sha256 = "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/top-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/top-mode";
           sha256 = "0hrjlbiz827v9yf4086wlghw64rhvvlsbzv8lzs6pprdwbpr9pdx";
           name = "top-mode";
         };
@@ -54861,7 +55427,7 @@
           sha256 = "0wv49gn1daylnjmnallpqsqy7630ynrp45agpiwi6kwyyqk1kdvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tornado-template-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tornado-template-mode";
           sha256 = "1sdv9rlhnabydws2sppsjcgqr0lg6bjapv753ksq5aaq21qsps0h";
           name = "tornado-template-mode";
         };
@@ -54882,7 +55448,7 @@
           sha256 = "188cdgic25wrb4jdgdcj070a0pxsh3m0rd9d2r6i1s1n1nalrs6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/totd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/totd";
           sha256 = "1bp07xl9yh9x6bi6cn8wz11x90jhv1rhxaig540iydjn5b0ny9m0";
           name = "totd";
         };
@@ -54903,7 +55469,7 @@
           sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tox";
           sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
           name = "tox";
         };
@@ -54923,7 +55489,7 @@
           sha256 = "0hfzbrw9ik3yxdwmgsm80k0n045z6az6pgvxc1nqcjmiwh80h9mk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toxi-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toxi-theme";
           sha256 = "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd";
           name = "toxi-theme";
         };
@@ -54944,7 +55510,7 @@
           sha256 = "1yh9dxf986dl74sgn71qxwxsg67lr0yg1z7b9h2254lmxq0mgni6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/traad";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/traad";
           sha256 = "08gxh5c01xfbbj9g4992jah494rw3d3bbs8j79r3mpqxllkp2znf";
           name = "traad";
         };
@@ -54967,11 +55533,11 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "c9862e432d2dad7cd568d79dbe49849245333fb1";
-          sha256 = "1l6lm3i02r0b8ng0n3rckgk0q38wjng41dqbx148bjxfq44cpghz";
+          rev = "35618a1e890dfff7bc3c879e4f0e23868d00bf85";
+          sha256 = "1qw8ax3a1v1053qh9i41ci93hc4034ghlcwq8hldr3amsz344fhj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tracking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tracking";
           sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
           name = "tracking";
         };
@@ -54992,7 +55558,7 @@
           sha256 = "1m25l1lyff4h0h4vjrcsziwbf8svqg2llvvgl8i2b4jbh7k7pk5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tracwiki-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tracwiki-mode";
           sha256 = "1k983f0lj42rxr5szpq9l9harykfn8jr13y3y6fav86zzd1fb8j0";
           name = "tracwiki-mode";
         };
@@ -55013,7 +55579,7 @@
           sha256 = "057a3z42j4s0npl35p5rl6n767s2wq0a3c49wii3f1w8p40fh7qc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tramp-hdfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tramp-hdfs";
           sha256 = "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b";
           name = "tramp-hdfs";
         };
@@ -55034,7 +55600,7 @@
           sha256 = "0cgx6h9a49qj7x6bgsnsa20hi1yj5k080x4x0jpn6l9bj5nqiaip";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tramp-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tramp-term";
           sha256 = "1vbdwj8q66j6h5ijqzxhyaqf8wf9rbs03x8ppfijxl5qd2bhc1dy";
           name = "tramp-term";
         };
@@ -55047,15 +55613,15 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20160114.1501";
+        version = "20160202.1601";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "c09102856740d3a67abcbc456a3488d6d8899897";
-          sha256 = "0iirqfjai330jw71pd6pqyhzl78k2y5psxiaw2nbgiq32rhn7whg";
+          rev = "ee474457b249b0ec86cb3c222ae9368887bbf483";
+          sha256 = "1fqcqbs4pdbbn8ldn4rsc9akgd9sr8ckqkin2vr7dzhxm8ds5b9k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/transmission";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/transmission";
           sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
           name = "transmission";
         };
@@ -55073,7 +55639,7 @@
           sha256 = "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/transpose-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/transpose-frame";
           sha256 = "0bqip7vckic3kfq3d31ifs1zics1djxwj2jadafj6f1agv02sdz5";
           name = "transpose-frame";
         };
@@ -55094,7 +55660,7 @@
           sha256 = "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/transpose-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/transpose-mark";
           sha256 = "1q1icp1szm1bxz9ywwyrfbsm1wmx0h4cvzywrh9q0fj1fq387qvv";
           name = "transpose-mark";
         };
@@ -55115,7 +55681,7 @@
           sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/travis";
           sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
           name = "travis";
         };
@@ -55133,7 +55699,7 @@
           sha256 = "0hffnzvzbvmzf23z9z7n7y53l5i7kza9hgfl39qqcnw4njg48llx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tree-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tree-mode";
           sha256 = "0xwyhlc5lagj46nd70l81rvb43hs08pic96grk62zknig8354c24";
           name = "tree-mode";
         };
@@ -55154,7 +55720,7 @@
           sha256 = "08484fhc69rk16g52f9bzc1kzpif61ddfchxjbj1qqqammbx11ym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/trident-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/trident-mode";
           sha256 = "0l81hs7bp46jlk41b9fk1lkvlp17fqc5hcz8k8kkal7rh7ari1fd";
           name = "trident-mode";
         };
@@ -55175,7 +55741,7 @@
           sha256 = "06wm3qwxjhzwjn9nnrqm5wwj1z5gfghg9d2qbg8w3zyqzva5dmvm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tronesque-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tronesque-theme";
           sha256 = "1bk73zawl1922aq739r3rz30flxd6nq87k8ahzbix139g7gxf19j";
           name = "tronesque-theme";
         };
@@ -55196,7 +55762,7 @@
           sha256 = "1mm6rrprsmx4hc622qmllm7c81yhwbqmdr0n6020krq92zmilmlm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/truthy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/truthy";
           sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
           name = "truthy";
         };
@@ -55209,15 +55775,15 @@
     try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "try";
-        version = "20150608.411";
+        version = "20160204.1255";
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "Try";
-          rev = "464cfb73599c88a4b57c83adfa93173c41d28a35";
-          sha256 = "05nzchk7jia9g7b3ww4m3rgg0aylrfkpiz13cylv2bk79rwhzifc";
+          rev = "d50b4b5550cae33910f9ff4ee6586599830d2fe2";
+          sha256 = "1i2bw3d834ibk3aj16rcs8g81r7n5qa37g8k7lgpl255mfpyfzlq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/try";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/try";
           sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n";
           name = "try";
         };
@@ -55238,7 +55804,7 @@
           sha256 = "1bk5v9dffs65qsay0dp336s2ly065nd0cg572zz058ikwxd44zd3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tss";
           sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
           name = "tss";
         };
@@ -55259,7 +55825,7 @@
           sha256 = "1gvqxk67cf779szyg907815i4m9jzrpmn5cnsmnwd62k3r3z4nxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tt-mode";
           sha256 = "02dzyycn5znbibbz50b243bh1kcccp8xwknjqwljk00gpf196vzf";
           name = "tt-mode";
         };
@@ -55280,7 +55846,7 @@
           sha256 = "0a8f9p1im6k7mnp2bq733rfx2x246gfwpvi5ccym1y5lakx37fil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ttrss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ttrss";
           sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
           name = "ttrss";
         };
@@ -55301,7 +55867,7 @@
           sha256 = "0knp7nbzhzahkn97zs2aw0ly7x40cbh8m5xb4rk1ynw0n09zq3d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tuareg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tuareg";
           sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
           name = "tuareg";
         };
@@ -55322,7 +55888,7 @@
           sha256 = "1xdkgvr1pnlg3nrjmma4ra80ysr8xbslvczg7cq1x1mqw6gn9xq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tumble";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tumble";
           sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
           name = "tumble";
         };
@@ -55343,7 +55909,7 @@
           sha256 = "1g7y7czan7mcs5lwc5r6cllgksrj3b9lpn1bj7khwkd1ll391jc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tumblesocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tumblesocks";
           sha256 = "11ky69icsnxwsinv2j3f4c0764wm6i9g9mlvwsdrd6w1lchq1dg9";
           name = "tumblesocks";
         };
@@ -55364,7 +55930,7 @@
           sha256 = "0y1b9zvwbw3vp41siyzj04bis939fgz3j27hc5ljjzy92kd39nzm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tup-mode";
           sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
           name = "tup-mode";
         };
@@ -55385,7 +55951,7 @@
           sha256 = "0khl4q22x6vdn87xdqqg5f535d4dqpnfbhk6qhlh187p1w7qaiq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/turnip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/turnip";
           sha256 = "1vfqv71j47fn53klz3jl8r8hscywd01kkl4w96a308sac3lhbrps";
           name = "turnip";
         };
@@ -55406,7 +55972,7 @@
           sha256 = "0wvmih2y3hy7casxx2y1w8csmzfnfgbb5ivpggr94sc86p6bg8sa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twig-mode";
           sha256 = "1m3xjgmkqg8aj536wcg2f2hf4y6whscbsh7z7448hl4b5qjwii4n";
           name = "twig-mode";
         };
@@ -55427,7 +55993,7 @@
           sha256 = "1bj2mpiklqcangjzbnz5wz7klsfvp0x397lidvf42awn7s2aax0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twilight-anti-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twilight-anti-bright-theme";
           sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
           name = "twilight-anti-bright-theme";
         };
@@ -55448,7 +56014,7 @@
           sha256 = "1awqc4rvg8693myynb1d4y4dfdaxkd5blnixxs3mdv81l07zyn8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twilight-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twilight-bright-theme";
           sha256 = "074cqs55gwy5jlaay3m9bpdpdfb45nmlijvapz96nibl64pyk83d";
           name = "twilight-bright-theme";
         };
@@ -55469,7 +56035,7 @@
           sha256 = "0d7vd1h0rwwgrh7f9kmdgy2ni0p20da9c8ylwlg33nsb26345wfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twilight-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twilight-theme";
           sha256 = "1wkca66q4k94h9njsy15n83wjzn90rcbmv44x0hdwqj92yxjf3y7";
           name = "twilight-theme";
         };
@@ -55490,7 +56056,7 @@
           sha256 = "02c9z229ayqnmlvja5a2fz3vk8914v9v8akin57q8a0gyzn2bli5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twittering-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twittering-mode";
           sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
           name = "twittering-mode";
         };
@@ -55511,7 +56077,7 @@
           sha256 = "1i826xq77nh4s7qlj63r2iznbn319l1l3fzpbjb2nj0m00bwvxl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typed-clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typed-clojure-mode";
           sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
           name = "typed-clojure-mode";
         };
@@ -55524,15 +56090,15 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20150830.2028";
+        version = "20160126.608";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "49241bcc1f60b3787ccd9448a559f792156907a9";
-          sha256 = "16y1r8080scjanbd95hpgk9lp8xqy8cxwkk9xij53jiqfglcwi5c";
+          rev = "d81cc7278276b8d3a163e14fe5396126eff0475d";
+          sha256 = "17q7f433x8i484scwdbfsd0vh8lshzkwjlarhqw6ic53mzakgjiq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typescript-mode";
           sha256 = "01jyqy44ir59n9c2f6gh4xzwfmzdpnys1lw4lnsy6kirqgbsq9ha";
           name = "typescript-mode";
         };
@@ -55550,7 +56116,7 @@
           sha256 = "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typing";
           sha256 = "0b72lbzji105wzvsi58l6pjc08qcwrm5ddf42irdxi956081pzp3";
           name = "typing";
         };
@@ -55571,7 +56137,7 @@
           sha256 = "0i5pipciwsl6cj3inxiz6ybkv5jglacjwhcyqdfzi4mrbic7g848";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typing-game";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typing-game";
           sha256 = "0k85j9bcqp0gbzdh44q5a9wlkv5mc0g0m42ziq1bzmp6993wkmy2";
           name = "typing-game";
         };
@@ -55584,15 +56150,15 @@
     typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typo";
-        version = "20150910.843";
+        version = "20160121.530";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "typoel";
-          rev = "da7e6784a987fbff804f35e402df372ac4b013b2";
-          sha256 = "1q4yg0rmw39qykrg5cga5ab8gbnxzig4wczxqrap0470nhdbms3h";
+          rev = "f7d07cedf90ce65f226a66c428c0788d2bd7b912";
+          sha256 = "0bn1bvs334wb64bli9h613zf1vzjyi0pz8bgyq1wy12qmbwwmfwk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typo";
           sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
           name = "typo";
         };
@@ -55613,7 +56179,7 @@
           sha256 = "1v8d1pc0vjc7wz0prr5w5vp2qb19f3gcyl6jx5130plajbvv23rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ubuntu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ubuntu-theme";
           sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
           name = "ubuntu-theme";
         };
@@ -55631,7 +56197,7 @@
           sha256 = "0qy211rxrmzhwl9qfrcmfnwayysvb5rghjginbvx3wf2s6hrbpya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ucs-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ucs-cmds";
           sha256 = "1n0f0qf8w8ark78fs67aaxnqpk0km97hy59pnxwfyahgjl2qz6d1";
           name = "ucs-cmds";
         };
@@ -55652,7 +56218,7 @@
           sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ucs-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ucs-utils";
           sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
           name = "ucs-utils";
         };
@@ -55673,7 +56239,7 @@
           sha256 = "19qvn1vzal5k86pqn6a4ins869qmp2i586qqbl97z84szn8mn7j3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uimage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uimage";
           sha256 = "0i6qpk6v4pmpk3zswygdy0dd7rxy8kl7qn8a1xanpi4aqg7wlbmd";
           name = "uimage";
         };
@@ -55694,7 +56260,7 @@
           sha256 = "0cryprvns1qdnp2qif2g187lj15810w472m7nwrfiwgvqv4v3p1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ujelly-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ujelly-theme";
           sha256 = "0b7zgmpsdn5p3jx4kif7phxz8pb85snmmfr3yz98xf6p7h6w60gw";
           name = "ujelly-theme";
         };
@@ -55715,7 +56281,7 @@
           sha256 = "033v4ck979lhkpwblci5clacfc1xnkq03p5d1m566wff8dp5flwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ukrainian-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ukrainian-holidays";
           sha256 = "0kbfj2l1rcv74c88nabkwkcl7k9pkim835l24q61zv3i6wf9sykf";
           name = "ukrainian-holidays";
         };
@@ -55733,7 +56299,7 @@
           sha256 = "0i5km1naxprd4lj20097ph50mjs2364xwxcdw0j3g5569mk5nc06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unbound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unbound";
           sha256 = "1ys6pgb3lhx4ihhv8i28vrchp1ad37md7lnana40macf5n72d77x";
           name = "unbound";
         };
@@ -55754,7 +56320,7 @@
           sha256 = "0366h4jfi0c7yda9wcrz4zxgf2qqdd08b8z2dr8c1rkvkdd67iam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uncrustify-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uncrustify-mode";
           sha256 = "0amdxdfc8i99zjrw4iqmxzb47h0airs60fwmc32bc8b0ds66c3kd";
           name = "uncrustify-mode";
         };
@@ -55775,7 +56341,7 @@
           sha256 = "1qm6fzgmrdzhkajd60l4l890dlbxll96x41kx36wm97h4gz7aiyw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/undercover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/undercover";
           sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
           name = "undercover";
         };
@@ -55796,7 +56362,7 @@
           sha256 = "1ypxpv5vw2ls757iwrq3zld6k0s29q3kg3spcsl5ks4aqpnkxpva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/underwater-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/underwater-theme";
           sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
           name = "underwater-theme";
         };
@@ -55816,7 +56382,7 @@
           sha256 = "1ef5db7cf476dd37348fd1f11dd199613a89a2351dc583a42afd9d35a53d8ae2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/undo-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/undo-tree";
           sha256 = "0vrjxprpk854989wcp4wjb07jhhxqi25p6c758gz264z3xa8g9cr";
           name = "undo-tree";
         };
@@ -55837,7 +56403,7 @@
           sha256 = "1c0daw246ky7b1x5b8h55x79pl1pjqk1k348l487bdd8zdj4w9wx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/undohist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/undohist";
           sha256 = "0zzfzh8sf2dkz8h3kidv7zmwz2c2qq9n9qz2mab2lk0y44njzwhn";
           name = "undohist";
         };
@@ -55858,7 +56424,7 @@
           sha256 = "0fd9k5m1yw2274m2w9rkrg7vqagzf0rjbybglqi7d200b3hmjin3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unfill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unfill";
           sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
           name = "unfill";
         };
@@ -55879,7 +56445,7 @@
           sha256 = "015gjf8chd6h9azhyarmskk41cm0cmg981jif7q81hakl9av6rhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-emoticons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-emoticons";
           sha256 = "15s6qjhrrqrhm87vmvd6akdclzba19613im85kfkhc24p6nxyhbn";
           name = "unicode-emoticons";
         };
@@ -55900,7 +56466,7 @@
           sha256 = "0936dqxyp72if9wvn2dcci670yp1gqrmpnll9xq00skp85yq9zs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-enbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-enbox";
           sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
           name = "unicode-enbox";
         };
@@ -55927,7 +56493,7 @@
           sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-fonts";
           sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
           name = "unicode-fonts";
         };
@@ -55953,7 +56519,7 @@
           sha256 = "0kzcg1wxi1z424jdn7pibk9zyfyi85kligav08sl1c2hdldzya4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-input";
           sha256 = "17sf3xnl8yyx4ln4mrjlrvfinb8dvabh81l3qyr9pkn5skpgqgj8";
           name = "unicode-input";
         };
@@ -55974,7 +56540,7 @@
           sha256 = "16jgm70ldsngxldiagjkw3ragypalpiidnf82g5hss9ciybkd3j4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-progress-reporter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-progress-reporter";
           sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
           name = "unicode-progress-reporter";
         };
@@ -55995,7 +56561,7 @@
           sha256 = "0ny260mr1h810fvqsfj2hpd3zql4g309m60qj4vk6kmd83p5b60f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-troll-stopper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-troll-stopper";
           sha256 = "0a10lq0xsfyp052iw4xjbhsdkbyg25x2gk68gys4k7p6l92la0k5";
           name = "unicode-troll-stopper";
         };
@@ -56016,7 +56582,7 @@
           sha256 = "1ayb15nd5vqr0xaghrnp55kqw7bblrjipmfrag6bqpn7jk9bvbdz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-whitespace";
           sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
           name = "unicode-whitespace";
         };
@@ -56037,7 +56603,7 @@
           sha256 = "1jvr1k8zd40m1rvwmxzidz1dvr4j8cbh78nqgc3vfb410fj619gw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unidecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unidecode";
           sha256 = "0h058mvb6x53zywpwg85dzhaynlgq577yyqhrn5qqyqjg1n8lhc1";
           name = "unidecode";
         };
@@ -56058,7 +56624,7 @@
           sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unify-opening";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unify-opening";
           sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
           name = "unify-opening";
         };
@@ -56079,7 +56645,7 @@
           sha256 = "1wl9rzys1zr2c41h5i57y6hxsavix1b26f453l2izmb6r0b1dvh0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unipoint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unipoint";
           sha256 = "1nym2wlr50wk62cbagq1qyjczzf56nb6i9dfzcwikdck8p4p2dr7";
           name = "unipoint";
         };
@@ -56100,7 +56666,7 @@
           sha256 = "0l8h084xkbjvx2vbg67hxmg4hb9175k858z3k3c93d2b6x2kh7ni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unison-mode";
           sha256 = "03kyr1h5pm51vn4bykj13rm4ybln266rpnxh65y2ygw8f8md88gl";
           name = "unison-mode";
         };
@@ -56121,7 +56687,7 @@
           sha256 = "0xpaifmrvq5bbzpjhbzbxaac8kymmvqgg7lb2q1s7b5qf47fhqac";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unkillable-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unkillable-scratch";
           sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
           name = "unkillable-scratch";
         };
@@ -56142,7 +56708,7 @@
           sha256 = "118c23dsfgkhwhv65dx3wbg2dn7qyrd80d78cykl732c68d6wvi0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/url-shortener";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/url-shortener";
           sha256 = "12r01dyk55bs01jk0ab9f24lfvm63h8kvix223pii5y9890dr6ys";
           name = "url-shortener";
         };
@@ -56163,7 +56729,7 @@
           sha256 = "0xwr0v4f64d7hi5ldig4r5yjn8h3f8by49g5820187lsp7ng2nw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/urlenc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/urlenc";
           sha256 = "0n6shh95m11162zsnf62zy1ljswdjznjilxx2dbqyqdrn7qr2dgh";
           name = "urlenc";
         };
@@ -56181,7 +56747,7 @@
           sha256 = "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/usage-memo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/usage-memo";
           sha256 = "05n50adjnavl7ag24wfjwlnbv5x55qlhmplgsm8j57gjig01nd95";
           name = "usage-memo";
         };
@@ -56194,15 +56760,15 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20160112.1501";
+        version = "20160204.1300";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "2a50241538b8ead3d620be33bd8e0087f98f42c5";
-          sha256 = "0wiv5xh2hik76x0i4a6amq5648akm5kvr4llnkh190riibnwkwx6";
+          rev = "a29e0328c0076cc927e5fd3d8db1878c0f978ace";
+          sha256 = "0s4qmqgym12gk8kiz90ck5yi7icz8dydyks0psfam1nza89cbfys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/use-package";
           sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
           name = "use-package";
         };
@@ -56223,7 +56789,7 @@
           sha256 = "05lhxbrgwbyz0nkb19yln9a46jh91ic685943hd58cn91lxsw3al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/use-package-chords";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/use-package-chords";
           sha256 = "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass";
           name = "use-package-chords";
         };
@@ -56240,11 +56806,11 @@
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "9e41bf85da052bd1dc52701b3e83d5699d96701a";
-          sha256 = "0nvd9hc9dgiqd8xg1cbs7wmh0zpfpwx9i6q06p0xy8b2qd8xp58c";
+          rev = "fd7c663264c29438249d7f6cdad9494f57086e69";
+          sha256 = "1kf8aa4m8622nm52n6nrsa7zhlnfwi9ldvpj9fjvypbm07ai6i03";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/utop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/utop";
           sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
           name = "utop";
         };
@@ -56265,7 +56831,7 @@
           sha256 = "0r74gw8gcbrr62rvj4anz0c3n6kwi1xpb42d3pkzlh4igblhi5zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uuid";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uuid";
           sha256 = "13xjnawir9i83j2abxxkl12gz3wapgbk56cps3qyfgql02bfk2rw";
           name = "uuid";
         };
@@ -56286,7 +56852,7 @@
           sha256 = "19bf6vpc2b9hfjkjanji96fflvk1lbillasnpwcb6zzyq0cs47bw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uuidgen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uuidgen";
           sha256 = "1qaz7hg0wsdkl0jb7v7vrkjs554i2zgpxl8xq2f8q7m4bs2m5k48";
           name = "uuidgen";
         };
@@ -56307,7 +56873,7 @@
           sha256 = "0fx18m688wfflbzwv8h3051439fwql69v1ip5q6xn958rdq4pi3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uzumaki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uzumaki";
           sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
           name = "uzumaki";
         };
@@ -56328,7 +56894,7 @@
           sha256 = "04r73s3fhvdcryv0l57awkpg1hi3kg6zcqxbxb03jc89h0f9vdlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vagrant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vagrant";
           sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
           name = "vagrant";
         };
@@ -56341,15 +56907,15 @@
     vagrant-tramp = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vagrant-tramp";
-        version = "20151018.1723";
+        version = "20160120.1832";
         src = fetchFromGitHub {
           owner = "dougm";
           repo = "vagrant-tramp";
-          rev = "20413671c9db8fd5a4b02ea0ff495820f2480e5e";
-          sha256 = "0v1a1lsrs9zlg9y6mhdlrg3nrdaba54ndkfmvsn7nw46asinganv";
+          rev = "660b84f3dd3ac44b5e4d6e72446d557afac11dd9";
+          sha256 = "1xslw0whxmqsd79jwxgz1k7h55shffq3985im96pdzf4iivkr3ln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vagrant-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vagrant-tramp";
           sha256 = "0ij7k27zj22sl7inx141l4dg0ymywnvyabjvaqzc0xjdj0cky5c5";
           name = "vagrant-tramp";
         };
@@ -56370,7 +56936,7 @@
           sha256 = "10vs4d8csww781j1ps3f6dczy5zzza36z7a8zqk40fg4x57ikw44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vala-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vala-mode";
           sha256 = "164dhlsiflhpdymk3q5x0bv8gpbwfp34lnkhm2x90kdakfzqf91p";
           name = "vala-mode";
         };
@@ -56391,7 +56957,7 @@
           sha256 = "0iscaz8lm4fk6w13f68ysqk8ppng2wj9fkkkq1rfqz77ws66f8nq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vala-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vala-snippets";
           sha256 = "14hmmic0px3z38dm2dg0kis6cz1p3p1hj7xaqnqjmv02dkx2mmcy";
           name = "vala-snippets";
         };
@@ -56412,7 +56978,7 @@
           sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vbasense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vbasense";
           sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
           name = "vbasense";
         };
@@ -56433,7 +56999,7 @@
           sha256 = "09h7yg44hbxv3pyazfypkvk8j3drlwz0zn8x1wj0kbsviksl1wxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vc-auto-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vc-auto-commit";
           sha256 = "1xpp7vbld3jgcr249m5h7il919kfg7d5ap3zs64i27axzdhv26zk";
           name = "vc-auto-commit";
         };
@@ -56454,7 +57020,7 @@
           sha256 = "0icc4kqfpimxlja4jgcy9gjj4myc8y84vbvacyf79lxixygpaxi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vc-check-status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vc-check-status";
           sha256 = "1kwnxa0ndfj8b211xy5d47sxkwmsay0kk8q7azfm5ag5dkg56zgi";
           name = "vc-check-status";
         };
@@ -56475,7 +57041,7 @@
           sha256 = "0whzfzg0m03wbmqsxml8hislnbfvawcniq83hj66lbrnbivxsqj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vc-osc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vc-osc";
           sha256 = "0rp33945xk5d986brganqnn55psmlkj6glbimxakhgv9a1r85sxz";
           name = "vc-osc";
         };
@@ -56496,7 +57062,7 @@
           sha256 = "1jfis26lmghl30ydzq1xdkrrj3d85q7g44ns6kmfg119ccapllbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vcl-mode";
           sha256 = "1h0a1briinp9ka7ga3ipdhyf7yfinwvf7babv36myi720900wcq5";
           name = "vcl-mode";
         };
@@ -56517,7 +57083,7 @@
           sha256 = "0fzz26c1pdaz3i58ndhzd2520mhny487daqs21yajxi9x2m00zrl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vcomp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vcomp";
           sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
           name = "vcomp";
         };
@@ -56534,11 +57100,11 @@
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "vdirel";
-          rev = "aab19692e2c2084a0d5b554a96a64a2e3e2a3d09";
-          sha256 = "034475m2d2vlrlc2l88gdx0ga3krsdh08wkjxwnbb2dfyz3p8r9v";
+          rev = "6154343b8265d7e8cc6629f28aa4c3d28d3708cf";
+          sha256 = "1lh8nv0ayl9ipl2aqc8npzz84g5q7w6v60l14v61mmk34fc23lnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vdirel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vdirel";
           sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
           name = "vdirel";
         };
@@ -56559,7 +57125,7 @@
           sha256 = "1wa03gb98x650q798aqshm43kh6gfxaz1rlyrmvka5dxgf48whmf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vector-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vector-utils";
           sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
           name = "vector-utils";
         };
@@ -56569,22 +57135,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    verify-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, url ? null }:
+    verify-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "verify-url";
-        version = "20151227.652";
+        version = "20160203.159";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "verify-url";
-          rev = "67a8c27ab331859ca5c1b4d757440a8d7a070696";
-          sha256 = "199pab06cwym59110z3kcgikmp8m3y81bd3slr0n3ky40mh5rbh3";
+          rev = "7961223979ad01723ada3c48b034e91592b3d1cc";
+          sha256 = "0vlkg77a0h5z36f370phl2xdzykz9h9in3vng68zn1pfhx2allyx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/verify-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/verify-url";
           sha256 = "1gd83rb1q0kywchd0345p5axqj1sv4f5kadympx5pbp4n5p1dqb2";
           name = "verify-url";
         };
-        packageRequires = [ cl-lib url ];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/verify-url";
           license = lib.licenses.free;
@@ -56601,7 +57167,7 @@
           sha256 = "1mp71axs3vdrdwlhgywfldvnr6a1g2qbxiywmpfmcv59n5n58p1j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vertica";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vertica";
           sha256 = "1ljjk6zrbr2k0s0iaqd9iq3j45cavijcx0rqdidliswnfllav4ng";
           name = "vertica";
         };
@@ -56622,7 +57188,7 @@
           sha256 = "0v884gbqq5vrx5gwg9dqn97kaqgnzhrqv8kam8dy9g7hx4fm6b2l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vertigo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vertigo";
           sha256 = "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83";
           name = "vertigo";
         };
@@ -56639,11 +57205,11 @@
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "5df894e6032abd24743b7c3cd220f0869bb46c62";
-          sha256 = "0y1m903x864qv745b8slwkbqd63gb1nz36nglh8g16gcfccjgn6j";
+          rev = "6478a055e0e6bac56c65a5ecd45b82e0a074e9bb";
+          sha256 = "0ba22j368w6jac94hwmy27bhm3h1r7kpiwdzy8ggfxfzwn0sd4dy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vhdl-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vhdl-tools";
           sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
           name = "vhdl-tools";
         };
@@ -56664,7 +57230,7 @@
           sha256 = "0wdm8k49zl6i6wnh7vjkswdh5m9lix56jv37xvc90inipwgs402z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vi-tilde-fringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vi-tilde-fringe";
           sha256 = "0jhwv46gjwjbs1ai65nm6k15y0q4yl9m5mawgp3n4f45dh02cawp";
           name = "vi-tilde-fringe";
         };
@@ -56682,7 +57248,7 @@
           sha256 = "0lns0ic3zjz1km02674d9hxgnp6wlhk168wyr6h4vhpr8a71x9mb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/viewer";
           sha256 = "0aqwkymq5f0qfgs1hmcg1jb1rd0vcnlqwiyjrjjkfff2xlbpagqf";
           name = "viewer";
         };
@@ -56703,7 +57269,7 @@
           sha256 = "09x857vbx35rpyc5x1322ajby613gva090x4vawaczk22idq65h4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vim-empty-lines-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vim-empty-lines-mode";
           sha256 = "17bl1g4ais73ws596mha0l8dgckfqhx9k2v9m9k0gw7kg7dcjhnb";
           name = "vim-empty-lines-mode";
         };
@@ -56724,7 +57290,7 @@
           sha256 = "13g2hin100c8h5bd7hzhyqzj02ab9c35giyv963l7y044v7sbwig";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vim-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vim-region";
           sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
           name = "vim-region";
         };
@@ -56745,7 +57311,7 @@
           sha256 = "1i407ilhmk2qrk66ygbvizq964bdk502x7lvrzs4wxwfr5y8ciyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimgolf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimgolf";
           sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
           name = "vimgolf";
         };
@@ -56766,7 +57332,7 @@
           sha256 = "0rl9pcw1dcqpivmcrwpbsd11ym643zccp4sh5k11rmal77gb36sl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimish-fold";
           sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
           name = "vimish-fold";
         };
@@ -56787,7 +57353,7 @@
           sha256 = "000fs2h5zcv8aq8an16r6zwwf9x1qnfs7xxn39iahiwfzvnljqp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimrc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimrc-mode";
           sha256 = "06hisgsn0czvzbq8m4dz86h4q75j54a0gxkg5shnr8s654d450bp";
           name = "vimrc-mode";
         };
@@ -56808,7 +57374,7 @@
           sha256 = "0rd7hyv66278dj32yva5q9z1749y84c6fwl2iqrns512j1l4kl8q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/virtualenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/virtualenv";
           sha256 = "1djqzzlbwsp9xyjqjbjwdck73wzikbpq19irzamybk90nc98wirl";
           name = "virtualenv";
         };
@@ -56829,7 +57395,7 @@
           sha256 = "1a0x4dsyavqcl7xibn3g90fxvh1fnb6k0mpjm5mjvzc168p939kc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/virtualenvwrapper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/virtualenvwrapper";
           sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i";
           name = "virtualenvwrapper";
         };
@@ -56850,7 +57416,7 @@
           sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visible-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visible-mark";
           sha256 = "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80";
           name = "visible-mark";
         };
@@ -56871,7 +57437,7 @@
           sha256 = "1cv8mf3l92a9p8qmkfiphk3r81f2ihg2gyw2r4jbbd5ppwbxkl0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-ascii-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-ascii-mode";
           sha256 = "1h0143h39dq61afswlzlgpknk0gv574x91ar6klqmnaf1snab59g";
           name = "visual-ascii-mode";
         };
@@ -56892,7 +57458,7 @@
           sha256 = "126qm63ik1n1agvcp4mgk1gr7dnnyjif8zbw0l336q74d5cy6h6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-fill-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-fill-column";
           sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
           name = "visual-fill-column";
         };
@@ -56913,7 +57479,7 @@
           sha256 = "04wds01yzhia508852gm18rp7dkg0838j0w8cr1l1qmc8p0jjsz9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-regexp";
           sha256 = "16bdqq2j7pnjq3j6qa4rhxzidqdhyg80c7nazd93smis8rcv5d0z";
           name = "visual-regexp";
         };
@@ -56934,7 +57500,7 @@
           sha256 = "03jggsnz5j0c36inxqa16vrdwlzn3wrniyl2i9b8c5bx7az7210m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-regexp-steroids";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-regexp-steroids";
           sha256 = "1xkrzyyll8wmb67m75lfm9k8qcm068km8r1k8hcsadpkd01bx1lr";
           name = "visual-regexp-steroids";
         };
@@ -56955,7 +57521,7 @@
           sha256 = "0hb845pnh2yska6alca8hbbxh65x7g81pr7852h8fddm0qd1agkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vkill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vkill";
           sha256 = "09siqsip6d2h3jrxbdbhylkqm42dx3d2dqlkkdw3a81c7ga9lpwm";
           name = "vkill";
         };
@@ -56976,7 +57542,7 @@
           sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vlf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vlf";
           sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
           name = "vlf";
         };
@@ -56994,7 +57560,7 @@
           sha256 = "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vline";
           sha256 = "0p59xhyrv7fmcn3qi51sp8v9v2y71ray2s756zbhzgzg63h3nbjp";
           name = "vline";
         };
@@ -57015,7 +57581,7 @@
           sha256 = "183pvfp5nnqpgdmfxm84qrnid0lijgk79l5lhwzmnznzkrb7bgxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/voca-builder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/voca-builder";
           sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
           name = "voca-builder";
         };
@@ -57036,7 +57602,7 @@
           sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/volatile-highlights";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/volatile-highlights";
           sha256 = "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d";
           name = "volatile-highlights";
         };
@@ -57057,7 +57623,7 @@
           sha256 = "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/volume";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/volume";
           sha256 = "1r01v453bpyh561j8ja36609hy60gc30arvmz4z3c1cybhv8sk1i";
           name = "volume";
         };
@@ -57075,7 +57641,7 @@
           sha256 = "0vb5ss30mz0kqq8cscjckw647vqn6xprp2sfjcbpg2fx59z4agma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/w32-browser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/w32-browser";
           sha256 = "14vc2cipwlwwc0b5ld4x0zvydkg8nbjmp0z2x6ca0nmxw8sfsnc6";
           name = "w32-browser";
         };
@@ -57094,7 +57660,7 @@
           sha256 = "0nyara81bnd0rvgyljqrrbvjvndkngdc7qzf6scl5iz3vlglfgy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/w32browser-dlgopen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/w32browser-dlgopen";
           sha256 = "0dnvsnahnbnvjlhfmb0q6agzikv9d42fbnfrwsz6hni92937gz39";
           name = "w32browser-dlgopen";
         };
@@ -57115,7 +57681,7 @@
           sha256 = "1lgvdaghzj1fzh8p6ans0f62zg1bfp086icbsqmyvbgpgcxia9cs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/w3m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/w3m";
           sha256 = "0vh882b44vxnij3l01sig87c1jmbymgirf6s98mvag1p9rm8agxw";
           name = "w3m";
         };
@@ -57136,7 +57702,7 @@
           sha256 = "0nvlni3iy2sq76z8d4kj5492m0w7qv96shjqkynvlj0avf528hv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wacspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wacspace";
           sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
           name = "wacspace";
         };
@@ -57157,7 +57723,7 @@
           sha256 = "0w59ix8cbbcyhh882c8vkrbh84i8d03h9w7dchr3qy233b8wcxlc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/waher-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/waher-theme";
           sha256 = "091kipkb6z6x9ic4chprim9rvnmx4yj4419ijmvpn70w69aspnb5";
           name = "waher-theme";
         };
@@ -57178,7 +57744,7 @@
           sha256 = "1bcdvk5bg5yi0qq0wd3w9wl38s0brrafz52bzsracj3wffswjg1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wakatime-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wakatime-mode";
           sha256 = "1rhy2bwkqlha4bj3zmb0iassiglch7yb2kbas0bbpl3d0hdki2i8";
           name = "wakatime-mode";
         };
@@ -57199,7 +57765,7 @@
           sha256 = "09gqsssc2sk0vwfg0h4zxq9a779sdjdgvxsw7p6n2k0g4wk0phri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wand";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wand";
           sha256 = "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l";
           name = "wand";
         };
@@ -57209,22 +57775,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, tabulated-list ? null }:
+    wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "wandbox";
-        version = "20150905.1024";
+        version = "20160124.1040";
         src = fetchFromGitHub {
           owner = "kosh04";
           repo = "emacs-wandbox";
-          rev = "cea03dec67e90a4c87eb9b6d69d1b3c68af541d0";
-          sha256 = "00qzgabanmy4nkpnbc1m45j86k29plyyn408n1l0j8505fy9l7ca";
+          rev = "4522d488ecee418573ab2cdc55923f802b1dba31";
+          sha256 = "114f7sqwq6whbdsidg6wlzjayy6dla06h7fmg1gjkhkbdqq4h94d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wandbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wandbox";
           sha256 = "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz";
           name = "wandbox";
         };
-        packageRequires = [ emacs json tabulated-list ];
+        packageRequires = [ emacs json ];
         meta = {
           homepage = "http://melpa.org/#/wandbox";
           license = lib.licenses.free;
@@ -57241,7 +57807,7 @@
           sha256 = "0q1a2ihrz7g08sqv55dx9ki3qb75rrg2dnzdy7kyv60cdz4gcz33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wanderlust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wanderlust";
           sha256 = "0lq7fvqc0isv49lcm7ql6prc3hpcj5cx4kf8f4gcnfv5k8159cq9";
           name = "wanderlust";
         };
@@ -57262,7 +57828,7 @@
           sha256 = "1x472s5qr6wvla7nj5i9mas8z9qhkj4zj5qghfwn5chb9igvfkif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/warm-night-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/warm-night-theme";
           sha256 = "1nrjkrr64rry6fjya22b0lcs0f8a2ijvr87192z311y9mw5rvb29";
           name = "warm-night-theme";
         };
@@ -57283,7 +57849,7 @@
           sha256 = "0i84ndnxma8s07kf5ixqyhv5f89mzc4iymgazj5inmxhvbc7s7r2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/watch-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/watch-buffer";
           sha256 = "18sxgihmqmkrbgs66qgnrsjqbp90l93531hns31fbnif10bkx2j5";
           name = "watch-buffer";
         };
@@ -57304,7 +57870,7 @@
           sha256 = "0zw8z2r82986likz0b0zy37bywicrvz9dizzw9p52gs1lx0is1fy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wavefront-obj-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wavefront-obj-mode";
           sha256 = "0qqismh6g2fvi45q2q52lq0n9nrh95wgamlsy5j4rx4syfgzxbrk";
           name = "wavefront-obj-mode";
         };
@@ -57325,7 +57891,7 @@
           sha256 = "0p7j4hvcxfyjf0na9s3xv29dvmwq82s56lincfasd0ydcpz4fbwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wc-goal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wc-goal-mode";
           sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
           name = "wc-goal-mode";
         };
@@ -57343,7 +57909,7 @@
           sha256 = "15wz0c0rsn02zl6yr8mpwzy2hvp2146krhdbjpq63l75w4i98w4d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wc-mode";
           sha256 = "0n9hc22rp18dxx33l2l1xla78m5zjybgh3mmsp91fbdiq92b446s";
           name = "wc-mode";
         };
@@ -57356,15 +57922,15 @@
     wcheck-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wcheck-mode";
-        version = "20160105.100";
+        version = "20160130.1221";
         src = fetchFromGitHub {
           owner = "tlikonen";
           repo = "wcheck-mode";
-          rev = "53555c6faf22c193eb61c3b56be613a906c8b56a";
-          sha256 = "0hsv391lvdb6hqjbvrsn5id6vgdhjsndsr3xnivykbi999ng9mrs";
+          rev = "adb9dd9f39cb0bd0000d140d6e778c4864dfde08";
+          sha256 = "113prlamr2j6y6n0w43asffawwa4qiq63mgwm85v04h6pr8bd90l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wcheck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wcheck-mode";
           sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
           name = "wcheck-mode";
         };
@@ -57385,7 +57951,7 @@
           sha256 = "05gfc67724b0mwg8kvk3dsazx3dld50b9xjq8h1nc6jvdz3zxb9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weather-metno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weather-metno";
           sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
           name = "weather-metno";
         };
@@ -57406,7 +57972,7 @@
           sha256 = "03xcadplw1hg5hxw6bfrhw5xkkxk3i4105f114c6m3d2525jq4y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web";
           sha256 = "0ynnmqw0vsf7wyhp9m5a05dfb19vkj8dnj5glhjdzjvg30dhjp3a";
           name = "web";
         };
@@ -57427,7 +57993,7 @@
           sha256 = "0ky2rg16xrbnsvqc6gcfhgi69fdzbx6jlsq73n8hr0n4562czhzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-beautify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-beautify";
           sha256 = "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f";
           name = "web-beautify";
         };
@@ -57448,7 +58014,7 @@
           sha256 = "12j8ql9v9mrg8hlsminpm3ydcacc2fbdjsfw7l604sc3qvgza1lm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-completion-data";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-completion-data";
           sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
           name = "web-completion-data";
         };
@@ -57461,15 +58027,15 @@
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20160114.1506";
+        version = "20160202.117";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "867ea7c5d7f3d9bb41127dac364c0fb009adc7bf";
-          sha256 = "0zpvhiazbsc87ai6gjlvbj6bd9hmvv4mf1q691jr4258mma1sssm";
+          rev = "594f00bf31815d39caefef75ae2ee11356afed58";
+          sha256 = "0psk1k1jryljkw4vj04d7ay424fwq212729fmqsziqzmjfjvsl0l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
           name = "web-mode";
         };
@@ -57490,7 +58056,7 @@
           sha256 = "0mbhyk7sgisx0l0xiz2xgy4jfbgwazlnxjvajsh4nysyig5rys05";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-server";
           sha256 = "1f0iyvwq1kq3zfxx2v596cmah7jfk2a04g2rjllbgxxnzwms29z3";
           name = "web-server";
         };
@@ -57510,7 +58076,7 @@
           sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weblogger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weblogger";
           sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk";
           name = "weblogger";
         };
@@ -57523,15 +58089,15 @@
     websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "websocket";
-        version = "20150719.1248";
+        version = "20160124.2220";
         src = fetchFromGitHub {
           owner = "ahyatt";
           repo = "emacs-websocket";
-          rev = "49a93b2218c6044377d81099ac916877f42b722e";
-          sha256 = "1ibzl8rp24py5mq42cxvy68pc7n18pfqpdfngxc8hxqdh5q3a5f1";
+          rev = "fca05614306c455af1cf783bc97021527050dcc6";
+          sha256 = "1vj10jcraxpwk896zyscpmgd55r1czzlqj1gz29skbq2zan1l042";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/websocket";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/websocket";
           sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg";
           name = "websocket";
         };
@@ -57552,7 +58118,7 @@
           sha256 = "19hgb5knqqc4rb8yl8s604xql8ar6m9r4d379cfakn15jvwqnl98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wedge-ws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wedge-ws";
           sha256 = "07i2dr807np4fwq3ryxlw11vbc1sik1iv7x5740q258jyc9zfgll";
           name = "wedge-ws";
         };
@@ -57573,7 +58139,7 @@
           sha256 = "03xsh3fc7if6rkdp2s8lmrzpqm3pjakgqi3faap44y9i84q6mc6k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weechat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weechat";
           sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
           name = "weechat";
         };
@@ -57594,7 +58160,7 @@
           sha256 = "0hc5iyjpcik996ns84akrl28scndmn0gd1zfdf1nnqq6n2m5zvgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weibo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weibo";
           sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
           name = "weibo";
         };
@@ -57615,7 +58181,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep";
           sha256 = "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4";
           name = "wgrep";
         };
@@ -57636,7 +58202,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep-ack";
           sha256 = "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh";
           name = "wgrep-ack";
         };
@@ -57657,7 +58223,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep-ag";
           sha256 = "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a";
           name = "wgrep-ag";
         };
@@ -57678,7 +58244,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep-helm";
           sha256 = "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b";
           name = "wgrep-helm";
         };
@@ -57699,7 +58265,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep-pt";
           sha256 = "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg";
           name = "wgrep-pt";
         };
@@ -57720,7 +58286,7 @@
           sha256 = "04w62davpqqqvympkr52bg54c2i45p09q9bs70p9ff5jvc6i3g76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/what-the-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/what-the-commit";
           sha256 = "0nnyb6hq6r21wf1x3q41ab48b3dmcz5lyli771a59dk1gs8qpgak";
           name = "what-the-commit";
         };
@@ -57733,15 +58299,15 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20160117.1957";
+        version = "20160203.1414";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "f1d3d1b5e5351e5f878643496d8523fd54a96ca3";
-          sha256 = "1054q7k2v0zkxndn8f371x41dwg97fzmkvb5yc119gcc1ccdk1j1";
+          rev = "e7a9ebf15f30b2e8763152af4e939bfc87b9fc42";
+          sha256 = "1gf2gg1n6f3fqflpav8szfkrb3g1ivx4vlxlylkgr46km826aqin";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/which-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/which-key";
           sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
           name = "which-key";
         };
@@ -57762,7 +58328,7 @@
           sha256 = "1y75cylvqgn54h8yqahz4wi1qj5yhbs66i7x23jmbmah3q0rycab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whitaker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whitaker";
           sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
           name = "whitaker";
         };
@@ -57783,7 +58349,7 @@
           sha256 = "0sh92g5vd518f80klvljqkjpw4ji909439dpc3sfaccf5jiwn9xn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/white-sand-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/white-sand-theme";
           sha256 = "19qsiic6yf7g60ygjmw7kg1i28nqpm3zja8cmdh33ny2bbkwxsz5";
           name = "white-sand-theme";
         };
@@ -57804,7 +58370,7 @@
           sha256 = "15yhbyyr0ksd9ziinlylyddny2szlj35x2548awj9ijnqqgjd23r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whitespace-cleanup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whitespace-cleanup-mode";
           sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
           name = "whitespace-cleanup-mode";
         };
@@ -57825,7 +58391,7 @@
           sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whole-line-or-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whole-line-or-region";
           sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
           name = "whole-line-or-region";
         };
@@ -57843,7 +58409,7 @@
           sha256 = "18bnwwjk8jj4ns08sxhnznj0d8n1bxm2kj43r06nwyibh6ajpl7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wid-edit+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wid-edit+";
           sha256 = "1wwrsk14hc0wrvy7hm94aw6zg50n2smlqwr6frwpi7yp8y394wiv";
           name = "wid-edit-plus";
         };
@@ -57863,7 +58429,7 @@
           sha256 = "0pq9x73hrp7qwhms7x3dvjfh9imapglba9yd7nkyw68mc0b9wlnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wide-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wide-column";
           sha256 = "1r9mh7756jgf1hdnprci988z07xxh2jvh8d0c1h5rmxmldlbx8az";
           name = "wide-column";
         };
@@ -57884,7 +58450,7 @@
           sha256 = "0036alzp66k7w3z45lj8qzh3plxv9vwcw17wibkz90mlb27vy6yz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/widget-mvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/widget-mvc";
           sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
           name = "widget-mvc";
         };
@@ -57905,7 +58471,7 @@
           sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wiki-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wiki-nav";
           sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
           name = "wiki-nav";
         };
@@ -57926,7 +58492,7 @@
           sha256 = "02bczc1mb1cs1aryz5pw6cmpydjmxja2zj91893cz8rnfn1r031i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wiki-summary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wiki-summary";
           sha256 = "1hiyi3w6rvins8hfxd96bgpihxarmv192q96sadqcwshcqi14zmw";
           name = "wiki-summary";
         };
@@ -57947,7 +58513,7 @@
           sha256 = "1n45m8xn65a2lg8ff7m6hbqnp2j49n9sfyr924laljvhjbi37knd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wilt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wilt";
           sha256 = "0nw6zr06zq60j72qfjmbqrxyz022fnisb0bsh6xmlnd1k1kqlrz6";
           name = "wilt";
         };
@@ -57965,7 +58531,7 @@
           sha256 = "142ql6886h418f73h3wjblhnd16qvbap7mfr4g2yv4xybh88d4x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wimpy-del";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wimpy-del";
           sha256 = "10qw5lfq2392fr5sdz5a9bc6rvsg0j4dkrwvdhip1kqvajznw49x";
           name = "wimpy-del";
         };
@@ -57986,7 +58552,7 @@
           sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/win-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/win-switch";
           sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
           name = "win-switch";
         };
@@ -58004,7 +58570,7 @@
           sha256 = "0dcbnqcqw7jzwwdn0rxxlixga1zw1x3a2zbpxvd90xp7zig4f0yz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/windata";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/windata";
           sha256 = "0xq51rdanq5as6kfyi97hsqmig5g35w7xv8c96bhzyflranw7jw5";
           name = "windata";
         };
@@ -58025,7 +58591,7 @@
           sha256 = "0g69r64gyz4p3k6n8l0i1837mszycbrp23acnp0iy0y3mg67x3pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-end-visible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-end-visible";
           sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
           name = "window-end-visible";
         };
@@ -58046,7 +58612,7 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-jump";
           sha256 = "1gmqb7j5fb3q3krgx7arrln5nvyg9vcpph6wlxj6py679wfa3lwr";
           name = "window-jump";
         };
@@ -58067,7 +58633,7 @@
           sha256 = "08chi9b4bap78n069aavvx3850kabk2jflrgymy4jxv08ybqikdg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-layout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-layout";
           sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
           name = "window-layout";
         };
@@ -58085,7 +58651,7 @@
           sha256 = "1as3qbvj6d171qp2s8ycqqi16bgqm47vfk3fbxrl9szjzaxh9nw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-number";
           sha256 = "1qhlsdhs40cyly87pj3f1n6ckr7z5pmhqndgay5jyxwxxdpknpap";
           name = "window-number";
         };
@@ -58106,7 +58672,7 @@
           sha256 = "1f4c6q4larifm745fr8f3w8sxs1sbs77vna29rw120jz8rnlz0jy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-numbering";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-numbering";
           sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
           name = "window-numbering";
         };
@@ -58124,7 +58690,7 @@
           sha256 = "0mqdcgk6mdxgl9if7jzgg16zqdwnsp8icrdhnygphw5m9h2dqcnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window+";
           sha256 = "0fhzb0ay9g9qgcaxpb2qaw15dh0lfmv3x4akyipi3zx11446d06j";
           name = "window-plus";
         };
@@ -58137,15 +58703,15 @@
     window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "window-purpose";
-        version = "20151114.440";
+        version = "20160203.1103";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "emacs-purpose";
-          rev = "d8b9399c8bbdb6e843cd62b7adb658fea6cf7e75";
-          sha256 = "1hfn3x08h426kw0m1qyrjy8kp6nm56d1h5zlfiwj22kfc560gb4v";
+          rev = "38fda8c9e4c0ad4fb0068b6b45ed0744f8d602a7";
+          sha256 = "0lm16hi6v4mg9jwqk3npzzpy2gaqz1kl47rdazlgdz4yl8x133c8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-purpose";
           sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d";
           name = "window-purpose";
         };
@@ -58166,7 +58732,7 @@
           sha256 = "0hijf56ahbc5inn7n39nj96d948c4d05n9d5ci3g3vbl5hsyb121";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/windsize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/windsize";
           sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
           name = "windsize";
         };
@@ -58187,7 +58753,7 @@
           sha256 = "1qrbvidnmgg7jyasb28bc0z1x4a4ayzq5jmv38dsx0qs080s85wy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/winpoint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/winpoint";
           sha256 = "10ji7xd9ipmy6c2qxljqdxgqf5sb8h7lwz43mr6ixbn7v1b7pp6w";
           name = "winpoint";
         };
@@ -58203,11 +58769,11 @@
         version = "20150623.1234";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "34fc6f12d740";
-          sha256 = "0ppj8mrlc20i2syyiwvj5rp53swrm929h0ksxxlqvn3nvl9gsajd";
+          rev = "f41388ee99f1";
+          sha256 = "16711d1ds508nmjw81jm2cfdpqzc55gc175fkhayk0f5swlvd11m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wisp-mode";
           sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
           name = "wisp-mode";
         };
@@ -58228,7 +58794,7 @@
           sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wispjs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wispjs-mode";
           sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
           name = "wispjs-mode";
         };
@@ -58241,16 +58807,16 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "20160118.835";
+        version = "20160128.1401";
         src = fetchFromGitHub {
           owner = "magit";
-          repo = "magit";
-          rev = "45b06a7b8664046fd1aecb3f07db535edd80d013";
-          sha256 = "1c6x10nm5syahn85vrgg9i6i7kzy4h7l9alahaxb71w6jwf91rsg";
+          repo = "with-editor";
+          rev = "580f225a6c4476feb36b707c6c705b027339717b";
+          sha256 = "0dymhkbkzicjw0379bdzbb594x5xcjbgbn428a30i2i0jwv66pfz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/with-editor";
-          sha256 = "042fa55yakdn2di4l5dilnmqpslac46wpr1zpl4xk3v3i4nn9ndv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/with-editor";
+          sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
           name = "with-editor";
         };
         packageRequires = [ async dash emacs ];
@@ -58270,7 +58836,7 @@
           sha256 = "1c7g8f3jr7bb0xxprammfg433gd63in5iiiaq8rjmc94h6hdcys3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/with-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/with-namespace";
           sha256 = "1199k1xvvv7ald6ywrh2sfpw2v42ckpcsw6mcj617bg3b5m7770i";
           name = "with-namespace";
         };
@@ -58291,7 +58857,7 @@
           sha256 = "12rfpkyjkhikjh0mihhp5h5pzbm4br68nwf8k1ja9djl77vfzv36";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wn-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wn-mode";
           sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
           name = "wn-mode";
         };
@@ -58312,7 +58878,7 @@
           sha256 = "1xna0cjgi9m87pws2h0cza67qbpdhjmdi5h4wv6v4g14nr26hi3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wolfram-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wolfram-mode";
           sha256 = "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf";
           name = "wolfram-mode";
         };
@@ -58333,7 +58899,7 @@
           sha256 = "0hacc8ha5w44cgwkipa3nwh1q5gdrcxhjkmw2gnvb1l01crgnack";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wonderland";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wonderland";
           sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
           name = "wonderland";
         };
@@ -58354,7 +58920,7 @@
           sha256 = "1b9pya342ikyxnlyxp86wx8xk6zcdws7jsqs7a9xk027prwkfngj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wordnut";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wordnut";
           sha256 = "1gqmjb2f9izra0x9ds1jyk7h204qsll6viwkvdnmxczyyc0wx44n";
           name = "wordnut";
         };
@@ -58375,7 +58941,7 @@
           sha256 = "0d2byl3si2r0zh5ih6xpsgcd9r114ry0lzg5vcf31rr2gqf0j06h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wordsmith-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wordsmith-mode";
           sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
           name = "wordsmith-mode";
         };
@@ -58385,22 +58951,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, helm, hydra, lib, melpaBuild }:
+    worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "worf";
-        version = "20151231.1124";
+        version = "20160121.638";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "dc68fa582287861e778c463209f8311c8ac4d620";
-          sha256 = "102qgcsh905hvbygrj8ik47qy1q2qkh2h4sski1g40mp3z6pbza9";
+          rev = "51fa0f71e49ad8b8d9c87156c724007e58d87a02";
+          sha256 = "15nc9zw12jd9jb4s02sa8a3c0i2s91ijy0bn43d36qc5i48c01zs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/worf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/worf";
           sha256 = "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi";
           name = "worf";
         };
-        packageRequires = [ ace-link helm hydra ];
+        packageRequires = [ ace-link hydra swiper ];
         meta = {
           homepage = "http://melpa.org/#/worf";
           license = lib.licenses.free;
@@ -58417,7 +58983,7 @@
           sha256 = "0q32z54qafj8ap3ybx82i3fm1msmzwvpxgmkaglzhi8nccgzbn2n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/workgroups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/workgroups";
           sha256 = "1v01yr3lk6l0qn80i3r8fq3di0a8bmqjyhwx19hcgiap57xl80h8";
           name = "workgroups";
         };
@@ -58438,7 +59004,7 @@
           sha256 = "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/workgroups2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/workgroups2";
           sha256 = "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v";
           name = "workgroups2";
         };
@@ -58459,7 +59025,7 @@
           sha256 = "0i00xm4rynbp2v3gm6h46ajgj8h8nxnsjh6db1659b0hbpnah0ji";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/world-time-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/world-time-mode";
           sha256 = "10gdlz4l9iqw1zdlk5i3knysn36iqxdh3xabjq8kq04jkl7i36dl";
           name = "world-time-mode";
         };
@@ -58480,7 +59046,7 @@
           sha256 = "09fzbbrdgq19c3gylj4i0c5g070k65w943wz28mzis8b403vzh3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wrap-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wrap-region";
           sha256 = "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq";
           name = "wrap-region";
         };
@@ -58501,7 +59067,7 @@
           sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/writegood-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/writegood-mode";
           sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
           name = "writegood-mode";
         };
@@ -58522,7 +59088,7 @@
           sha256 = "0an36zra25r0l482irxbwrq90fd3rik53yqw3gccjkgdf3lpkc4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/writeroom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/writeroom-mode";
           sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
           name = "writeroom-mode";
         };
@@ -58543,7 +59109,7 @@
           sha256 = "1x2ybnv0h52i24vd1n95s4vglc6p79cyxh91a20cwza34svhz152";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ws-butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ws-butler";
           sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
           name = "ws-butler";
         };
@@ -58556,15 +59122,15 @@
     wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wsd-mode";
-        version = "20160117.1502";
+        version = "20160201.1551";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "wsd-mode";
-          rev = "b733fc4d1e88c33f23552fc88c8e4cb0135c6e15";
-          sha256 = "07mmnlfqm0jmkj43l33gd4wjj8kin3rnqzhsh9hsjxir851d0jf2";
+          rev = "d604ee487ad426b19287bcf802c85f9026276956";
+          sha256 = "09c3vhg62ppxfznpir3b33k5k9y1m8v2w41czi2f57987f64f5pz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wsd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wsd-mode";
           sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
           name = "wsd-mode";
         };
@@ -58585,7 +59151,7 @@
           sha256 = "0ba193ilqmp7l35hhzfym4kvbnj9h57m8mwsxdj6rdj2cwrifx8r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wwtime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wwtime";
           sha256 = "0n37k23lkjgaj9wxnr41yk3mwvy62mc9im5l86czqmw5gy4l63ic";
           name = "wwtime";
         };
@@ -58606,7 +59172,7 @@
           sha256 = "0i7bgbhk4lvdkdjh6z4xs69mbdi49985j82cjikzyyskjcqd2klq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/x-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/x-dict";
           sha256 = "1w51xhiaxk50wlch262dxs2ybjvjj8qzx01xlgiimvggb8h5arlc";
           name = "x-dict";
         };
@@ -58627,7 +59193,7 @@
           sha256 = "0lssri13f3c7drkirh3cyxzxm3lix5myfrqb9iy178nybrifgf8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/x86-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/x86-lookup";
           sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
           name = "x86-lookup";
         };
@@ -58648,7 +59214,7 @@
           sha256 = "1birxxr28iv70x2h9war7ibhgan6pmbghdj11jnndvxl140jclmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-elisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-elisp-mode";
           sha256 = "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij";
           name = "xah-elisp-mode";
         };
@@ -58669,7 +59235,7 @@
           sha256 = "05dvmvh81n30l56gvlgzj0bwqd2fv1d6xvhvj5ywax6kqr9piwqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-find";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-find";
           sha256 = "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq";
           name = "xah-find";
         };
@@ -58682,15 +59248,15 @@
     xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20160115.115";
+        version = "20160130.126";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "c7e27935a325be5f00db455ad7c0d9c473feefaf";
-          sha256 = "1i3q1fl9ciw367l065lxsdz78fq9y91hbp1vfwaw480rf1vqfxf2";
+          rev = "9a000ae40235c960b29423bde0331df3d445a154";
+          sha256 = "1kdzs5dhlrp42sgpgmybfzydr3m792ws11kn06c1d3mdfvrlkm9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-fly-keys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-fly-keys";
           sha256 = "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs";
           name = "xah-fly-keys";
         };
@@ -58711,7 +59277,7 @@
           sha256 = "0abknznp2si80zq5pc0hqr3w3pca2vrv3msm6jz1s8l8zi2hwx72";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-get-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-get-thing";
           sha256 = "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg";
           name = "xah-get-thing";
         };
@@ -58732,7 +59298,7 @@
           sha256 = "1adyww9jbjvcn9p3z9ggs3gijdmnab275a81ch8sir1xp59pfm3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-lookup";
           sha256 = "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc";
           name = "xah-lookup";
         };
@@ -58745,15 +59311,15 @@
     xah-math-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-math-input";
-        version = "20151225.1358";
+        version = "20160127.1608";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-math-input";
-          rev = "f0c98d1271b20334c8af2593fd391af23a6e64b4";
-          sha256 = "1j2dca3j71g2g8phzfxjvcwymlr10dq8fbahwslwdhadffjv9m87";
+          rev = "299a9fc5c1f764ad558e412ca3bff8438f4fabd5";
+          sha256 = "1wsdnqpfgk7f1dbz90k6sf13hjh0x3xjjgappfkmhcy36g7sshl7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-math-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-math-input";
           sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a";
           name = "xah-math-input";
         };
@@ -58774,7 +59340,7 @@
           sha256 = "18msj947w6msma6zm23slk2v0h92n5ych5j12zbzkzzir49sffql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-replace-pairs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-replace-pairs";
           sha256 = "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x";
           name = "xah-replace-pairs";
         };
@@ -58795,7 +59361,7 @@
           sha256 = "0dc74kqwi0hpihdbb9a9lrqb7823w6j96mah47zyd9d4rd3vx850";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xahk-mode";
           sha256 = "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9";
           name = "xahk-mode";
         };
@@ -58816,7 +59382,7 @@
           sha256 = "08hzsqf4gawcr9q2h3rxrf1igvdja84aaa821657k04kdq4dpcbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xbm-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xbm-life";
           sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
           name = "xbm-life";
         };
@@ -58829,15 +59395,15 @@
     xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xcscope";
-        version = "20140510.1637";
+        version = "20160201.2126";
         src = fetchFromGitHub {
           owner = "dkogan";
           repo = "xcscope.el";
-          rev = "d845a033058ccb83e32dd9648885e8f608bb6258";
-          sha256 = "1wf6yijafqwcksrqci3d8zy3zh5yzqpfbf0d3m7qyslbax2aw25a";
+          rev = "0fe485803531e6494f5bfe448766e49f77a15fb5";
+          sha256 = "0p8cs5mh6ab6m0ff6ljs2vd1g8xx0jgc9ybh0j4aj2zcp22avz2n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xcscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xcscope";
           sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
           name = "xcscope";
         };
@@ -58858,7 +59424,7 @@
           sha256 = "0gd7ag7cqzkfk8y9rbkrjpnyjnwad5bx86a30vxamd1ql8xp57ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xkcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xkcd";
           sha256 = "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w";
           name = "xkcd";
         };
@@ -58868,6 +59434,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    xml-plus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xml-plus";
+        version = "20160203.2325";
+        src = fetchFromGitHub {
+          owner = "bddean";
+          repo = "xml-plus";
+          rev = "ec9b2af03a195e3a96ffc173fb3aa48b89676b2e";
+          sha256 = "1m7hpjfvpzichml8iarsqf9dv34sx7jcyh9mhj7dlka3za91snpb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xml+";
+          sha256 = "0xgqyfdn6kkp89zj4h54r009a44sbff0nrhh582zw5rlklypwdz1";
+          name = "xml-plus";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/xml+";
+          license = lib.licenses.free;
+        };
+      }) {};
     xml-quotes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xml-quotes";
@@ -58879,7 +59466,7 @@
           sha256 = "0z3yd3dzcsd7584jchv9q55fx04ig4yjzp8ay2pa112lykv4jxxd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xml-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xml-quotes";
           sha256 = "1lmafa695xkhd90k6yiv8a57ch1jx33l1zpm39z0kj546mn6y8aq";
           name = "xml-quotes";
         };
@@ -58900,7 +59487,7 @@
           sha256 = "0kkjfg1l2wg3d5wrgkwnww4d3fca0xpd3k5z9j9gwmjnkxqd95ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xml-rpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xml-rpc";
           sha256 = "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js";
           name = "xml-rpc";
         };
@@ -58921,7 +59508,7 @@
           sha256 = "1nk50iwb6az01r1s2l9wwdqrz3k4ywr00q0zmd9vvi3y9v4cjah0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xmlgen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xmlgen";
           sha256 = "1mvnjqb9zxf9ml605w10v4cbbajwv9if93apr4xrh79l00scj383";
           name = "xmlgen";
         };
@@ -58934,15 +59521,15 @@
     xmlunicode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xmlunicode";
-        version = "20160108.2311";
+        version = "20160130.1109";
         src = fetchFromGitHub {
           owner = "ndw";
           repo = "xmlunicode";
-          rev = "7da11de1a196f8fb202464320107774ed3c7ecc9";
-          sha256 = "16rj11rasifkfp7357i5s2kg36vqrnjl3zv6lgzmn365xxx6zrbz";
+          rev = "b3ccf49b9e344748d72cccb3134e7c49d250645f";
+          sha256 = "1k5zilvq64xjhy9lrwf9ss0y7j0v9ppg10xzcrj1hy6jbx54nn8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xmlunicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xmlunicode";
           sha256 = "1ylpvx2p5l863r9qv9jdsm9rbv989c8xn0zpjl8zkcfxqxix4h4p";
           name = "xmlunicode";
         };
@@ -58963,7 +59550,7 @@
           sha256 = "09fpxr55b2adqmca8xhpy8z5cify5091fjdjyxjd1jh5wdp1658v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xquery-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xquery-mode";
           sha256 = "0b5k2ihbjm5drv4lf64ap31yj873x1fcq85y6yq1ayahn6s52rql";
           name = "xquery-mode";
         };
@@ -58976,15 +59563,15 @@
     xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xquery-tool";
-        version = "20160112.406";
+        version = "20160203.1153";
         src = fetchFromGitHub {
           owner = "paddymcall";
           repo = "xquery-tool.el";
-          rev = "c7783a502b5a1f4a41cd87ed881a27aafa145a11";
-          sha256 = "1i2ah3wkjv6ya7zda53ivj5fchmg1kr2l01bhl0r183g3jws796p";
+          rev = "126164abeb77bd7932c73590939637895005c48b";
+          sha256 = "1yy759qc4njc8bqh8hmgc0mq5vk5spz5syxgflqhjijk8nrvyfgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xquery-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xquery-tool";
           sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
           name = "xquery-tool";
         };
@@ -59005,7 +59592,7 @@
           sha256 = "1n3biybylvq5c1lpf7zsjsgdrg7mzrhkaw251fp8qmsss0s3sv4g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xresources-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xresources-theme";
           sha256 = "0spqa3xn3p2lmvlc5hdn7prq4vb70nkyrryx1kavha9igzhlyaga";
           name = "xresources-theme";
         };
@@ -59026,7 +59613,7 @@
           sha256 = "064fpjcj1sp8m5x106dw6zgy0p0rfd5fxcx57h533q263l7z00ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-color";
           sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
           name = "xterm-color";
         };
@@ -59047,7 +59634,7 @@
           sha256 = "10dsf2lgjjqvjzzyc5kwggfk511v8ypmx173bixry3djcc15dsf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-frobs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-frobs";
           sha256 = "02v8kh2g6a2fpxy911630zsg985hyakvqbd6v2xyfbz0vnd6i1lf";
           name = "xterm-frobs";
         };
@@ -59068,7 +59655,7 @@
           sha256 = "1jwimgglhqgp259wjqmpp1wi9j51qxcl1l356jlhjnfp1zh1ihmg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-keybinder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-keybinder";
           sha256 = "1n0zp1mc7x7z0671lf7p9r4qxic90bkf5q3zwz4vinpiw2qh88lz";
           name = "xterm-keybinder";
         };
@@ -59089,7 +59676,7 @@
           sha256 = "06cbr7y3wp7j8lnbys57g6md4fdx9xhlnxl73pj7xpfa5i2x9ifl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-title";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-title";
           sha256 = "08z8qg9x6vjpybbhxa8x46qnp3951miz1264fivg776y76cg3ck6";
           name = "xterm-title";
         };
@@ -59110,7 +59697,7 @@
           sha256 = "09mn8s7gzzxgs7kskld8l68zjrcgnvml3fqj69wrfq7b1g62hhxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xtest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xtest";
           sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
           name = "xtest";
         };
@@ -59131,7 +59718,7 @@
           sha256 = "0f6pvwzhncycw8gnjy24h6q1qglfgvdjfs5dzqx9s43j3yg63lzm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yabin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yabin";
           sha256 = "1kmpm2rbb43c9cgp44qwd24d90mj48k3gyiir3vb6zf6k3syrc17";
           name = "yabin";
         };
@@ -59152,7 +59739,7 @@
           sha256 = "0b252m7vb5kg5bjhpgag6nhm32cac8dhlmy4pr0kpa860lh2xlz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yafolding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yafolding";
           sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
           name = "yafolding";
         };
@@ -59173,7 +59760,7 @@
           sha256 = "0sqwz37y6mpc378pp8p6bq9fmhgwfr6rlbngiwgvsp30iq6vjsn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yagist";
           sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
           name = "yagist";
         };
@@ -59194,7 +59781,7 @@
           sha256 = "030dcp5iq0jvr2m6lb5ar7bqzp1l7f835yl7d7fa8zp46fc3a6d5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yahoo-weather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yahoo-weather";
           sha256 = "1kzi6yp186wfcqh5q1v9vw6b1h8x89sba6wlnacfpjbarwapfif0";
           name = "yahoo-weather";
         };
@@ -59215,7 +59802,7 @@
           sha256 = "12dd4ahg9f1493982d49g7sxx0n6ss4xcfhxwzyaqxckwzfranp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yalinum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yalinum";
           sha256 = "0jzsvkcvy2mkfmri4bzgrlgw2y0z3hxz44md83s5zmw09mshkahf";
           name = "yalinum";
         };
@@ -59236,7 +59823,7 @@
           sha256 = "1cngxwn7m3qxn0dm7l9vd4lb5sw5i4aqn5rkr7pacskl0giikhfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaml-mode";
           sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
           name = "yaml-mode";
         };
@@ -59257,7 +59844,7 @@
           sha256 = "1xgqqgg4q3hrhiap8gmr8iifdr1mg4dl0j236b6alhrgmykbhimy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaml-tomato";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaml-tomato";
           sha256 = "0bja213l6mvh8ap5d04x8dik1z9px5jr52zpw1py7shw5asvp5s2";
           name = "yaml-tomato";
         };
@@ -59278,7 +59865,7 @@
           sha256 = "17ymdqi19bs9xn0pxylzv7m99f7cn14hx73xljm6bg0qfb8m53f3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yandex-weather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yandex-weather";
           sha256 = "11hspadm520cjlv1wk2bdpzg7hg2g0chbh26qijj9jgvca26x0md";
           name = "yandex-weather";
         };
@@ -59296,7 +59883,7 @@
           sha256 = "0svy6zp5f22z7mblap4psh7h4i52d1qasi9yk22l39przhsrjar4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaoddmuse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaoddmuse";
           sha256 = "07sqcsad3k23agwwws7hxnc46cp9mkc9qinzva7qvjgs8pa9dh54";
           name = "yaoddmuse";
         };
@@ -59317,7 +59904,7 @@
           sha256 = "06mjjxa0blgxd8dbahgyni3b1rscbwjpxby5abrgfbb0fvs2bnfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yard-mode";
           sha256 = "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx";
           name = "yard-mode";
         };
@@ -59338,7 +59925,7 @@
           sha256 = "0w9a6j0ndpfwaz1g974vv5jqgbzxw26l19kq51j3ah73063cavpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yari";
           sha256 = "0sch9x899mzwdacg55w5j583k2r4vn71ish7gqpghd7cj13ii66h";
           name = "yari";
         };
@@ -59359,7 +59946,7 @@
           sha256 = "08wa97hsfy1rc8ify3rz2ncfij4z6l16p4s20naygqccjv3ir6z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yascroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yascroll";
           sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
           name = "yascroll";
         };
@@ -59372,15 +59959,15 @@
     yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20160104.329";
+        version = "20160131.1148";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "yasnippet";
-          rev = "100d8d19049f1ec97a0cd22400758d4afcde403c";
-          sha256 = "10a2rrwz88gzhq3qij2nabqd6b31n3cxnjshrzjn9iv0lcby31a5";
+          rev = "88b79505547be31f534a03a871ac98788e1455e3";
+          sha256 = "0vpsicap1sk2i78y4ysszhksinh6qvic709n3gbzaz2d4mm0bsya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yasnippet";
           sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
           name = "yasnippet";
         };
@@ -59401,7 +59988,7 @@
           sha256 = "1gxn302kwjfq6s6rxxvy0jpp37r2vh4ry899giqbdfr0cc1qnw0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yatemplate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yatemplate";
           sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
           name = "yatemplate";
         };
@@ -59420,7 +60007,7 @@
           sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yatex";
           sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
           name = "yatex";
         };
@@ -59441,7 +60028,7 @@
           sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaxception";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaxception";
           sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
           name = "yaxception";
         };
@@ -59462,7 +60049,7 @@
           sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ycm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ycm";
           sha256 = "16ahgvi85ddjlrjxld14zm2vvam0m89mwskizjd5clcz0snk51sc";
           name = "ycm";
         };
@@ -59475,15 +60062,15 @@
     ycmd = callPackage ({ dash, deferred, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "ycmd";
-        version = "20160115.1652";
+        version = "20160202.235";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "80c6d7c663b6ccc32b851348f1099790ac4c9736";
-          sha256 = "1c3c3frd9fdb77wkhg8f8g29dvr86ryzf9prg4pm8wvhifa4yhvg";
+          rev = "c64684df763411249985159ee33b10d948b9fc91";
+          sha256 = "12jwqhzqskdp2l6h60rich19rddzjcl94zaf72ljnq8h0mqc3xy0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ycmd";
           sha256 = "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q";
           name = "ycmd";
         };
@@ -59504,7 +60091,7 @@
           sha256 = "1fyvvkx6pa41bcr9cyh4yclwdzc5bs742s9fxr6wb4a5scq3hg9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yesql-ghosts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yesql-ghosts";
           sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
           name = "yesql-ghosts";
         };
@@ -59525,7 +60112,7 @@
           sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/youdao-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/youdao-dictionary";
           sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
           name = "youdao-dictionary";
         };
@@ -59546,7 +60133,7 @@
           sha256 = "1k7m3xk5ksbr2s3ypz5yqafz9sfav1m0qk2jz1xyi3fdaw2j0w2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/z3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/z3-mode";
           sha256 = "183lzhgjj480ca2939za3rlnsbfn24mgi501n66h5wim950v7vgd";
           name = "z3-mode";
         };
@@ -59567,7 +60154,7 @@
           sha256 = "16k8hha798hrs0qfdwqdr6n7y13ffgm6jj3msrk0zl8117jhaany";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zeal-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zeal-at-point";
           sha256 = "1cz53plk5bax5azm13y7xz530qcfh0scm0cgrkrgwja2wwlxirnw";
           name = "zeal-at-point";
         };
@@ -59587,7 +60174,7 @@
           sha256 = "0f80fxh0y9lfa08fnic7ln0jn8vngfbiygy6sizdmrcxz67559vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zeitgeist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zeitgeist";
           sha256 = "0gzmiwxmzcrl5mf0s7vs09p2wl7slq8xbl6ynl76iwzwjxjizahk";
           name = "zeitgeist";
         };
@@ -59608,7 +60195,7 @@
           sha256 = "0dnaxhsw549k54j0mgydm7qbl4pizgipfyzc15f9afsxa107rpnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zen-and-art-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zen-and-art-theme";
           sha256 = "0b2lflji955z90xl9iz2y1vm04yljghbw4948gh5vv5p7mwibgf2";
           name = "zen-and-art-theme";
         };
@@ -59621,15 +60208,15 @@
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "20160117.1319";
+        version = "20160204.1416";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "041b800022f486cd328a8cd3eb729db93ddb710e";
-          sha256 = "13nmbjz4a7ibjcs4h6rbx5hkcdmbinsm8jzh049cb289y7m0lcpa";
+          rev = "3d7463ecac9c4668a4d2ceaddea2fd43e677bfba";
+          sha256 = "0xihq1bpgckv9jcs6xdnhn8l4hbxywh1krk8ydv099l56r4w1269";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zenburn-theme";
           sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
           name = "zenburn-theme";
         };
@@ -59650,7 +60237,7 @@
           sha256 = "1y3wj15kfbgskl29glmba6lzq43rcm141p4i5s180aqcw7ydp5vr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zencoding-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zencoding-mode";
           sha256 = "1fclad1dyngyg9ncfkcqfxybvy8482i2bd409cgxi9y4h1wc7ws7";
           name = "zencoding-mode";
         };
@@ -59671,7 +60258,7 @@
           sha256 = "1byzw9k8g7inwr5icci9i1iar0y6w9zgs91nj04431j003l10xfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zerodark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
           name = "zerodark-theme";
         };
@@ -59692,7 +60279,7 @@
           sha256 = "1gb51bqdf87yibs1zngk6q090p05293cpwlwbwzhnih9sl6wkq8x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zlc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zlc";
           sha256 = "0qw0qf14l09mcnw7h0ccbw17psfpra76qfawkc10zpdb5a2167d0";
           name = "zlc";
         };
@@ -59713,7 +60300,7 @@
           sha256 = "1xsxmvbh3xm3zh9yc6q28h48nar6pwyd51xw04b1x7amwkp8qdnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/znc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/znc";
           sha256 = "1z2kzbapgh55wwr5jp7v1wz5kpz4l7n3k94mkh3s068xag9xs6zz";
           name = "znc";
         };
@@ -59734,7 +60321,7 @@
           sha256 = "1gm3ly6czbw4vrxcslm50jy6nxf2qsl656cjwbyhw251wppn75cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zombie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zombie";
           sha256 = "0ji3nsxwbxmmygd6plpbc1lkw6i5zw4y6x3r5n2ah3ds4vjr7cnv";
           name = "zombie";
         };
@@ -59755,7 +60342,7 @@
           sha256 = "04m53hzk5n9vxh0gxi8jzpdhsdjlxnvz7hmsisr3bs99v603ha01";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zombie-trellys-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zombie-trellys-mode";
           sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
           name = "zombie-trellys-mode";
         };
@@ -59776,7 +60363,7 @@
           sha256 = "1zg8fiv62bz7zmalczmfkbgjc6km7n66pzvidivc0p9b9sfxslkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zone-nyan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-nyan";
           sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
           name = "zone-nyan";
         };
@@ -59786,6 +60373,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    zone-rainbow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zone-rainbow";
+        version = "20160120.734";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "zone-rainbow";
+          rev = "2ba4f1a87c69c4712124ebf12c1f3ea171e1af36";
+          sha256 = "0w550l9im3mhxhja1b7cr9phdcbvx5lprw551lj0d1lv7qvjasz0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-rainbow";
+          sha256 = "0l51fmhvx9vsxbs62cbjgqphb691397f651nqin7cj3dfvchzh4j";
+          name = "zone-rainbow";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/zone-rainbow";
+          license = lib.licenses.free;
+        };
+      }) {};
     zone-select = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zone-select";
@@ -59797,7 +60405,7 @@
           sha256 = "17mrzf85ym0x5ih4l6sjdjlcmviabf8c8rpvpkd90gp9qxd8pyx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zone-select";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-select";
           sha256 = "05kc211invmy4ajwf71vgr2b7bdgn99c4a26m95gcjqgy3sh5xzz";
           name = "zone-select";
         };
@@ -59807,6 +60415,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    zone-sl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zone-sl";
+        version = "20160201.610";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "zone-sl";
+          rev = "7ec22e3661c6348382f9fc39a9d0063dbd2352ff";
+          sha256 = "0m1q45pza61j0fp8cxkgmds5fyjrk0nqpwhg8m91610m3pvyc3ap";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-sl";
+          sha256 = "04rwd6vj3abk3bzhq3swxwcq5da2n9cldrcmvnqgjr975np4cgs3";
+          name = "zone-sl";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/zone-sl";
+          license = lib.licenses.free;
+        };
+      }) {};
     zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "zones";
         version = "20151231.1825";
@@ -59815,7 +60444,7 @@
           sha256 = "1dgadarqz1fvijf9cch24ngkn223jjp08njsfa52qk16k8pdpc12";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zones";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zones";
           sha256 = "08sl7i7cy22nd1jijc5l7lp75k9z83gfr8q41n72l0vxrpdasc9w";
           name = "zones";
         };
@@ -59836,7 +60465,7 @@
           sha256 = "0ls9x2r12z9ki2fy3cbf05mp28x4ws2gk3knacvw7gvvg4sjdq5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zonokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zonokai-theme";
           sha256 = "1hrpgh03mp7yynqamgzkw7fa70c5pmyjfmfblkfhspnsif8j4v29";
           name = "zonokai-theme";
         };
@@ -59855,7 +60484,7 @@
           sha256 = "1whpd97yjby5zbcr4fcn0nxhqvn6k3jn8k2d15i6ss579kziwdqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zoom-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zoom-frm";
           sha256 = "111lr29zhj8w8j7dbzl58iisqxjhccxpw4spfxx08zxh4623g5mk";
           name = "zoom-frm";
         };
@@ -59876,7 +60505,7 @@
           sha256 = "1kl01dlggsrffvakmwixw9j8cncdmlsw805wvzls6l1711r1zjwj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zoom-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zoom-window";
           sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
           name = "zoom-window";
         };
@@ -59897,7 +60526,7 @@
           sha256 = "0ybmvn5wriyhpgxqv8xarviyxgy255vbp3yz9d330y29jhdih6zd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zop-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zop-to-char";
           sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
           name = "zop-to-char";
         };
@@ -59918,7 +60547,7 @@
           sha256 = "0fgwxw7r3zfv0b7xi8bx7kxff2r5hdw9gxf16kwq04fnh18nhi39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zossima";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zossima";
           sha256 = "11kmnbqv4s8arindg7cxcdhbvfxsckks332wn7aiyb3bjhcgzwjb";
           name = "zossima";
         };
@@ -59931,15 +60560,15 @@
     zotelo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zotelo";
-        version = "20151105.541";
+        version = "20160118.2245";
         src = fetchFromGitHub {
           owner = "vitoshka";
           repo = "zotelo";
-          rev = "91c8309da1f293341ba86f29fa0a28dee5cabd93";
-          sha256 = "16fr5s8i9ykq5j7ikf6qfd2px2dxc1gcff5wipif8h758691rliv";
+          rev = "4cabb7342668e146c5565dc5454ece4b4040f1a9";
+          sha256 = "1335z1v4889njnm98pz2sjk6n7r3vncsz83bk3z6gj5i0ig7wjap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zotelo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zotelo";
           sha256 = "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z";
           name = "zotelo";
         };
@@ -59960,7 +60589,7 @@
           sha256 = "015xgsisgsv4w5h6r68f7iw3vwrqvc0az1gcdkd5dfr3nl1h4yzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zotxt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zotxt";
           sha256 = "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5";
           name = "zotxt";
         };
@@ -59970,22 +60599,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ztree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ztree";
-        version = "20160109.1737";
+        version = "20160127.1742";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "ztree";
-          rev = "b5b2d02af8a34c40d6c3936c24d1cfe3d7911659";
-          sha256 = "0bf10znzjim35qv2v64l9pz5f44rv2xaxvfrsl5n8nl9p0knwfmg";
+          rev = "a7c54891c5ed00a192c72f99ba5ba7d4df7a2a0b";
+          sha256 = "1sxjpbgi7ydmrlv34l16n40qpg969wfcb6kknndrh3fgjjc3p41b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ztree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ztree";
           sha256 = "1fk5xz8qq3azc66f954x5qvym94xnv4fg6wy83ihdfwycsas7j20";
           name = "ztree";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/ztree";
           license = lib.licenses.free;
@@ -60002,7 +60631,7 @@
           sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zygospore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zygospore";
           sha256 = "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z";
           name = "zygospore";
         };
@@ -60015,15 +60644,15 @@
     zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zzz-to-char";
-        version = "20151030.232";
+        version = "20160122.640";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "zzz-to-char";
-          rev = "5d3465122342265b6ff8495c60d9a7cb457be42a";
-          sha256 = "1ai0a9r1xdz1jcr071ivm49wl906a0jqnhfaznw37jw9j2db58zn";
+          rev = "efbe99c9163602f23408abaea70ffe292632bf26";
+          sha256 = "0y0hhar3krkvbpb5y9k197mb0wfpz8cl6fmxazq8msjml7hkk339";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zzz-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zzz-to-char";
           sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
           name = "zzz-to-char";
         };
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index ad91c6e251dbd..b682fdb830c9a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -10,7 +10,7 @@
           sha256 = "13f4l9xzx4xm5m80kkb49zh31w0bn0kw9m5ca28rrx4aysqmwryv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/abc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/abc-mode";
           sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
           name = "abc-mode";
         };
@@ -31,7 +31,7 @@
           sha256 = "0a8widshsm39cbala17pmnk1sazazhhyqppwalysli170whk49c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-alchemist";
           sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
           name = "ac-alchemist";
         };
@@ -52,7 +52,7 @@
           sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-anaconda";
           sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
           name = "ac-anaconda";
         };
@@ -73,7 +73,7 @@
           sha256 = "12z8nq797hjy0bq5vzpcm7z7bdn0ixc3ma4cj3v51xnwmgknzk6c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cake";
           sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl";
           name = "ac-cake";
         };
@@ -94,7 +94,7 @@
           sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cake2";
           sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy";
           name = "ac-cake2";
         };
@@ -115,7 +115,7 @@
           sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-capf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-capf";
           sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
           name = "ac-capf";
         };
@@ -136,7 +136,7 @@
           sha256 = "1vpj0lxbvlxffj2z29l109w70hcphiavyvglsw524agxql3c8yf9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cider";
           sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
           name = "ac-cider";
         };
@@ -157,7 +157,7 @@
           sha256 = "1sdgpyq5p824dnxv6r7djwvhyhdmnis8k6992klr8iz7anhxzdam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-clang";
           sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
           name = "ac-clang";
         };
@@ -178,7 +178,7 @@
           sha256 = "0a3s880nswc2s6yh2v5zsmws550q917i7av8nrxc5sp1d03xqwmn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-dcd";
           sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
           name = "ac-dcd";
         };
@@ -199,7 +199,7 @@
           sha256 = "0cc3jpc4pihbyznyzvf6i3xwc2x78gb5m36ba9gkvxhabsljnlfg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-emoji";
           sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
           name = "ac-emoji";
         };
@@ -220,7 +220,7 @@
           sha256 = "0ijni3qgd68jhznhirhgcl59cr7hwfvbwgf6z120x56jmp8h01d2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-etags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-etags";
           sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
           name = "ac-etags";
         };
@@ -241,7 +241,7 @@
           sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-geiser";
           sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
           name = "ac-geiser";
         };
@@ -262,7 +262,7 @@
           sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-haskell-process";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-haskell-process";
           sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
           name = "ac-haskell-process";
         };
@@ -283,7 +283,7 @@
           sha256 = "1gw38phyaslpql7szvlpwgyfngdgd21f6lq406vq0gjwwmxgig34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-helm";
           sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
           name = "ac-helm";
         };
@@ -304,7 +304,7 @@
           sha256 = "19v9515ixg22m7h7riix8w3vyhzax1m2pbwdirp59v532xn9b0cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html";
           sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
           name = "ac-html";
         };
@@ -325,7 +325,7 @@
           sha256 = "1zmjqnlbfchnb7n2v7ms7q06xma1lmf9ry3v6f4pfnwlmz5lsf3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-bootstrap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-bootstrap";
           sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
           name = "ac-html-bootstrap";
         };
@@ -346,7 +346,7 @@
           sha256 = "0p18wxyyc1jmcwx9y5i77s25v4jszv7cmm4bkwm4dzhkxd33kh1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-csswatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-csswatcher";
           sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
           name = "ac-html-csswatcher";
         };
@@ -367,7 +367,7 @@
           sha256 = "1acm13n59sdgvvzicscxzrr5j1x5sa5x4rc4cnkbwb28nw5a5ysm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-inf-ruby";
           sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
           name = "ac-inf-ruby";
         };
@@ -388,7 +388,7 @@
           sha256 = "16qsj3wni4xhcrjx2rnxdzq6jb7jrl4bngi4an37vgdlrx3w8m6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-ispell";
           sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
           name = "ac-ispell";
         };
@@ -409,7 +409,7 @@
           sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-mozc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-mozc";
           sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
           name = "ac-mozc";
         };
@@ -430,7 +430,7 @@
           sha256 = "16f8hvdz6y8nsfj7094yrvw194ag3w1jvz81h287vcgcvmyb7wdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-octave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-octave";
           sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
           name = "ac-octave";
         };
@@ -443,15 +443,15 @@
     ac-php = callPackage ({ auto-complete, company, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "1.7.1";
+        version = "1.7.2";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "3147e2f10a3959c0f54fcc71f87a0a2ef64043d0";
-          sha256 = "11v45azd544fs4v5ndxxc2d6rbqh9r6mqx8gk1487jw7j290j6v8";
+          rev = "109c8fa6410e98bb4374c117590d2a58580571b6";
+          sha256 = "0qz8q9qzr7nqdhyjf01p50949bkps62nckampahv9bli4w92xckz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-php";
           sha256 = "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk";
           name = "ac-php";
         };
@@ -483,7 +483,7 @@
           sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
           name = "ac-racer";
         };
@@ -504,7 +504,7 @@
           sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-slime";
           sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
           name = "ac-slime";
         };
@@ -525,7 +525,7 @@
           sha256 = "1pzh5l8dybrrmglj55nbff6065pxlbx14501p3a1qx1wvf24g1sv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-flyspell";
           sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
           name = "ace-flyspell";
         };
@@ -546,7 +546,7 @@
           sha256 = "0233ai62zhsy5yhv72016clygwp2pcg80y6kr4cjm2k1k2wwy7m9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
           name = "ace-isearch";
         };
@@ -567,7 +567,7 @@
           sha256 = "1z82a0lrb61msamqpsy7rxcgs2nfhhckkk4zw0aw49l248p2nrgs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-buffer";
           sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
           name = "ace-jump-buffer";
         };
@@ -588,7 +588,7 @@
           sha256 = "0rrdh7jq23dyplq5rsf6f3a8v5f8smrzi85dgvqagasv74d19jbv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-helm-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-helm-line";
           sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
           name = "ace-jump-helm-line";
         };
@@ -609,7 +609,7 @@
           sha256 = "1bwvzh056ls2v7y26a0s4j5mj582dmds04lx4x6iqihs04ss74bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-mode";
           sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
           name = "ace-jump-mode";
         };
@@ -630,7 +630,7 @@
           sha256 = "0yng6qayzqadk4cdviri84ghld4can35q134hm3n3j3vprhpbmca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-zap";
           sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
           name = "ace-jump-zap";
         };
@@ -651,7 +651,7 @@
           sha256 = "1v127ld04gn16bgismbcz91kfjk71f3g8yf10r4scfp603y41zgz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-link";
           sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
           name = "ace-link";
         };
@@ -664,15 +664,15 @@
     ace-pinyin = callPackage ({ ace-jump-mode, avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-pinyin";
-        version = "0.2.3";
+        version = "0.2.4";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "ace-pinyin";
-          rev = "10f66ba2355bed78ef0a1ad24edb00972a0dbe02";
-          sha256 = "10n01sgdi1zq1fyb5ani1fbvwfnqnj74rxzmw5v0y72cwq27r9kr";
+          rev = "2f6791b5f0ac1753ae0d0d7a486a385c17151b42";
+          sha256 = "1614xypwiv8xri7w921w7gj26zx7pvwk3212k71qn0capq7hs32g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-pinyin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-pinyin";
           sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
           name = "ace-pinyin";
         };
@@ -682,22 +682,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-popup-menu = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-popup-menu";
-        version = "0.1.1";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ace-popup-menu";
-          rev = "eb8d0d938debdf89575d2ed204aeb7c0b52060b0";
-          sha256 = "061gi4w43dvdys2i0ffc3bnzhrkc83h5x2c43yv4fwb3xz0zn9h0";
+          rev = "3e771b470b0c633d7633dceec054fc05beac81f0";
+          sha256 = "1qiiivkwa95bhyym8ly7fnwwglc9dcifkyr314bsq8m4rp1mgry4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-popup-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-popup-menu";
           sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
           name = "ace-popup-menu";
         };
-        packageRequires = [ avy cl-lib emacs ];
+        packageRequires = [ avy-menu emacs ];
         meta = {
           homepage = "http://melpa.org/#/ace-popup-menu";
           license = lib.licenses.free;
@@ -714,7 +714,7 @@
           sha256 = "07mcdzjmgrqdvjs94f2n5bkrf5vrq2fwzz256wbm3wzqxqkfy1q6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-window";
           sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
           name = "ace-window";
         };
@@ -735,7 +735,7 @@
           sha256 = "0hib4a8385q2czi1yqs0hwnva2xi7kw0bdfnrgha1hrl30rilp2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ack-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ack-menu";
           sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
           name = "ack-menu";
         };
@@ -756,7 +756,7 @@
           sha256 = "0zybch8hz3mj63i0pxynb4d76ywqcy7b4fsa4hh71c2kb0bnczb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/actionscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/actionscript-mode";
           sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
           name = "actionscript-mode";
         };
@@ -777,7 +777,7 @@
           sha256 = "1mb7dlyd5w161xagwn6w5h4q660dppkd50m71vz0w3zmxsc9a0vq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/adoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/adoc-mode";
           sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
           name = "adoc-mode";
         };
@@ -798,7 +798,7 @@
           sha256 = "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aes";
           sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
           name = "aes";
         };
@@ -819,7 +819,7 @@
           sha256 = "0hpsv2zyhhfm53hrd2lzvc9gpvfn6g5dpwmzxfl8l1sqjisips2a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ag";
           sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
           name = "ag";
         };
@@ -840,7 +840,7 @@
           sha256 = "0nss26rz8qly0q00iq7i7q4ss3xvs4s5ndjjmfxhybmnb71a8y9k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aggressive-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aggressive-indent";
           sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
           name = "aggressive-indent";
         };
@@ -861,7 +861,7 @@
           sha256 = "1qqrf9ncc3blkv4p2bhh9q6y41pp9p4wr667mm80vb5j8rkpsaa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ahk-mode";
           sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
           name = "ahk-mode";
         };
@@ -874,15 +874,15 @@
     airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "airline-themes";
-        version = "1.2";
+        version = "1.4";
         src = fetchFromGitHub {
           owner = "AnthonyDiGirolamo";
           repo = "airline-themes";
-          rev = "b7d06424ce7d596f5bff3105d3eaa416f173436a";
-          sha256 = "0q9m7lih760p7yrpqvpxdks5h6ac7dj4fi0qviyicbjlz9mqw7wp";
+          rev = "3c5f127daf1cf8a74e3c9956e11e56eedf5f3e76";
+          sha256 = "0blrpqn8wy9pwzikgzb0v6x4hk7axv93j4byfci62fh1905zfkkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/airline-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/airline-themes";
           sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
           name = "airline-themes";
         };
@@ -903,7 +903,7 @@
           sha256 = "0m05wxvvygc4rpkgnnmk6zrp3d8fylzzjz5ag7lh0jk5al4gfay5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alchemist";
           sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
           name = "alchemist";
         };
@@ -924,7 +924,7 @@
           sha256 = "1pk5dgjqrynap85700wdivq41bdqvwd5hkfimgmcd48l5lhj9pbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alect-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alect-themes";
           sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
           name = "alect-themes";
         };
@@ -945,7 +945,7 @@
           sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alert";
           sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
           name = "alert";
         };
@@ -966,7 +966,7 @@
           sha256 = "00kfnkr0rclzbir2xxzr9wf2g0hf1alc004v8i9mqf3ab6dgdqiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/amd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/amd-mode";
           sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
           name = "amd-mode";
         };
@@ -987,7 +987,7 @@
           sha256 = "0sj6cr2bghy80dnwgl7rg61abdlvgfzi0jjc7jrxz7fdzwkcq714";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anaconda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anaconda-mode";
           sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
           name = "anaconda-mode";
         };
@@ -1008,7 +1008,7 @@
           sha256 = "0fnxxvw81c34zhmiyr5awl92wr5941n4gklvzjc4jphaf2nhkg4w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anaphora";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anaphora";
           sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
           name = "anaphora";
         };
@@ -1029,7 +1029,7 @@
           sha256 = "0gjynmzqlqz0d57fb4np6xrklqdn11y4vjbm18rlpvmk92bgw740";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/android-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/android-mode";
           sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
           name = "android-mode";
         };
@@ -1050,7 +1050,7 @@
           sha256 = "1798nv4djhxzbin68zf6w7dbfm9sc39d0kygky52ii36arg5r1zp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angular-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angular-mode";
           sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
           name = "angular-mode";
         };
@@ -1071,7 +1071,7 @@
           sha256 = "0h9i0iimanbvhbqy0cj9na335rs961pvhxjj4k8y53qc73xm102a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angular-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angular-snippets";
           sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
           name = "angular-snippets";
         };
@@ -1092,7 +1092,7 @@
           sha256 = "18ninv1z8zdqpqnablbds4zgxgk4c1nmznlfdicj6qs738c5c30s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/annotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/annotate";
           sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
           name = "annotate";
         };
@@ -1113,7 +1113,7 @@
           sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/annoying-arrows-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/annoying-arrows-mode";
           sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
           name = "annoying-arrows-mode";
         };
@@ -1134,7 +1134,7 @@
           sha256 = "1hbddxarr40ygvaw4pwaivq2l4f0brszw73w1r50lkjlggb7bl3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansi";
           sha256 = "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1";
           name = "ansi";
         };
@@ -1155,7 +1155,7 @@
           sha256 = "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansible";
           sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
           name = "ansible";
         };
@@ -1176,7 +1176,7 @@
           sha256 = "05z379k6a7xq9d2zapf687x3f37jpmh6kfghpgxdd18v0hzca8ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansible-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansible-doc";
           sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
           name = "ansible-doc";
         };
@@ -1197,7 +1197,7 @@
           sha256 = "1i1xb04g17f6029w0n8fp55gklgr9kh6c24m9dfrkn5q3dlvd26p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anti-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anti-zenburn-theme";
           sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
           name = "anti-zenburn-theme";
         };
@@ -1218,7 +1218,7 @@
           sha256 = "1z6l72dn98icqsmxb3rrj6l63ijc3xgfa3vdl19yqa2rfy6ya721";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anyins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anyins";
           sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
           name = "anyins";
         };
@@ -1238,7 +1238,7 @@
           sha256 = "86b90766ccb31a492998299092a3d0b892a8ac0bdb8e1833ef75fa6d79c7c721";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything";
           sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj";
           name = "anything";
         };
@@ -1259,7 +1259,7 @@
           sha256 = "01lw9159axg5w9bpdy55m4zc902zmsqvk213ky1nmgnln0fvq3rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-exuberant-ctags";
           sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk";
           name = "anything-exuberant-ctags";
         };
@@ -1280,7 +1280,7 @@
           sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-replace-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-replace-string";
           sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71";
           name = "anything-replace-string";
         };
@@ -1301,7 +1301,7 @@
           sha256 = "1bcvin2694ypqgiw0mqk82riq7gw6ra10vbkzng1yp9jp2qr6wmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-sage";
           sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3";
           name = "anything-sage";
         };
@@ -1314,15 +1314,15 @@
     anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anzu";
-        version = "0.59";
+        version = "0.60";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-anzu";
-          rev = "6fded24b366efc4cf27166104c1928f7d1fedaa7";
-          sha256 = "1d2laybz1igrr9nnkmfsnrvsjw7qmrgby4wnrxprins9gq263lra";
+          rev = "dde4d83cfa4887db7deaf74232c9e051afb33050";
+          sha256 = "1dxaf68przg0hh0p1zhxsq2dysp3ln178yxhbqalxw67bjy8ikny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anzu";
           sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
           name = "anzu";
         };
@@ -1343,7 +1343,7 @@
           sha256 = "13j2r4nx2x6j3qx50d5rdnqd8nl5idxdkhizsk7ccz3v2607fbyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apples-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apples-mode";
           sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
           name = "apples-mode";
         };
@@ -1364,7 +1364,7 @@
           sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aproject";
           sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
           name = "aproject";
         };
@@ -1385,7 +1385,7 @@
           sha256 = "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/artbollocks-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/artbollocks-mode";
           sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
           name = "artbollocks-mode";
         };
@@ -1406,7 +1406,7 @@
           sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/asilea";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/asilea";
           sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
           name = "asilea";
         };
@@ -1427,7 +1427,7 @@
           sha256 = "0z91alzf4ajj3r7pnwazynvp81cg67csy9kf87fk98024xldpkdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/async";
           sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
           name = "async";
         };
@@ -1448,7 +1448,7 @@
           sha256 = "01ig5v5f2xya7hyq678nd8j8x972yfbni813c0imxkkba996a2k7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurel";
           sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
           name = "aurel";
         };
@@ -1469,7 +1469,7 @@
           sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurora-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurora-config-mode";
           sha256 = "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm";
           name = "aurora-config-mode";
         };
@@ -1490,7 +1490,7 @@
           sha256 = "0gi65n1np63zi2ylc4y1licwvk97jl92s1v98fv5y61kppi1d8sq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auth-password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auth-password-store";
           sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
           name = "auth-password-store";
         };
@@ -1511,7 +1511,7 @@
           sha256 = "07vnk8az4lcxncqn01jvks38b4hpdmg43nbby2b39zy50agqnwsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-compile";
           sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
           name = "auto-compile";
         };
@@ -1532,7 +1532,7 @@
           sha256 = "0q880dksf3bj1hixa4zhj3ybvrqf1wcnjnmb37i49qwdy6p1ma06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete";
           sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
           name = "auto-complete";
         };
@@ -1553,7 +1553,7 @@
           sha256 = "1kp2l1cgzlg2g3wllz4gl1ssn4lnx2sn26xqigfrpr8y5rj2bsfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-clang-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-clang-async";
           sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
           name = "auto-complete-clang-async";
         };
@@ -1574,7 +1574,7 @@
           sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-exuberant-ctags";
           sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
           name = "auto-complete-exuberant-ctags";
         };
@@ -1595,7 +1595,7 @@
           sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-nxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-nxml";
           sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
           name = "auto-complete-nxml";
         };
@@ -1616,7 +1616,7 @@
           sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-pcmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-pcmp";
           sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
           name = "auto-complete-pcmp";
         };
@@ -1637,7 +1637,7 @@
           sha256 = "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-sage";
           sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
           name = "auto-complete-sage";
         };
@@ -1658,7 +1658,7 @@
           sha256 = "191294k92qp8gmfypf0q8j8qrym96aqikzvyb9p03wqvbr3r1dsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-dictionary";
           sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
           name = "auto-dictionary";
         };
@@ -1679,7 +1679,7 @@
           sha256 = "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-indent-mode";
           sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
           name = "auto-indent-mode";
         };
@@ -1700,7 +1700,7 @@
           sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-package-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-package-update";
           sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
           name = "auto-package-update";
         };
@@ -1721,7 +1721,7 @@
           sha256 = "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-shell-command";
           sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
           name = "auto-shell-command";
         };
@@ -1742,7 +1742,7 @@
           sha256 = "0n3r7j83csby2s7284hy5pycynazyrkljxkn6xqn08gvxbbbdpdq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-yasnippet";
           sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
           name = "auto-yasnippet";
         };
@@ -1763,7 +1763,7 @@
           sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autodisass-java-bytecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autodisass-java-bytecode";
           sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
           name = "autodisass-java-bytecode";
         };
@@ -1784,7 +1784,7 @@
           sha256 = "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autodisass-llvm-bitcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autodisass-llvm-bitcode";
           sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
           name = "autodisass-llvm-bitcode";
         };
@@ -1805,7 +1805,7 @@
           sha256 = "0g6kd1r0wizamw26bhp5jkvpsd98rcybkfchc622b9v5b89a07nq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autopair";
           sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
           name = "autopair";
         };
@@ -1818,15 +1818,15 @@
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
-        version = "0.3.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "44d76b9d2aad5477521675747a5c769f3f9a69a0";
-          sha256 = "15xfgmsy4sqs3cmk7dwmj21g3r9dqb3fra7n7ly306bwgzh4vm8k";
+          rev = "369af594e5ea28be1d91b22753aace16baadc046";
+          sha256 = "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy";
           sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
           name = "avy";
         };
@@ -1836,6 +1836,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "avy-menu";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "avy-menu";
+          rev = "9b8c6be09487dd3e804a10761266c4f22923eb9c";
+          sha256 = "1564yv9330vjymw3xnikc2lz20f65n40fbl8m1zs1gp4nlgzkk38";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-menu";
+          sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw";
+          name = "avy-menu";
+        };
+        packageRequires = [ avy emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/avy-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
@@ -1847,7 +1868,7 @@
           sha256 = "098bkqb2cndjx93jacj6p54xfy14m1iknvpv1y5rffy9p4l2cbd3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-migemo";
           sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
           name = "avy-migemo";
         };
@@ -1868,7 +1889,7 @@
           sha256 = "0lmv34pi9qdh76fi3w4lrfyfhzr824nsiif4nyjvpnmrabxgk309";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-zap";
           sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
           name = "avy-zap";
         };
@@ -1889,7 +1910,7 @@
           sha256 = "0px1xggk6qyrwkma1p3d7b4z2id2gbrsxkliw3nwc1q4zndg1zr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/babel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/babel";
           sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
           name = "babel";
         };
@@ -1910,7 +1931,7 @@
           sha256 = "0hmn3jlsqgpc602lbcs9wzw0hgr5qpjdcxi2hjlc1cp27ilyscnf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/back-button";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/back-button";
           sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
           name = "back-button";
         };
@@ -1937,7 +1958,7 @@
           sha256 = "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/badwolf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/badwolf-theme";
           sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
           name = "badwolf-theme";
         };
@@ -1958,7 +1979,7 @@
           sha256 = "11rlmrjdpa3vnf0h9vcd75946q9jyf1mpbm7h12hmpj6g2pavgdd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bash-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bash-completion";
           sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
           name = "bash-completion";
         };
@@ -1979,7 +2000,7 @@
           sha256 = "1xvxz9sk9l57a4kiiavxxdp0v241mfgiy2lg5ilacq1cd6xrrhky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbcode-mode";
           sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
           name = "bbcode-mode";
         };
@@ -2000,7 +2021,7 @@
           sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-";
           sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
           name = "bbdb-";
         };
@@ -2021,7 +2042,7 @@
           sha256 = "0fg72qnb40djyciy4gzj359lqlcbbrq0indbkzd0dj09zipkx0df";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-vcard";
           sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
           name = "bbdb-vcard";
         };
@@ -2042,7 +2063,7 @@
           sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb2erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb2erc";
           sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
           name = "bbdb2erc";
         };
@@ -2063,7 +2084,7 @@
           sha256 = "01d10algmi9a4xd7mzf7n3zxfs2qf5as66wx17mff5cd8dahxj1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beeminder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beeminder";
           sha256 = "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx";
           name = "beeminder";
         };
@@ -2084,7 +2105,7 @@
           sha256 = "1agrci37bni1vfkxg171l53fvsnjdryhf05v54wj07jngnwf3cw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beginend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beginend";
           sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
           name = "beginend";
         };
@@ -2097,15 +2118,15 @@
     better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "better-defaults";
-        version = "0.1.2";
+        version = "0.1.3";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "better-defaults";
-          rev = "c286d55528f148733c696fe07eb01073dc412fb8";
-          sha256 = "09cn3dnaq88jwmmxfg76168s8f4wbmp6y2dv13rhwagihx9mf20m";
+          rev = "90df5752a0a0602feb47aadfd3542aa7fc841bd8";
+          sha256 = "1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/better-defaults";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/better-defaults";
           sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
           name = "better-defaults";
         };
@@ -2126,7 +2147,7 @@
           sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bind-key";
           sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
           name = "bind-key";
         };
@@ -2147,7 +2168,7 @@
           sha256 = "0pmpg54faq0l886f2cmnmwm28d2yfg8adk7gp7623gx0ifggn332";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bing-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bing-dict";
           sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
           name = "bing-dict";
         };
@@ -2168,7 +2189,7 @@
           sha256 = "1r3f5d67x257g8kvdbdsl4w3y1dvc1d6s9x8bygbkvyahfi5m5hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/birds-of-paradise-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/birds-of-paradise-plus-theme";
           sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
           name = "birds-of-paradise-plus-theme";
         };
@@ -2189,7 +2210,7 @@
           sha256 = "1j2ar9sinbrraqvymqmjray48xbr1arhpigzgkgnhkc2zzqv8dwb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bog";
           sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
           name = "bog";
         };
@@ -2210,7 +2231,7 @@
           sha256 = "1q3ws2vn062dh7ci6jn2k2bcn7szh3ap64sgwkzdd6f1pas37fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bongo";
           sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
           name = "bongo";
         };
@@ -2231,7 +2252,7 @@
           sha256 = "1apxgj14hgfpz6hjp3384yjf2zrkv4pcncf2zklijs668igvaskq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boon";
           sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
           name = "boon";
         };
@@ -2252,7 +2273,7 @@
           sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boxquote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
           name = "boxquote";
         };
@@ -2273,7 +2294,7 @@
           sha256 = "0y9m6cv70pzcm0v2v8nwmyh1xx40831chx72m85h5ic5db03gy7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-kill-ring";
           sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
           name = "browse-kill-ring";
         };
@@ -2294,7 +2315,7 @@
           sha256 = "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-url-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-url-dwim";
           sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
           name = "browse-url-dwim";
         };
@@ -2315,7 +2336,7 @@
           sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-flip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-flip";
           sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
           name = "buffer-flip";
         };
@@ -2336,7 +2357,7 @@
           sha256 = "0xdks4jfqyhkh34y48iq3gz8swp0f526kwnaai5mhgvazvs4za8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-move";
           sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
           name = "buffer-move";
         };
@@ -2357,7 +2378,7 @@
           sha256 = "0rp9hiysy13c4in7b420r7yjza2knlmvphj7l01xbxphbilplqk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-utils";
           sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
           name = "buffer-utils";
         };
@@ -2378,7 +2399,7 @@
           sha256 = "0x9q4amsmawi8jqj9xxg81khvb3gyyf9hjvb0w6vhrgjwpxiq8sy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bufshow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bufshow";
           sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
           name = "bufshow";
         };
@@ -2399,7 +2420,7 @@
           sha256 = "07jzg58a3jxs4mmsgb35f5f8awazlvzak9wrhif6xb60jq1wrp0v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bug-reference-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bug-reference-github";
           sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
           name = "bug-reference-github";
         };
@@ -2420,7 +2441,7 @@
           sha256 = "18d74nwcpk1i8adxzfwz1lgqqcxsc4wkrb490v64pph79dxsi80h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bundler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bundler";
           sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
           name = "bundler";
         };
@@ -2441,7 +2462,7 @@
           sha256 = "03hab3iw2jjckal20zwsw7cm38nf7pan0m96d8ab4i75phy6liyw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bury-successful-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bury-successful-compilation";
           sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
           name = "bury-successful-compilation";
         };
@@ -2462,7 +2483,7 @@
           sha256 = "1pii9dw4skq7nr4na6qxqasl36av8cwjp71bf1fgppqpcd9z8skj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/butler";
           sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
           name = "butler";
         };
@@ -2483,7 +2504,7 @@
           sha256 = "0lpfx7q0qrclxii4ffrrjffb678bsx908za91nsy7mc2g0cxcapb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buttercup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buttercup";
           sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
           name = "buttercup";
         };
@@ -2504,7 +2525,7 @@
           sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/button-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/button-lock";
           sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
           name = "button-lock";
         };
@@ -2525,7 +2546,7 @@
           sha256 = "1k2hmc87ifww95k3m8ksiswkk2z0y8grssba7381g8dnlp6jgprx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cacoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cacoo";
           sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
           name = "cacoo";
         };
@@ -2546,7 +2567,7 @@
           sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake";
           sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr";
           name = "cake";
         };
@@ -2567,7 +2588,7 @@
           sha256 = "1w7yq35gzzwyf480d8gc5r6jbnawg09l6663q068ir6zr9pp4far";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake-inflector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake-inflector";
           sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
           name = "cake-inflector";
         };
@@ -2588,7 +2609,7 @@
           sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake2";
           sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x";
           name = "cake2";
         };
@@ -2609,7 +2630,7 @@
           sha256 = "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/calfw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/calfw";
           sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
           name = "calfw";
         };
@@ -2630,7 +2651,7 @@
           sha256 = "0v927m3l5cf0j0rs0nfk5whwqmmxs941d8qalxi19j1ihspjz8d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/camcorder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/camcorder";
           sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
           name = "camcorder";
         };
@@ -2651,7 +2672,7 @@
           sha256 = "152d5ym4bqnlnp6rafgy8fafx8246n78ymlcx9k2nyfar4c0lir2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cargo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cargo";
           sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
           name = "cargo";
         };
@@ -2672,7 +2693,7 @@
           sha256 = "0mg49rpz362ipn5qzqhyfs3d6fpb51rfa73kna3gxdw0wxq2sa7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caseformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caseformat";
           sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
           name = "caseformat";
         };
@@ -2693,7 +2714,7 @@
           sha256 = "1hvm6r6a8rgjwnn2mcamwqrmhz424vlr4mbvbri3wmn0ikbk510l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cask";
           sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
           name = "cask";
         };
@@ -2714,7 +2735,7 @@
           sha256 = "0padb1zfjkmx9kbqnqh744qvpd3ln0khwxifxld9cpcpdp5k04vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cask-package-toolset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cask-package-toolset";
           sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
           name = "cask-package-toolset";
         };
@@ -2735,7 +2756,7 @@
           sha256 = "1j1lw5zifp7q1ykm6si0nzxfp7n3z2lzla2njkkxmc2s6m7w4x1a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caskxy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caskxy";
           sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
           name = "caskxy";
         };
@@ -2745,6 +2766,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cbm";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "akermu";
+          repo = "cbm.el";
+          rev = "2f319b3ea6d434f9f9f9ace53a0ca968f3787a4c";
+          sha256 = "125d5i7ycdn2hgffc1l3jqcfzvk70m1ciywj4h53qakkl15r9m38";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cbm";
+          sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn";
+          name = "cbm";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/cbm";
+          license = lib.licenses.free;
+        };
+      }) {};
     cdlatex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cdlatex";
@@ -2756,7 +2798,7 @@
           sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cdlatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cdlatex";
           sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
           name = "cdlatex";
         };
@@ -2777,7 +2819,7 @@
           sha256 = "07h5g905i1jglsryl0dnqxz8yya5kkyjjggzbk4nl3rcj41lyas7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/celery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/celery";
           sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
           name = "celery";
         };
@@ -2798,7 +2840,7 @@
           sha256 = "08hqgsjvs62l1cfzshbpj80xd8365qmx2b5r5jq20d5cj68s36wl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cerbere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cerbere";
           sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
           name = "cerbere";
         };
@@ -2811,15 +2853,15 @@
     cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cfengine-code-style";
-        version = "3.8.0.2.1";
+        version = "3.8.1";
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "afed90c14a2b30bc36595626b959522c34a6565f";
-          sha256 = "11a89pyz8zdjdkimpqaywp702xf9cmwz1djkjp5dghgpwi1aid72";
+          rev = "2df2383cc697250d996630d0a1f88e3a2f0e052b";
+          sha256 = "190gr30bscl80awilcjflwy9n7nvlz0hzmzmpx1wsa3wj3zf89yy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cfengine-code-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cfengine-code-style";
           sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
           name = "cfengine-code-style";
         };
@@ -2829,6 +2871,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "char-menu";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "char-menu";
+          rev = "5bdd7e880f89f27dbabe11def0fd31225b7f1c0a";
+          sha256 = "0vb03k10i8vwy5wv65xl15kcsh9zz4y2xhpgndih87ssckdnhhlw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/char-menu";
+          sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l";
+          name = "char-menu";
+        };
+        packageRequires = [ avy-menu emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/char-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
     charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "charmap";
@@ -2840,7 +2903,7 @@
           sha256 = "0crnd64cnsnaj5mcy55q0sc1rnamxa1xbpwpmirhyhxz780klww6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/charmap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/charmap";
           sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
           name = "charmap";
         };
@@ -2861,7 +2924,7 @@
           sha256 = "09ypxhfad3v1pz0xhw4xgxvfj7ad2kb3ff9zy1mnw7fzsa7gw6nj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/checkbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/checkbox";
           sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
           name = "checkbox";
         };
@@ -2882,7 +2945,7 @@
           sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-word-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-word-at-point";
           sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
           name = "chinese-word-at-point";
         };
@@ -2895,15 +2958,15 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "0.10.1";
+        version = "0.10.2";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "93e061b99c1e6f3098b098d884a37778dbca9825";
-          sha256 = "1amj1qad03b7hw6isxh1389mi4i9q0jym57csj95q4mgamgk9vhj";
+          rev = "336055e84b9685a7959fd05bc65a16febd8e83cc";
+          sha256 = "1bk7h7h6sqf1qb5lpmmigx7aviyw65dnj3724q55ld6pgpy5q6vz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider";
           sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
           name = "cider";
         };
@@ -2924,7 +2987,7 @@
           sha256 = "1rkd76561h93si4lpisz3qnaj48dx8x01nd59a3lgpqsbbibnccf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-eval-sexp-fu";
           sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
           name = "cider-eval-sexp-fu";
         };
@@ -2945,7 +3008,7 @@
           sha256 = "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cil-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cil-mode";
           sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
           name = "cil-mode";
         };
@@ -2966,7 +3029,7 @@
           sha256 = "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/circe";
           sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
           name = "circe";
         };
@@ -2987,7 +3050,7 @@
           sha256 = "12vgi5dicx3lxzngjcg9g3nflrhfy9wdw6ldm72zarp1h96jy5cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cl-lib-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cl-lib-highlight";
           sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
           name = "cl-lib-highlight";
         };
@@ -3008,7 +3071,7 @@
           sha256 = "11c0zpk8gg70d4xiiyjc7v13knwb2ihbrxnlaxzh3rdg2c12676q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cliphist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cliphist";
           sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
           name = "cliphist";
         };
@@ -3029,7 +3092,7 @@
           sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clips-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clips-mode";
           sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
           name = "clips-mode";
         };
@@ -3050,7 +3113,7 @@
           sha256 = "1w0lv2d916wxfakcy11avmn9f6nsmxff02dpyih5kx6ncgqv1bnd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clj-refactor";
           sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
           name = "clj-refactor";
         };
@@ -3080,7 +3143,7 @@
           sha256 = "18gv8vmmpiyq16cq4nr9nk2bmc5y2rsv21wjl4ji29rc7566shha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cljr-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
           name = "cljr-helm";
         };
@@ -3093,15 +3156,15 @@
     clocker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "clocker";
-        version = "0.0.10";
+        version = "0.0.11";
         src = fetchFromGitHub {
           owner = "roman";
           repo = "clocker.el";
-          rev = "6faf5a23dc9cbe506f21a11fae4f6c4bbb1d4b01";
-          sha256 = "1s05644m048clz0lxizzgarh1bkyjxr96b0mbpxi2p003322aw09";
+          rev = "4a4831ed4e42e18976edd16b844cb16cb78f3c17";
+          sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clocker";
           sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
           name = "clocker";
         };
@@ -3122,7 +3185,7 @@
           sha256 = "1x1kfycf3023z0r3v7xqci59k8jv5wn2vqc9y0nx7k5qgifmswrx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-cheatsheet";
           sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
           name = "clojure-cheatsheet";
         };
@@ -3135,15 +3198,15 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "5.1.0";
+        version = "5.2.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "126c23a9d905da7afd82917494648b5068d47f54";
-          sha256 = "1dkzbvmdyc6gwm8c67blv4a67p7mji417r0pcwzl8brfqlis9gsw";
+          rev = "412bb7ae57c59eb7c99b8273e5c94b38105b18af";
+          sha256 = "1bhgvj4w8k4ycndnxgfnifc065jbxq8vsxfz3s6w64qx54biqxj3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-mode";
           sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
           name = "clojure-mode";
         };
@@ -3156,15 +3219,15 @@
     clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode-extra-font-locking";
-        version = "5.1.0";
+        version = "5.2.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "126c23a9d905da7afd82917494648b5068d47f54";
-          sha256 = "1dkzbvmdyc6gwm8c67blv4a67p7mji417r0pcwzl8brfqlis9gsw";
+          rev = "412bb7ae57c59eb7c99b8273e5c94b38105b18af";
+          sha256 = "1bhgvj4w8k4ycndnxgfnifc065jbxq8vsxfz3s6w64qx54biqxj3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-mode-extra-font-locking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-mode-extra-font-locking";
           sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
           name = "clojure-mode-extra-font-locking";
         };
@@ -3185,7 +3248,7 @@
           sha256 = "0sw34yjp8934xd2n76lbwyvxkbyz5pxszj6gkflas8lfjvms9z7d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-quick-repls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-quick-repls";
           sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
           name = "clojure-quick-repls";
         };
@@ -3206,7 +3269,7 @@
           sha256 = "1p0w83m9j4a6va4g68a4gcfbdkp8nic0q8cm28l8nr7czd5s0yl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-snippets";
           sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
           name = "clojure-snippets";
         };
@@ -3227,7 +3290,7 @@
           sha256 = "1bhnlcsvl1qsi36a5kz8i857spzybprsbsywpqrmjpndn74n8690";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cm-mode";
           sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
           name = "cm-mode";
         };
@@ -3248,7 +3311,7 @@
           sha256 = "14z5izpgby7lak6hzjwsph31awg5126hcjzld21ihknhlg09sw7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-ide";
           sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
           name = "cmake-ide";
         };
@@ -3261,15 +3324,15 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.4.1";
+        version = "3.5.0pre1";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "fd7180f0c0c2554c31afda235469df986a109fe4";
-          sha256 = "054i416l7kwdnwlb55ya89zpnsyxg9h4b2ll3d4dhx2qpph7w9s2";
+          rev = "8a8d22cf1e5d20b7c3b32c1ec9b5f06b339c2a50";
+          sha256 = "1yppsh0sh2m8m4x34abdiq1d2k7g4gjhf24m9av0h5kg8kd46f2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-mode";
           sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
           name = "cmake-mode";
         };
@@ -3290,7 +3353,7 @@
           sha256 = "10xlny2agxjknvnjdnw41cyb3d361yy0wvpc8l1d0xwnmmfh3bxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-project";
           sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
           name = "cmake-project";
         };
@@ -3311,7 +3374,7 @@
           sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/codic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/codic";
           sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
           name = "codic";
         };
@@ -3332,7 +3395,7 @@
           sha256 = "1axp9hixp4vgaqjd3ii9xwb32jhb964zclmpg3zpsl4rp8b9bdz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/coffee-mode";
           sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
           name = "coffee-mode";
         };
@@ -3353,7 +3416,7 @@
           sha256 = "0q9ss11i31iiv0vn8238922fkic7j6d02f9ykbip04sm46p5k6kj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-modern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-modern";
           sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
           name = "color-theme-modern";
         };
@@ -3374,7 +3437,7 @@
           sha256 = "13jmg05skv409z8pg5m9rzkajj9knyln0ff8a3i1pbpyrnpngmmc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-sanityinc-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-sanityinc-solarized";
           sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
           name = "color-theme-sanityinc-solarized";
         };
@@ -3395,7 +3458,7 @@
           sha256 = "0w99ypq048xldl1mrgc7qr4n2770dm48aknhp7q0176l43nvxnqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-sanityinc-tomorrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-sanityinc-tomorrow";
           sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
           name = "color-theme-sanityinc-tomorrow";
         };
@@ -3416,7 +3479,7 @@
           sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/colorsarenice-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/colorsarenice-theme";
           sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
           name = "colorsarenice-theme";
         };
@@ -3437,7 +3500,7 @@
           sha256 = "1j6hhyzww7wfwk6bllbb5mk4hw4qs8hsgfbfdifsam9c6i4spm45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/commander";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commander";
           sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
           name = "commander";
         };
@@ -3458,7 +3521,7 @@
           sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/comment-dwim-2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/comment-dwim-2";
           sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
           name = "comment-dwim-2";
         };
@@ -3468,6 +3531,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "commenter";
+        version = "0.5.1";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "commenter";
+          rev = "eec3bf91a57ff3aa3b93c36611e136572f031571";
+          sha256 = "1jvjwk776p9qrbr3j0368nqv8ydp8k0s6c66nfpcqf33rz4w1h1g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commenter";
+          sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3";
+          name = "commenter";
+        };
+        packageRequires = [ emacs let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/commenter";
+          license = lib.licenses.free;
+        };
+      }) {};
     common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "common-lisp-snippets";
@@ -3479,7 +3563,7 @@
           sha256 = "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/common-lisp-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/common-lisp-snippets";
           sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
           name = "common-lisp-snippets";
         };
@@ -3500,7 +3584,7 @@
           sha256 = "08rrjfp2amgya1hswjz3vd5ja6lg2nfmm7454p0h1naz00hlmmw0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company";
           sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
           name = "company";
         };
@@ -3521,7 +3605,7 @@
           sha256 = "1i6788qfinh47c5crgr57ykgbp6bvk1afcl00c8gywxsf8srvnvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-anaconda";
           sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
           name = "company-anaconda";
         };
@@ -3542,7 +3626,7 @@
           sha256 = "1dds3fynbd6yb0874aw6g4qk5zmq3pgl3jmcp38md027qalgqmym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ansible";
           sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
           name = "company-ansible";
         };
@@ -3563,7 +3647,7 @@
           sha256 = "1pja44g15d11kl47abzykrp28j782nkbmb0db0ilpc96xf1fjlsw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-cabal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-cabal";
           sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
           name = "company-cabal";
         };
@@ -3584,7 +3668,7 @@
           sha256 = "1f8sjjms9kxni153pia6b45p2ih2mhm2r07d0j3fmxmz3q2jdldd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-emoji";
           sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
           name = "company-emoji";
         };
@@ -3605,7 +3689,7 @@
           sha256 = "0y9i0q37xjbnlnlxq7xjvnpn6ykzbd55g6nbw10z1wg0m2v7f96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ghc";
           sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
           name = "company-ghc";
         };
@@ -3626,7 +3710,7 @@
           sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-go";
           sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
           name = "company-go";
         };
@@ -3647,7 +3731,7 @@
           sha256 = "1gdsaa8zcs3layivn3ndbd5z1zflblmbxl251ld67bq763ga49cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-irony";
           sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
           name = "company-irony";
         };
@@ -3668,7 +3752,7 @@
           sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-jedi";
           sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
           name = "company-jedi";
         };
@@ -3689,7 +3773,7 @@
           sha256 = "009f0p0sggfn0yz7sivkcv8zygvv4ssbwqykbxgdxh9n6zk4hjky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-math";
           sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
           name = "company-math";
         };
@@ -3710,7 +3794,7 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-nixos-options";
           sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
           name = "company-nixos-options";
         };
@@ -3731,7 +3815,7 @@
           sha256 = "0hg3wrfhz3qlfb6zv6j5a4xzmm4jk25pkv8h3ryg7sl7h602idgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-quickhelp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-quickhelp";
           sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
           name = "company-quickhelp";
         };
@@ -3752,7 +3836,7 @@
           sha256 = "0i1fh5lvqwlgn3g3fzh0xacxyljx6gkryipn133vfkv4jbns51n4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-restclient";
           sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
           name = "company-restclient";
         };
@@ -3779,7 +3863,7 @@
           sha256 = "1l9xrw88wq32wm3qx922ihdb9mlv9rrdalwvz9i2790fmw7y84vz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-sourcekit";
           sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
           name = "company-sourcekit";
         };
@@ -3800,7 +3884,7 @@
           sha256 = "11cinjsyf24d4a682ikniprxd1vkwn6mynsp5dzab6yzq09np78i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-tern";
           sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
           name = "company-tern";
         };
@@ -3821,7 +3905,7 @@
           sha256 = "0b0k75rg43h48dbcqiid947nspqiqxkiqcmvph9aqpxlfr67bz5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-web";
           sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
           name = "company-web";
         };
@@ -3842,7 +3926,7 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ycmd";
           sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
           name = "company-ycmd";
         };
@@ -3863,7 +3947,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/concurrent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/concurrent";
           sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
           name = "concurrent";
         };
@@ -3884,7 +3968,7 @@
           sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/conkeror-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/conkeror-minor-mode";
           sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
           name = "conkeror-minor-mode";
         };
@@ -3905,7 +3989,7 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/connection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/connection";
           sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
           name = "connection";
         };
@@ -3915,6 +3999,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    contextual = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "contextual";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "lshift-de";
+          repo = "contextual";
+          rev = "8134a2d8034c624f4fdbbb0b3893de12f4257909";
+          sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/contextual";
+          sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
+          name = "contextual";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/contextual";
+          license = lib.licenses.free;
+        };
+      }) {};
     corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "corral";
@@ -3926,7 +4031,7 @@
           sha256 = "0gpckp12b0hllgn821q3rqfxh5h7ny5gfhhvfdbvszb7kwl1f6cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/corral";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/corral";
           sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
           name = "corral";
         };
@@ -3947,7 +4052,7 @@
           sha256 = "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/counsel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/counsel";
           sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
           name = "counsel";
         };
@@ -3968,7 +4073,7 @@
           sha256 = "03nzbrvvs31xgaqhxmrj9bypywsg42q06k4z4z1fpjssg9az0j4p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cpputils-cmake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cpputils-cmake";
           sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
           name = "cpputils-cmake";
         };
@@ -3989,7 +4094,7 @@
           sha256 = "169ai0xkh3988racnhaapxw0v1pbxvcaq470x1qacdzdpka4a7bs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/creds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/creds";
           sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
           name = "creds";
         };
@@ -4010,7 +4115,7 @@
           sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crm-custom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crm-custom";
           sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
           name = "crm-custom";
         };
@@ -4031,7 +4136,7 @@
           sha256 = "1way14a4rhrqkby40wr21q6yxhl4qi0a0x89jzf21jdzsbykvaik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crux";
           sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
           name = "crux";
         };
@@ -4052,7 +4157,7 @@
           sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cryptol-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cryptol-mode";
           sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
           name = "cryptol-mode";
         };
@@ -4073,7 +4178,7 @@
           sha256 = "0dqih7cy57sciqn5vz5fiwynpld96qldyl7jcgn9qpwnzb401ayx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/csharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/csharp-mode";
           sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
           name = "csharp-mode";
         };
@@ -4094,7 +4199,7 @@
           sha256 = "13zq8kym1y6bzrpxbcdz32323a6azy5px4ridff6xh8bfprwlay3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctable";
           sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
           name = "ctable";
         };
@@ -4113,7 +4218,7 @@
           sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctags";
           sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
           name = "ctags";
         };
@@ -4134,7 +4239,7 @@
           sha256 = "05vhryqcydvcfm18fwby344931kzzh47x4l5ixy95xkcjkzrj8c7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctags-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctags-update";
           sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
           name = "ctags-update";
         };
@@ -4155,7 +4260,7 @@
           sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctxmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctxmenu";
           sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
           name = "ctxmenu";
         };
@@ -4176,7 +4281,7 @@
           sha256 = "1y685qfdkjyl7dwyvivlgc2lwp102vy6hvcb9zynw84c49f726sn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cuda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cuda-mode";
           sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
           name = "cuda-mode";
         };
@@ -4189,15 +4294,15 @@
     cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cyberpunk-theme";
-        version = "1.16";
+        version = "1.17";
         src = fetchFromGitHub {
           owner = "n3mo";
           repo = "cyberpunk-theme.el";
-          rev = "08ac966ce38be4a3de0a6f6051b8763b5c85e534";
-          sha256 = "12lkhlsi48wc5cy3zw57wihh9d4ixs2mcbvz9mdgjyhc2xhx3na8";
+          rev = "4ffdaee0a32b8e235bf44c0daedde66eaf7b1b33";
+          sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cyberpunk-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cyberpunk-theme";
           sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
           name = "cyberpunk-theme";
         };
@@ -4218,7 +4323,7 @@
           sha256 = "1vkwm1n0amf0y0jdyvqskp00b6aijqhd7wclzkzrq7glrvj2z1xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cyphejor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cyphejor";
           sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
           name = "cyphejor";
         };
@@ -4239,7 +4344,7 @@
           sha256 = "0kbk2gp2avp0da32mr003ziigmi98zi0fvwia4knylllmrkl3pvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cython-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cython-mode";
           sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
           name = "cython-mode";
         };
@@ -4260,7 +4365,7 @@
           sha256 = "0apg6cpwjhp8spqq8yyfp56y3pn991sfc85kfnifyhz6v3y6vwv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/d-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/d-mode";
           sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
           name = "d-mode";
         };
@@ -4281,7 +4386,7 @@
           sha256 = "1gdh4izwhyly6dyrmh7lfpd12gnb8hpnafj8br51ksijsssrf21f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darcula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darcula-theme";
           sha256 = "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg";
           name = "darcula-theme";
         };
@@ -4302,7 +4407,7 @@
           sha256 = "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darktooth-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
           name = "darktooth-theme";
         };
@@ -4323,7 +4428,7 @@
           sha256 = "1vkn95dyc0pppnflyqlrlx32g9zc7wdcgc9fgf1hgvqp313ydfcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dart-mode";
           sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
           name = "dart-mode";
         };
@@ -4344,7 +4449,7 @@
           sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash";
           sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
           name = "dash";
         };
@@ -4365,7 +4470,7 @@
           sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash-functional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash-functional";
           sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
           name = "dash-functional";
         };
@@ -4386,7 +4491,7 @@
           sha256 = "06aprbhhxb6bbzmf0r5yq2ry6x7708vp4d94ja3ir6zcwc96wn0k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/date-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/date-at-point";
           sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
           name = "date-at-point";
         };
@@ -4407,7 +4512,7 @@
           sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/date-field";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/date-field";
           sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
           name = "date-field";
         };
@@ -4428,7 +4533,7 @@
           sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dedicated";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dedicated";
           sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
           name = "dedicated";
         };
@@ -4449,7 +4554,7 @@
           sha256 = "031f8ls1q80j717cg6b4pjd37wk7vrl5hcycsn8ca7yssmqa8q81";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/default-text-scale";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/default-text-scale";
           sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
           name = "default-text-scale";
         };
@@ -4470,7 +4575,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/deferred";
           sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
           name = "deferred";
         };
@@ -4491,7 +4596,7 @@
           sha256 = "1lyqd9cgj7cb2lasf6ycw5j8wnsx2nrfm8ra4sg3dgcspm01a89g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/define-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/define-word";
           sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
           name = "define-word";
         };
@@ -4510,7 +4615,7 @@
           sha256 = "eb5c178337c0bd6a001114aac685bb0d23167050970274203d93c1c0caece1e8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/deft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/deft";
           sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
           name = "deft";
         };
@@ -4531,7 +4636,7 @@
           sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/demangle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/demangle-mode";
           sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
           name = "demangle-mode";
         };
@@ -4552,7 +4657,7 @@
           sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/describe-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/describe-number";
           sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
           name = "describe-number";
         };
@@ -4573,7 +4678,7 @@
           sha256 = "184zi5fv7ranghfx1hpx7j2wnk6kim8ysliyw2c5c1294sxxq3f3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/desktop+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/desktop+";
           sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
           name = "desktop-plus";
         };
@@ -4593,7 +4698,7 @@
           sha256 = "7c7727dd1d63be98e428700bfe340f2c4e7ff713fcc9b2b743a3366d786ae02d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/desktop-registry";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/desktop-registry";
           sha256 = "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr";
           name = "desktop-registry";
         };
@@ -4614,7 +4719,7 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dictionary";
           sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
           name = "dictionary";
         };
@@ -4627,15 +4732,15 @@
     diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "diff-hl";
-        version = "1.8.2";
+        version = "1.8.3";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "diff-hl";
-          rev = "d0e6660ee501efea3e9b0936ed64fff09e66df02";
-          sha256 = "09fdhpi6qqq5s5mwqz56631jk8l1g0lh4zl62nq4982pl6sciqk9";
+          rev = "f4edea201bc4c38d082ec3143ceec87d2dcadb37";
+          sha256 = "0sjwpvzd4x9c1b9iv66b33llvp96ryyzyp8pn1rnhvxfvjv43cnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diff-hl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diff-hl";
           sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
           name = "diff-hl";
         };
@@ -4656,7 +4761,7 @@
           sha256 = "1ci2gmyl0i736b2sxh77fyg4hs2pkn6rn9z7v2hzv6xlgqd6j3z6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diffview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diffview";
           sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
           name = "diffview";
         };
@@ -4677,7 +4782,7 @@
           sha256 = "0jzwaivsqh66py9hd3dg1ys5rc3p6pn8ndpwpvgyivk4pg6zhhj6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/digistar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/digistar-mode";
           sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
           name = "digistar-mode";
         };
@@ -4698,7 +4803,7 @@
           sha256 = "1vrd74vmm60gb69a4in412mjncnhkjbfpakpaa6w9rj7w4kyfiz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dim";
           sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
           name = "dim";
         };
@@ -4719,7 +4824,7 @@
           sha256 = "0bw1gkaycbbv2glnaa36gwzkl1l6lsq7i2i7jinka92b27zvrans";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dim-autoload";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dim-autoload";
           sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
           name = "dim-autoload";
         };
@@ -4740,7 +4845,7 @@
           sha256 = "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diminish";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diminish";
           sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
           name = "diminish";
         };
@@ -4761,7 +4866,7 @@
           sha256 = "1xg9cschjd2m0zal296q54ifk5i4s1s3azwfdkbgshxxgvxaky0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dionysos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dionysos";
           sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
           name = "dionysos";
         };
@@ -4771,6 +4876,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-atool";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "dired-atool";
+          rev = "608675ead3bd57c180e6ef493aef04d9ac4035a3";
+          sha256 = "0k4grfphl2ap8npnfrc8q3xv7nm3jc1lgblgxb1v8jm585ycb7fd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool";
+          sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w";
+          name = "dired-atool";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-atool";
+          license = lib.licenses.free;
+        };
+      }) {};
     dired-efap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-efap";
@@ -4782,7 +4908,7 @@
           sha256 = "1m0nx8wd6q56qbp5mbp9n466kyglrz34nflwvgd1qnmi08jwswgv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-efap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-efap";
           sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
           name = "dired-efap";
         };
@@ -4803,7 +4929,7 @@
           sha256 = "0lrc4082ghg77x5jl26hj8c7cp48yjvqhv4g3j0pznpzb4qyfnq0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-fdclone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-fdclone";
           sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
           name = "dired-fdclone";
         };
@@ -4824,7 +4950,7 @@
           sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-imenu";
           sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
           name = "dired-imenu";
         };
@@ -4845,7 +4971,7 @@
           sha256 = "0rpln6m3j4xbhrmmz18hby6xpzpzbf1c5hr7bxvna265cb0i5rn7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-k";
           sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
           name = "dired-k";
         };
@@ -4866,7 +4992,7 @@
           sha256 = "0mfvyjbx7l7a1sfq47m6rb507xxw92nykkkpzmi2mpwv30f1c22j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-single";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-single";
           sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
           name = "dired-single";
         };
@@ -4887,7 +5013,7 @@
           sha256 = "0p8c2hjgr81idm1psv3i3v5hr5rv0875ig8app2yqjwzvl0nn73f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/direx";
           sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
           name = "direx";
         };
@@ -4908,7 +5034,7 @@
           sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/direx-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/direx-grep";
           sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
           name = "direx-grep";
         };
@@ -4929,7 +5055,7 @@
           sha256 = "0qxw30zrlcxhxb0alrgyiclrk44dysal8xsbz2mvgrb6jli8wg18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover";
           sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
           name = "discover";
         };
@@ -4950,7 +5076,7 @@
           sha256 = "1wlqyl03hhnflbyay3qlvdzqzvv5rbybcjpfddggda7ias9h0pr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover-my-major";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover-my-major";
           sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
           name = "discover-my-major";
         };
@@ -4971,7 +5097,7 @@
           sha256 = "1b1a1bwc6nv6wkd8jg1cqmjb9m9pxi5i2wbrz97fgii23dwfmlnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dispass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dispass";
           sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
           name = "dispass";
         };
@@ -4992,7 +5118,7 @@
           sha256 = "06vb6r1k9ml799h44fm9jhf3amldzhawxnm0lnr501hrmj4bz36x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docker";
           sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
           name = "docker";
         };
@@ -5013,7 +5139,7 @@
           sha256 = "1cmh8pwwa6dhl4w66wy8s5yqxs326mnaalg1ig2yhl4bjk8gi4m2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dockerfile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dockerfile-mode";
           sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
           name = "dockerfile-mode";
         };
@@ -5023,6 +5149,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "doom";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "doom";
+          rev = "5e2d3f54e5b84eaa533cbdb6cf17b1b6009f0730";
+          sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doom";
+          sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl";
+          name = "doom";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/doom";
+          license = lib.licenses.free;
+        };
+      }) {};
     downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "downplay-mode";
@@ -5034,7 +5181,7 @@
           sha256 = "13czcxmmvy4g9ysfjr6lb91c0fqv1xv8ppd27wbfsrgxm3aaqimb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/downplay-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/downplay-mode";
           sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
           name = "downplay-mode";
         };
@@ -5055,7 +5202,7 @@
           sha256 = "1x7hyj5qi9f222zwhwjqr98zzcvqjqfwxlglph8nsbadkv4s8c3v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dracula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dracula-theme";
           sha256 = "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r";
           name = "dracula-theme";
         };
@@ -5076,7 +5223,7 @@
           sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/draft-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/draft-mode";
           sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
           name = "draft-mode";
         };
@@ -5097,7 +5244,7 @@
           sha256 = "0wncdlc45flggn6sq5a95y7k6q11hy7zxp0ddhsjqccl30mdwax5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drag-stuff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drag-stuff";
           sha256 = "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc";
           name = "drag-stuff";
         };
@@ -5118,7 +5265,7 @@
           sha256 = "12lxqrcfv5salmcslw3kggymcwwc0lzq1b6iqd7x4zizp0sjf09s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drupal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drupal-mode";
           sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
           name = "drupal-mode";
         };
@@ -5139,7 +5286,7 @@
           sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drupal-spell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drupal-spell";
           sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
           name = "drupal-spell";
         };
@@ -5160,7 +5307,7 @@
           sha256 = "17yldk76mxakhb90bma7r4z9jgx02wankgk17r2di196mc04bj7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ducpel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ducpel";
           sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
           name = "ducpel";
         };
@@ -5180,7 +5327,7 @@
           sha256 = "0ghxnzi2iy1g633fshl9wdpg2asrcl0v5rkk61gqd6axm7fjaxcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dyalog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
           name = "dyalog-mode";
         };
@@ -5201,7 +5348,7 @@
           sha256 = "1ppwlill1z4vqd566h9zi6zx5jb7hggmnmqrga84j5n7fwqvgz7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dynamic-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dynamic-fonts";
           sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
           name = "dynamic-fonts";
         };
@@ -5222,7 +5369,7 @@
           sha256 = "05z7gshrn7wp0qkb9ns6rgmcp375yllmkwhdsm4amg0dk3j2slbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dynamic-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dynamic-ruler";
           sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
           name = "dynamic-ruler";
         };
@@ -5243,7 +5390,7 @@
           sha256 = "0g0cz5a0vf31w27ljq5sn52mq15ynadl6cfbb97ja5zj1zxsxgjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm";
           sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
           name = "e2wm";
         };
@@ -5264,7 +5411,7 @@
           sha256 = "1yf081rac0chvkjha9z9xi1p983gmhjph0hai6ppsz5hzf2vikpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-R";
           sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
           name = "e2wm-R";
         };
@@ -5285,7 +5432,7 @@
           sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-direx";
           sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
           name = "e2wm-direx";
         };
@@ -5306,7 +5453,7 @@
           sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-pkgex4pl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-pkgex4pl";
           sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
           name = "e2wm-pkgex4pl";
         };
@@ -5327,7 +5474,7 @@
           sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-sww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-sww";
           sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
           name = "e2wm-sww";
         };
@@ -5348,7 +5495,7 @@
           sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-term";
           sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
           name = "e2wm-term";
         };
@@ -5369,7 +5516,7 @@
           sha256 = "0r56nqrj6iaz57ys6hqdq5qkyliv7dj6dv274l228r7x0axrwd9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-kill";
           sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
           name = "easy-kill";
         };
@@ -5390,7 +5537,7 @@
           sha256 = "18fdlxz9k961k8wafdw0gq0y514bvrfvx6qc1lmm4pk3gdcfbbi0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-kill-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-kill-extras";
           sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
           name = "easy-kill-extras";
         };
@@ -5411,7 +5558,7 @@
           sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-repeat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-repeat";
           sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
           name = "easy-repeat";
         };
@@ -5424,15 +5571,15 @@
     ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ebal";
-        version = "0.1.2";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ebal";
-          rev = "bd8bca3a57d390c22862179db0afca7008831dd7";
-          sha256 = "0nb0p82fx1qp1q9id88wlfqfvfbqqr20541s59snln1pa25s2agm";
+          rev = "4d2ffa7ffbdfd6ee8a39a268e7c7c0de0905df6b";
+          sha256 = "0ysym38xaqyx1wc7xd3fvjm62dmiq4727dnjvyxv7hs4czff1gcb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ebal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
           name = "ebal";
         };
@@ -5453,7 +5600,7 @@
           sha256 = "159w19hx3gmhv8n2amkm6i999vdrz5132bjwk28qpiq37v1v7dd5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ebib";
           sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
           name = "ebib";
         };
@@ -5474,7 +5621,7 @@
           sha256 = "1s9r1qj7cjsjvvphdpyjff6y598xpbrm9qjv5ncq15w6ac7yxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ecb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ecb";
           sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
           name = "ecb";
         };
@@ -5495,7 +5642,7 @@
           sha256 = "1r5hlcspznvfm111l1z0r4isd582qj64sa8cqk6hyi3y1hyp1xxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ecukes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ecukes";
           sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
           name = "ecukes";
         };
@@ -5516,7 +5663,7 @@
           sha256 = "0xy3q68i47a3s81jwr0rdvc1722bp78ng56xm53pri05g1z0db9s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi";
           sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
           name = "edbi";
         };
@@ -5537,7 +5684,7 @@
           sha256 = "10c84aad1lnr7z9f75k5ylgchykr3srcdmn88hlcx2n2c4jfbkds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-indirect";
           sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
           name = "edit-indirect";
         };
@@ -5558,7 +5705,7 @@
           sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-list";
           sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
           name = "edit-list";
         };
@@ -5579,7 +5726,7 @@
           sha256 = "12dp1xj09jrp0kxp9xb6cak9dn6zkyis1wfn4fnhzmxxnrd8c5rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-server";
           sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
           name = "edit-server";
         };
@@ -5592,15 +5739,15 @@
     editorconfig = callPackage ({ editorconfig-core, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "0.7.0";
+        version = "0.7.2";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
-          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+          rev = "460be7416529ceecd3647f7e15d1d20a202f12b7";
+          sha256 = "03vgcvxpp8inlhmxkd2cpp7ywjbl0ccz0lq7s46212dpk99fbd91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig";
           sha256 = "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35";
           name = "editorconfig";
         };
@@ -5613,15 +5760,15 @@
     editorconfig-core = callPackage ({ cl-lib ? null, editorconfig-fnmatch, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-core";
-        version = "0.7.0";
+        version = "0.7.2";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
-          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+          rev = "460be7416529ceecd3647f7e15d1d20a202f12b7";
+          sha256 = "03vgcvxpp8inlhmxkd2cpp7ywjbl0ccz0lq7s46212dpk99fbd91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig-core";
           sha256 = "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r";
           name = "editorconfig-core";
         };
@@ -5634,15 +5781,15 @@
     editorconfig-fnmatch = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-fnmatch";
-        version = "0.7.0";
+        version = "0.7.2";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
-          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+          rev = "460be7416529ceecd3647f7e15d1d20a202f12b7";
+          sha256 = "03vgcvxpp8inlhmxkd2cpp7ywjbl0ccz0lq7s46212dpk99fbd91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig-fnmatch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig-fnmatch";
           sha256 = "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv";
           name = "editorconfig-fnmatch";
         };
@@ -5663,7 +5810,7 @@
           sha256 = "06v34l9dkykrrdfpnm3zi5wjm0fdvy76pbkfnk92wqkjp8fqimhd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edn";
           sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
           name = "edn";
         };
@@ -5684,7 +5831,7 @@
           sha256 = "1a1apa48n24yisd2zw5k4lfkngx3016x6y11qi80hg75vrnmg7f1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edts";
           sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
           name = "edts";
         };
@@ -5705,7 +5852,7 @@
           sha256 = "1ryb7smvf66hk307yazkjn9bqzbwzbyyb5db200fq6j2zdjwsmaj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/egg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/egg";
           sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
           name = "egg";
         };
@@ -5726,7 +5873,7 @@
           sha256 = "16m7h477z10bmaymmgpj2id6l98iyrsp5wf69wd56534kh6qcajg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/egison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/egison-mode";
           sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
           name = "egison-mode";
         };
@@ -5745,7 +5892,7 @@
           sha256 = "3f41ade3332a3f1dc5cfb0b33077396feb7b683b2cf2c235b7a5f07f0b2e3271";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eide";
           sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
           name = "eide";
         };
@@ -5766,7 +5913,7 @@
           sha256 = "1si9zk4iwgkfn5p9x48hy1laz8r5m5vbyahy1andxrfxnb9fi0kj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ein";
           sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
           name = "ein";
         };
@@ -5787,7 +5934,7 @@
           sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-autoyas";
           sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
           name = "el-autoyas";
         };
@@ -5808,7 +5955,7 @@
           sha256 = "1awyh9ffd6a4cia239s89asb88ddqlnrv757d76vcb701pq412bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-get";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-get";
           sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
           name = "el-get";
         };
@@ -5829,7 +5976,7 @@
           sha256 = "1mzla7ijmq1mgzr6bf16mjdycbf8ylsf4zdk4j6fh5kw5n4k6c5n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-init";
           sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
           name = "el-init";
         };
@@ -5850,7 +5997,7 @@
           sha256 = "1488wv0f9ihzzf9fl8cki044k61b0kva604hdwpb2qk9gnjr4g1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-init-viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-init-viewer";
           sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
           name = "el-init-viewer";
         };
@@ -5871,7 +6018,7 @@
           sha256 = "13mv1rhgkwiww2wh5w926jz7idppp492wir1vdl245c5x50dh4f7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-mock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-mock";
           sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
           name = "el-mock";
         };
@@ -5892,7 +6039,7 @@
           sha256 = "0390pfgfgj7hwfmkwikwhip0hmwkgx784l529cqvalc31jchi94i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-spice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-spice";
           sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
           name = "el-spice";
         };
@@ -5913,7 +6060,7 @@
           sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-x";
           sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
           name = "el-x";
         };
@@ -5934,7 +6081,7 @@
           sha256 = "0hlj6jn9gmi00sqghxswkxpgk65c4gy2k7010vpkr2257rd4f3gq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elang";
           sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
           name = "elang";
         };
@@ -5955,7 +6102,7 @@
           sha256 = "1fh9dx669czkwy4msylcg64azz3az27akx55ipnazb5ghmsi7ivk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eldoc-eval";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eldoc-eval";
           sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
           name = "eldoc-eval";
         };
@@ -5976,7 +6123,7 @@
           sha256 = "1bqdg5sr4hkiqndr4hcdjscfdyj56jb4wr1kqgwy1hy4ccr9mkrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/electric-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/electric-operator";
           sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
           name = "electric-operator";
         };
@@ -5997,7 +6144,7 @@
           sha256 = "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed";
           sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
           name = "elfeed";
         };
@@ -6018,7 +6165,7 @@
           sha256 = "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed-web";
           sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
           name = "elfeed-web";
         };
@@ -6039,7 +6186,7 @@
           sha256 = "1k7kprdknqm18dc0nwl7gachm0rivcpa8ng7p7ximalja3nsg2j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-slime-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-slime-nav";
           sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
           name = "elisp-slime-nav";
         };
@@ -6060,7 +6207,7 @@
           sha256 = "07kgzdla31nc146xya21rn4hyr76h5lyabla8yh4qjsvnknb7cbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elixir-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elixir-mode";
           sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
           name = "elixir-mode";
         };
@@ -6081,7 +6228,7 @@
           sha256 = "0dx5h3sfccc2bp1jxnqqki95x5hp1skw8n5n4lnh703yjga5gkrz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elixir-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elixir-yasnippets";
           sha256 = "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a";
           name = "elixir-yasnippets";
         };
@@ -6094,15 +6241,15 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "0.9.1";
+        version = "0.9.3";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "74fc1abaef7d3ead80d1bc032d3cd406b7260ed8";
-          sha256 = "1x92r1y9d7jssjnlcx1qbw1dqdghfmmmx603296401w1pdcrhl6r";
+          rev = "61671af42d2162b06ee06b4857bc4a63bf82a57b";
+          sha256 = "0cjxvmsfjki8zal31zbf4ynf7i0gy5vykpq6858qpa68vkd1p0iz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elm-mode";
           sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
           name = "elm-mode";
         };
@@ -6123,7 +6270,7 @@
           sha256 = "0l2iincskpks9yvj3y9zh1b48xli1q39wybr5n96rys5gv0drc9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elmacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elmacro";
           sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
           name = "elmacro";
         };
@@ -6144,7 +6291,7 @@
           sha256 = "080nnw6ddsczbm7gk50x4dkahi77fsybfiki5iyp39fjpa7lfzq3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elmine";
           sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
           name = "elmine";
         };
@@ -6165,7 +6312,7 @@
           sha256 = "1q4krfrc2dy0vr7q148msfpkcwj55mlsrn4n5xjnya4xj0134ib7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpa-audit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpa-audit";
           sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
           name = "elpa-audit";
         };
@@ -6186,7 +6333,7 @@
           sha256 = "1hjmvn3kls63alh0ihb5c8gf90lrfvq1hxrlf4162qiaa0s15f8a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpa-mirror";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpa-mirror";
           sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
           name = "elpa-mirror";
         };
@@ -6199,15 +6346,15 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "1.10.0";
+        version = "1.11.0";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "96fa05708629600fd79c4b0fcafe63ec97f5ce07";
-          sha256 = "0kzara7r6gvgf3p06xswxbhq01dbhmwx1pldx3mmv7knvm2mdxq8";
+          rev = "d4cd394236d1d148dcabd5048bd30961687627da";
+          sha256 = "1xjm9b32a9nfzvphj6vm0dqcr4i072zcx29kcgiyyni8zbgbwmwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpy";
           sha256 = "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709";
           name = "elpy";
         };
@@ -6234,7 +6381,7 @@
           sha256 = "091dxsb73bhqmrddwnmvblmfpwa7v7fa0ha18daxc8j0lrhzdhlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-mew";
           sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
           name = "elscreen-mew";
         };
@@ -6255,7 +6402,7 @@
           sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-persist";
           sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
           name = "elscreen-persist";
         };
@@ -6276,7 +6423,7 @@
           sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elwm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elwm";
           sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
           name = "elwm";
         };
@@ -6297,7 +6444,7 @@
           sha256 = "12svv24qclkcdb5sniq0xbbsj34hq835s2v636xkb07dpmy644lg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elx";
           sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
           name = "elx";
         };
@@ -6318,7 +6465,7 @@
           sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacs-eclim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacs-eclim";
           sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv";
           name = "emacs-eclim";
         };
@@ -6339,7 +6486,7 @@
           sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacs-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacs-setup";
           sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
           name = "emacs-setup";
         };
@@ -6360,7 +6507,7 @@
           sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsagist";
           sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
           name = "emacsagist";
         };
@@ -6381,7 +6528,7 @@
           sha256 = "1r6cpb7fck5znb7q7zrxcsjn7d3xiqhq8dp1ar1rsd6k4h05by4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsc";
           sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
           name = "emacsc";
         };
@@ -6402,7 +6549,7 @@
           sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql";
           sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
           name = "emacsql";
         };
@@ -6423,7 +6570,7 @@
           sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-mysql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-mysql";
           sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
           name = "emacsql-mysql";
         };
@@ -6444,7 +6591,7 @@
           sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-psql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-psql";
           sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
           name = "emacsql-psql";
         };
@@ -6465,7 +6612,7 @@
           sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-sqlite";
           sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
           name = "emacsql-sqlite";
         };
@@ -6486,7 +6633,7 @@
           sha256 = "1a9925n0jcgxcgiz2kmh9zbb1rg9039rlrbr9fr80by9znfwmy67";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emamux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emamux";
           sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
           name = "emamux";
         };
@@ -6507,7 +6654,7 @@
           sha256 = "1dsa85bk33j90h1ypaz1ylqh9yp2xvlga237h3kwa5y3sb0d5ydi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emmet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emmet-mode";
           sha256 = "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819";
           name = "emmet-mode";
         };
@@ -6528,7 +6675,7 @@
           sha256 = "1pz2xvv5hzfg4a8s6xnbr14mpwnr94cwsa1bpk83i7x15hmxj938";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-mode-line-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-mode-line-cycle";
           sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
           name = "emms-mode-line-cycle";
         };
@@ -6549,7 +6696,7 @@
           sha256 = "1yy4dmjp53l2df5qix31g4vizhv80wm88vjqq6qqa9p822732n0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-mpv";
           sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
           name = "emms-player-mpv";
         };
@@ -6570,7 +6717,7 @@
           sha256 = "15bb8fp2lwr5brfrsjwa47yvja5g2wyaac5a4sh5rn734s64x2sq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-simple-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-simple-mpv";
           sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
           name = "emms-player-simple-mpv";
         };
@@ -6591,7 +6738,7 @@
           sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-cheat-sheet-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-cheat-sheet-plus";
           sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
           name = "emoji-cheat-sheet-plus";
         };
@@ -6612,7 +6759,7 @@
           sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-fontset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-fontset";
           sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
           name = "emoji-fontset";
         };
@@ -6633,7 +6780,7 @@
           sha256 = "0nrf6p4h66i17nz850kpdrnk5h5ra4l3icjjrq34sxvmsssp6zhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emojify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emojify";
           sha256 = "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17";
           name = "emojify";
         };
@@ -6654,7 +6801,7 @@
           sha256 = "0pl7i2a0mf2s33qpsc14dcvqbl6jm5xrvcnrhfr7visvnih29cy4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emr";
           sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
           name = "emr";
         };
@@ -6685,7 +6832,7 @@
           sha256 = "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/engine-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/engine-mode";
           sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
           name = "engine-mode";
         };
@@ -6706,7 +6853,7 @@
           sha256 = "08j6b79vy8ry4ad1abk3hvxjbb4ylrhkvrbrnq1gcikl4h1p2v63";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enlive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enlive";
           sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
           name = "enlive";
         };
@@ -6727,7 +6874,7 @@
           sha256 = "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enotify";
           sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
           name = "enotify";
         };
@@ -6748,7 +6895,7 @@
           sha256 = "05r2m7zghbdrgscg0x78jnhk1g6fq8iylar4cx699zm6pzvlq98z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epc";
           sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
           name = "epc";
         };
@@ -6769,7 +6916,7 @@
           sha256 = "0sjxd5y5hxhrbgfkpwx6m724r3841b53hgc61a0g5zwispw5pmrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epl";
           sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
           name = "epl";
         };
@@ -6790,7 +6937,7 @@
           sha256 = "1xw56sir6gkr0p9g4s6p4qc0rajnl6ifbzrky07j28y9vsa59nsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
           name = "erc-crypt";
         };
@@ -6803,15 +6950,15 @@
     erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-hl-nicks";
-        version = "1.3.0";
+        version = "1.3.2";
         src = fetchFromGitHub {
           owner = "leathekd";
           repo = "erc-hl-nicks";
-          rev = "f7e9c378072ecc689f2a0ef66d73db8bbcc07d87";
-          sha256 = "0bc71s1cx4z6a9cpfygmzv1xzzx9s74366kzqnlg22sxxpb9ajhq";
+          rev = "be181920ce6af0ab5d00d1c638e4e598b3998643";
+          sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-hl-nicks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-hl-nicks";
           sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
           name = "erc-hl-nicks";
         };
@@ -6832,7 +6979,7 @@
           sha256 = "0p1j08rrdsqmkb8zz8h8ba24hr59nx3xh2m044ry468hfd2bp6vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-youtube";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-youtube";
           sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
           name = "erc-youtube";
         };
@@ -6853,7 +7000,7 @@
           sha256 = "19jninbf0dhdw3kn4d38bxmklg0v7sh3m9dwj6z69w99r5pcw480";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ercn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ercn";
           sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
           name = "ercn";
         };
@@ -6874,7 +7021,7 @@
           sha256 = "17i567nfm0rykimh6bpcc5f2l7wsf8zcdy2jzd7sgrl54dvb0g9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erefactor";
           sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
           name = "erefactor";
         };
@@ -6895,7 +7042,7 @@
           sha256 = "19m6chwc2awbsk5z03q1yhq84m481pff2609a8bxymcvm6yaamvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ergoemacs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
           name = "ergoemacs-mode";
         };
@@ -6908,15 +7055,15 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "18.2.2";
+        version = "18.2.3";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "7cf9a621c5280a3e97967c4c63ab6ca1adde69c3";
-          sha256 = "022yvfh6h6kbxl04jk3r4kzryc7k8hjpizc1ixrsmvh4gpnv3abi";
+          rev = "d96471b3f404f7341279d8598dd74d92fb1a923c";
+          sha256 = "1g7grv3zs5lydkxhwzdc3caqym11m20mx43m3hd5jgc96smg0433";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erlang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erlang";
           sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
           name = "erlang";
         };
@@ -6937,7 +7084,7 @@
           sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-async";
           sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
           name = "ert-async";
         };
@@ -6957,7 +7104,7 @@
           sha256 = "63a8fb532260f56569ce20f911788054624a7a29f149ed6036d9f997ae0457c3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-junit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-junit";
           sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
           name = "ert-junit";
         };
@@ -6978,7 +7125,7 @@
           sha256 = "0rdgdslspzb4s0n4a68hnwfm8vm8baasa8nzrdinf0nryn7rrhbf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-runner";
           sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
           name = "ert-runner";
         };
@@ -6999,7 +7146,7 @@
           sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-lib";
           sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
           name = "es-lib";
         };
@@ -7009,22 +7156,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    es-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    es-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "es-mode";
-        version = "4.0.0";
+        version = "4.1.0";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "bee766109b8da1bba925d6998ef288b8a55f3c8f";
-          sha256 = "105ydizdlak951kfr5mjmk7vkqfkj6r1z0gs5ldz1g19wwc7rhjk";
+          rev = "c8674924e566416ead90d837d3f3b00127d4a0e1";
+          sha256 = "1vd5kry46bi3rg4l4330bdkh5slk821a6w4vzzphdqwk61fir81b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-mode";
           sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
           name = "es-mode";
         };
-        packageRequires = [];
+        packageRequires = [ dash ];
         meta = {
           homepage = "http://melpa.org/#/es-mode";
           license = lib.licenses.free;
@@ -7041,7 +7188,7 @@
           sha256 = "0cjchwrhk7bw87bg10zgcwkga50rvs0jn5v2jf6bbsxbcqx2nfc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-windows";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-windows";
           sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
           name = "es-windows";
         };
@@ -7062,7 +7209,7 @@
           sha256 = "0nkmwwx224r50y2xnrz3v26l3ngqshvy5hs861gy4zagwllqfmvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-autojump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-autojump";
           sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
           name = "eshell-autojump";
         };
@@ -7083,7 +7230,7 @@
           sha256 = "179xqh0rs8w3d03gygg9sy4qp5xqgfgl4c0ycrknip9zrnbmph4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-z";
           sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
           name = "eshell-z";
         };
@@ -7104,7 +7251,7 @@
           sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/espuds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/espuds";
           sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
           name = "espuds";
         };
@@ -7125,7 +7272,7 @@
           sha256 = "0lvr14xlxsdad4ihywkpbwwj9lyal0w4p616ska5rk7gg5i8v74p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess";
           sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
           name = "ess";
         };
@@ -7146,7 +7293,7 @@
           sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-R-data-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-R-data-view";
           sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
           name = "ess-R-data-view";
         };
@@ -7167,7 +7314,7 @@
           sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-R-object-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-R-object-popup";
           sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
           name = "ess-R-object-popup";
         };
@@ -7188,7 +7335,7 @@
           sha256 = "1avb6dng4xgw3bp7bw0j60wl6s4y26alfys9vwwj29rlzvjrlh74";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-smart-underscore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-smart-underscore";
           sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
           name = "ess-smart-underscore";
         };
@@ -7209,7 +7356,7 @@
           sha256 = "1pzbd2ka6h5ipiivfwfgq1hq80ww59xvyldmx406mdd5vn7yqk5z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esup";
           sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
           name = "esup";
         };
@@ -7230,7 +7377,7 @@
           sha256 = "0k4vqlbk3h2snfiriraxhnjpdxgs49vcaazl191p9s2f799msd8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esxml";
           sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
           name = "esxml";
         };
@@ -7251,7 +7398,7 @@
           sha256 = "1a33yy455yx2188vxnhylgzg4zc0hhrw52dmpc4svxs7h1229pwg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eval-in-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eval-in-repl";
           sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
           name = "eval-in-repl";
         };
@@ -7272,7 +7419,7 @@
           sha256 = "0lwpl9akdxml9f51pgsv0g7k7mr8dvqm94l01i7vq8jl6vd6v6i5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eval-sexp-fu";
           sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
           name = "eval-sexp-fu";
         };
@@ -7282,17 +7429,38 @@
           license = lib.licenses.free;
         };
       }) {};
+    evalator = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evalator";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "seanirby";
+          repo = "evalator";
+          rev = "edf3840f5aa025cf38d0c2677b2f88f59079409e";
+          sha256 = "1a3y69s7lb24zdivxcpsjh9l6adxyjqxbpgradnj0q1n6kdyq679";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evalator";
+          sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk";
+          name = "evalator";
+        };
+        packageRequires = [ helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/evalator";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
         version = "1.2.10";
         src = fetchhg {
           url = "https://bitbucket.com/lyro/evil";
-          rev = "e2c001ecfded";
-          sha256 = "1by2b0qa5hk2jvkxg8j4b0wpnw3mbg0vdggp4nh33m61290jsn5k";
+          rev = "5c0114702ea3";
+          sha256 = "1sysqcvzdnzg5qvawv3c0rwfyacjb80mvfdhdmc07vr4pyma6vcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil";
           sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc";
           name = "evil";
         };
@@ -7313,7 +7481,7 @@
           sha256 = "0lw7fg4gqwj30r0l6k2ni36sxqkf65zf0d0z3rxnpwbxlf8dlkrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-anzu";
           sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
           name = "evil-anzu";
         };
@@ -7334,7 +7502,7 @@
           sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-args";
           sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
           name = "evil-args";
         };
@@ -7355,7 +7523,7 @@
           sha256 = "1qiym8f56a18j5swrxx5is48nz7z76531k8cw2c7czr6611l8l5a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-commentary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-commentary";
           sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
           name = "evil-commentary";
         };
@@ -7376,7 +7544,7 @@
           sha256 = "0cj17gk7cxia2p9xzqnlnmqqbw2afd3x61gfw9fpf65j9wik5hbz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-escape";
           sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
           name = "evil-escape";
         };
@@ -7397,7 +7565,7 @@
           sha256 = "0r2367lbzcdhglvjjcamrzn5fmqy0jalcws8r0yc2al1vbsrn0fr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-iedit-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-iedit-state";
           sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
           name = "evil-iedit-state";
         };
@@ -7418,7 +7586,7 @@
           sha256 = "1yrd9zvp23xwmxvw9hrhfwhwfczh4lxxk65mcvy69q6wwd03z5vn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-jumper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-jumper";
           sha256 = "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x";
           name = "evil-jumper";
         };
@@ -7439,7 +7607,7 @@
           sha256 = "1k2zinchs0jjllp8zkpggckyy63dkyi5yig3p46vh4w45jdzysk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-leader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-leader";
           sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
           name = "evil-leader";
         };
@@ -7460,7 +7628,7 @@
           sha256 = "12l3gnhirq8jz0dqyj9m02l1fg5rh78fdyskslprxp5vfa4ngzkh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-lisp-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-lisp-state";
           sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
           name = "evil-lisp-state";
         };
@@ -7481,7 +7649,7 @@
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-mark-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-mark-replace";
           sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
           name = "evil-mark-replace";
         };
@@ -7502,7 +7670,7 @@
           sha256 = "0kf4m1ghpxfalqx2zwm1d8xav4d6l6bpk79g5cvssk5jz5913fbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-matchit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-matchit";
           sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
           name = "evil-matchit";
         };
@@ -7523,7 +7691,7 @@
           sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-nerd-commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-nerd-commenter";
           sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
           name = "evil-nerd-commenter";
         };
@@ -7544,7 +7712,7 @@
           sha256 = "13jg2xbh4p02x1nj77b6csb93hh56c1nv8kslcq2hjj3caipk4m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-numbers";
           sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
           name = "evil-numbers";
         };
@@ -7565,7 +7733,7 @@
           sha256 = "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-org";
           sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
           name = "evil-org";
         };
@@ -7578,15 +7746,15 @@
     evil-quickscope = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-quickscope";
-        version = "0.1.3";
+        version = "0.1.4";
         src = fetchFromGitHub {
           owner = "blorbx";
           repo = "evil-quickscope";
-          rev = "d2f512fa4bd0b0603529a441e474ca551f621650";
-          sha256 = "0yx5ry102hzhqx1aql58fkd986xgj250bbcxabpnvy27gim2b977";
+          rev = "37a20e4c56c6058abf186ad4013c155e695e876f";
+          sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-quickscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-quickscope";
           sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
           name = "evil-quickscope";
         };
@@ -7607,7 +7775,7 @@
           sha256 = "1ygrpffa847144i74z2yy5r5vcvd334gad5mg18ffydacddcyqmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-rsi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-rsi";
           sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
           name = "evil-rsi";
         };
@@ -7628,7 +7796,7 @@
           sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-search-highlight-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-search-highlight-persist";
           sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
           name = "evil-search-highlight-persist";
         };
@@ -7649,7 +7817,7 @@
           sha256 = "0j2m3rsszivyjhv8bjid5fdqaf1vwp8rf55b27y4vc2489wrw415";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-smartparens";
           sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
           name = "evil-smartparens";
         };
@@ -7670,7 +7838,7 @@
           sha256 = "143lgpvbjrddbgnyh9dfdhjj0gp69slv4fkiq53czz85ffwli5ig";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-snipe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
           name = "evil-snipe";
         };
@@ -7691,7 +7859,7 @@
           sha256 = "1rchanv0vq9rx6x69608dlpdybvkn8a9ymx8wzm7gqpz9qh6xqrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-space";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-space";
           sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
           name = "evil-space";
         };
@@ -7712,7 +7880,7 @@
           sha256 = "0vsf7yzlb2j7c5c7cnk81y1979psy6a9v7klg6c2j9lkcn3cqpvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-textobj-anyblock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-textobj-anyblock";
           sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
           name = "evil-textobj-anyblock";
         };
@@ -7733,7 +7901,7 @@
           sha256 = "1rskvkmz30xyy8xfjf2i35f3dxh663gb3plfy3f0j6z17i086jl2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-tutor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-tutor";
           sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
           name = "evil-tutor";
         };
@@ -7754,7 +7922,7 @@
           sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-visual-mark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-visual-mark-mode";
           sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
           name = "evil-visual-mark-mode";
         };
@@ -7775,7 +7943,7 @@
           sha256 = "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-visualstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-visualstar";
           sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
           name = "evil-visualstar";
         };
@@ -7796,7 +7964,7 @@
           sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evm";
           sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
           name = "evm";
         };
@@ -7817,7 +7985,7 @@
           sha256 = "0gs6bi3s2sszc6v2b26929azmn5513kvyin99n4d0ark1jdbjmv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eww-lnum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eww-lnum";
           sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
           name = "eww-lnum";
         };
@@ -7838,7 +8006,7 @@
           sha256 = "0nhc3m88i6rl2y426ksmjbbaqwfrjnwbzqq1bvd6r0bkcwgfwfml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/exec-path-from-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/exec-path-from-shell";
           sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
           name = "exec-path-from-shell";
         };
@@ -7859,7 +8027,7 @@
           sha256 = "0rvkhjfkhamr3ys9iarblfwvwq7n4wishdjgnwj1lx7m80h1hzbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/expand-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/expand-region";
           sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
           name = "expand-region";
         };
@@ -7880,7 +8048,7 @@
           sha256 = "106yh793scbyharsk1dvrirkj3c6666w8jqilpkaz78vwyw3zs5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/express";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/express";
           sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
           name = "express";
         };
@@ -7901,7 +8069,7 @@
           sha256 = "1k2j8szavyq2wy5c0skvs03a88cr9njy7y63b7knh2m92nw4830d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/extend-dnd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/extend-dnd";
           sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
           name = "extend-dnd";
         };
@@ -7922,7 +8090,7 @@
           sha256 = "0jc5wv2hkc89yh5ypa324xlfqdna20msr63g30njxq4g2vd0iqa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eyebrowse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eyebrowse";
           sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
           name = "eyebrowse";
         };
@@ -7943,7 +8111,7 @@
           sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/f";
           sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
           name = "f";
         };
@@ -7964,7 +8132,7 @@
           sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fabric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fabric";
           sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
           name = "fabric";
         };
@@ -7985,7 +8153,7 @@
           sha256 = "01l8dlfpyy97b17djbza46rq11xlbkhd5kn2r26r2xac8klj4pka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/factlog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/factlog";
           sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
           name = "factlog";
         };
@@ -8006,7 +8174,7 @@
           sha256 = "05lwcwf412m717yhwpjrswqkm8c3i7391rmiwv2k8xc1vk6dpp4g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fancy-battery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fancy-battery";
           sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
           name = "fancy-battery";
         };
@@ -8027,7 +8195,7 @@
           sha256 = "10ds6nlzm1s5xsp53a52qlzrnph7in6gib67qhgnwpj33wp8gs91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fancy-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fancy-narrow";
           sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
           name = "fancy-narrow";
         };
@@ -8048,7 +8216,7 @@
           sha256 = "0h32w63vv451797zi6206j529fd4j8l3fp7rqip3s8xn8d4728x1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fastnav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fastnav";
           sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
           name = "fastnav";
         };
@@ -8069,7 +8237,7 @@
           sha256 = "03w68zbgprly45i6ps7iviwvjf3acbc7f7acvjpzj2plf0g5i19z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fcitx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fcitx";
           sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
           name = "fcitx";
         };
@@ -8090,7 +8258,7 @@
           sha256 = "1cxjygg05v8s96c8z6plk3hl34jaiwg7s7dl7dsk20rj5f54kgw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/feature-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/feature-mode";
           sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
           name = "feature-mode";
         };
@@ -8111,7 +8279,7 @@
           sha256 = "0fghhy5xqsdwal4fwlr6hxr5kpnfw71q79mxpp9db59ldnj9f5y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fill-column-indicator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fill-column-indicator";
           sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
           name = "fill-column-indicator";
         };
@@ -8132,7 +8300,7 @@
           sha256 = "1r9y9zschavi28c5ysrlh56vxszjfyhh5r36fhn74i0b5iiy15rx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/finalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
@@ -8153,7 +8321,7 @@
           sha256 = "1xjb66pydm3yf0jxnm2mri98pxq3b26xvwjkaj1488qgj27i05jr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-by-pinyin-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
           name = "find-by-pinyin-dired";
         };
@@ -8174,7 +8342,7 @@
           sha256 = "0bf32nhpmjvvgnr6g9xqh8pqnhr3dl24y3g40lsv4pc8ffs70ydm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-file-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-file-in-project";
           sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
           name = "find-file-in-project";
         };
@@ -8195,7 +8363,7 @@
           sha256 = "0wbmmrd7brf4498pdyilz17rzv7221cj8sd4h11gac2r72f1q2md";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-file-in-repository";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-file-in-repository";
           sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
           name = "find-file-in-repository";
         };
@@ -8216,7 +8384,7 @@
           sha256 = "0lwgbd9zwdv7qs39c3fp4hrc17d9wrwwjgba7a14zwrhb27m7j07";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fiplr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fiplr";
           sha256 = "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i";
           name = "fiplr";
         };
@@ -8226,6 +8394,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    firefox-controller = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, moz, popwin }:
+    melpaBuild {
+        pname = "firefox-controller";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "emacs-firefox-controller";
+          rev = "26a2e4b9246a7b5415032799b742b998529fce9e";
+          sha256 = "1rz56n2gmw11w2yxlhn0i8xmig9m8lxihgaikg65xmy9nqa5j7bj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firefox-controller";
+          sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6";
+          name = "firefox-controller";
+        };
+        packageRequires = [ cl-lib moz popwin ];
+        meta = {
+          homepage = "http://melpa.org/#/firefox-controller";
+          license = lib.licenses.free;
+        };
+      }) {};
     fireplace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fireplace";
@@ -8237,7 +8426,7 @@
           sha256 = "174x0qyrwswppc9p1q1nn4424r3zg7g49zk329k5aq18vyjz52d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fireplace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fireplace";
           sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
           name = "fireplace";
         };
@@ -8258,7 +8447,7 @@
           sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firestarter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firestarter";
           sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
           name = "firestarter";
         };
@@ -8271,15 +8460,15 @@
     fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fish-mode";
-        version = "0.1.1";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "wwwjfy";
           repo = "emacs-fish";
-          rev = "ac38e249dc260790ae32a24e101311990d9a84df";
-          sha256 = "1vwq0h88yassa0m0cizfvj5b9rrx5cb7w1n5mbczv54q97lq530n";
+          rev = "22aabbccd564883684f6d224b8e0a512f334be41";
+          sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fish-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fish-mode";
           sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
           name = "fish-mode";
         };
@@ -8289,6 +8478,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fix-input";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "fix-input";
+          rev = "728ae9258ebe790a69cf332407cba2f8c0be7d81";
+          sha256 = "16rd23ygh76fs4i7rni94k8gwa9n360h40qmhm65snp31kqnpr1p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fix-input";
+          sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p";
+          name = "fix-input";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fix-input";
+          license = lib.licenses.free;
+        };
+      }) {};
     fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fix-word";
@@ -8300,7 +8510,7 @@
           sha256 = "1hj5jp4vbkcmnc8l2hqsvjc76f7c9zcsq8znwcwv2nv9xj9hlbkr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fix-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fix-word";
           sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
           name = "fix-word";
         };
@@ -8321,7 +8531,7 @@
           sha256 = "1hnxdmzqmnp3dr7mpr58pjmigykb3cxwphxzia013kfi37ipf5a0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fixmee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fixmee";
           sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
           name = "fixmee";
         };
@@ -8349,7 +8559,7 @@
           sha256 = "12b1b7avjdbfm184mcg3bh3s6k0ygfz1sraz8q7qnrsyw4170893";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/floobits";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/floobits";
           sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
           name = "floobits";
         };
@@ -8370,7 +8580,7 @@
           sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx";
           sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
           name = "flx";
         };
@@ -8391,7 +8601,7 @@
           sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx-ido";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx-ido";
           sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
           name = "flx-ido";
         };
@@ -8412,7 +8622,7 @@
           sha256 = "19mnx2zm71qrf7qf3mk5kriv5vgq0nl67lj029n63wqd8jcjb5fi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck";
           sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
           name = "flycheck";
         };
@@ -8433,7 +8643,7 @@
           sha256 = "1c3igqfd42dm42kfjm2q2xgr673vws10n9jn2jjlsk4g33brc7h4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-cask";
           sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
           name = "flycheck-cask";
         };
@@ -8446,15 +8656,15 @@
     flycheck-checkbashisms = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-checkbashisms";
-        version = "1.3";
+        version = "1.4";
         src = fetchFromGitHub {
           owner = "Gnouc";
           repo = "flycheck-checkbashisms";
-          rev = "652c977de277519b07de70d6570082687e39367c";
-          sha256 = "0rvnc574r3fhm85g4n1fn1c4avg0w1x32a4k6fv5v94m5c4331nn";
+          rev = "6acb957a33a21e61764792b80ba4e33e88f2271f";
+          sha256 = "18nhfj0vx8rg2236nb9475s27rhyb34m81i7l6zkhifqba6rb0bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-checkbashisms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-checkbashisms";
           sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
           name = "flycheck-checkbashisms";
         };
@@ -8475,7 +8685,7 @@
           sha256 = "1i824iyjsg4d786kx5chsb64wlqd8vn2vsrhq6rmdx2x3gzdfcsx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-clojure";
           sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
           name = "flycheck-clojure";
         };
@@ -8496,7 +8706,7 @@
           sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-color-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-color-mode-line";
           sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
           name = "flycheck-color-mode-line";
         };
@@ -8517,7 +8727,7 @@
           sha256 = "1ap5hgvaccmf2xkfvyp7rqcfjwmiy6mhr6ccgahxm2z0vm51kpyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-dmd-dub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-dmd-dub";
           sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
           name = "flycheck-dmd-dub";
         };
@@ -8538,7 +8748,7 @@
           sha256 = "0j2mvf3zjznwkm8dykcgs1v5sz0i882mrivghxqr3h6n3ni4wag4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-gometalinter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-gometalinter";
           sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
           name = "flycheck-gometalinter";
         };
@@ -8559,7 +8769,7 @@
           sha256 = "0143lcn6g46g7skm4r6lqq09s8mr3268rikbzlh65qg80rpg9frj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-haskell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-haskell";
           sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
           name = "flycheck-haskell";
         };
@@ -8580,7 +8790,7 @@
           sha256 = "136mdg21a8sqxhijsjsvpli7r7sb40nmf80p6gmgb1ghwmhlm8k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-hdevtools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-hdevtools";
           sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
           name = "flycheck-hdevtools";
         };
@@ -8601,7 +8811,7 @@
           sha256 = "1pdssw5k88ym5fczllfjv26sp4brlyrywnlzq5baha5pq91h9cb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ledger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ledger";
           sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
           name = "flycheck-ledger";
         };
@@ -8622,7 +8832,7 @@
           sha256 = "1phfarws2aajkgcl96hqa4ydmb1yncg10q2ldzf8ff6yd6mvk51l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ocaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ocaml";
           sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
           name = "flycheck-ocaml";
         };
@@ -8643,7 +8853,7 @@
           sha256 = "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-package";
           sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
           name = "flycheck-package";
         };
@@ -8664,7 +8874,7 @@
           sha256 = "0v23yc8znzjp44lrpfzqb4hc3psad14hsnvqcp8f1yyhgvdx35n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-pos-tip";
           sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
           name = "flycheck-pos-tip";
         };
@@ -8685,7 +8895,7 @@
           sha256 = "0yi2xmk0bxzqmjf9sy3r3gacqw7z1jrf6hwn05zaqqgn7y78z37i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-status-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-status-emoji";
           sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
           name = "flycheck-status-emoji";
         };
@@ -8706,7 +8916,7 @@
           sha256 = "0azjr5mfb3hnb66m1b2319i035mn5i9qz24y7fj5crhnc9vp8w3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-tip";
           sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
           name = "flycheck-tip";
         };
@@ -8727,7 +8937,7 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ycmd";
           sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
           name = "flycheck-ycmd";
         };
@@ -8748,7 +8958,7 @@
           sha256 = "1svj5n7mmzhq03azlv4n33rz0nyqb00qr8ihdbc8hh2xnp63j5rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-coffee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-coffee";
           sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
           name = "flymake-coffee";
         };
@@ -8769,7 +8979,7 @@
           sha256 = "054ws88fcfz3hf3cha7dvndm52v5n4jc4vzif1lif44xq0iggwqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-css";
           sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
           name = "flymake-css";
         };
@@ -8790,7 +9000,7 @@
           sha256 = "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-easy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-easy";
           sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
           name = "flymake-easy";
         };
@@ -8811,7 +9021,7 @@
           sha256 = "002s01cymgx4z4l3j2pqirg7899pljdx2hmbz8k6cksdxlymzmkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-gjshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-gjshint";
           sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
           name = "flymake-gjshint";
         };
@@ -8832,7 +9042,7 @@
           sha256 = "1b3lf5jwan03k7rb97g4bb982dacdwsfdddnwc0inx9gs3qq1zni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-haml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-haml";
           sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
           name = "flymake-haml";
         };
@@ -8853,7 +9063,7 @@
           sha256 = "0k1qc0r0gr7f9l5if2a67cv4k73z5yxd6vxd6l1bqw500y0aajxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-haskell-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-haskell-multi";
           sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
           name = "flymake-haskell-multi";
         };
@@ -8874,7 +9084,7 @@
           sha256 = "1ygg51r4ym4x7h4svizwllsvr72x9np6jvjqpk8ayv3w2fpb9l31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-hlint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-hlint";
           sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
           name = "flymake-hlint";
         };
@@ -8895,7 +9105,7 @@
           sha256 = "00zkm3wqlss386qd6jiq0siga7c48n5ykh0vf9q5v83rmpd79yri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-jslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-jslint";
           sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
           name = "flymake-jslint";
         };
@@ -8916,7 +9126,7 @@
           sha256 = "0rzlw80mi39147yqnpzcvw9wvr5svksd3kn6s3w8191f2kc6xzzv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-json";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-json";
           sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
           name = "flymake-json";
         };
@@ -8937,7 +9147,7 @@
           sha256 = "0ggvmsjj6p6a7cwr2bzhlcf8ab4v6a2bz5djsscd2ryy570p367z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-less";
           sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
           name = "flymake-less";
         };
@@ -8958,7 +9168,7 @@
           sha256 = "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-perlcritic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-perlcritic";
           sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
           name = "flymake-perlcritic";
         };
@@ -8979,7 +9189,7 @@
           sha256 = "0dzyid0av9icp77wv0zcsygpw46z24qibq1ra0iwnkzl3kqvkyzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-php";
           sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
           name = "flymake-php";
         };
@@ -9000,7 +9210,7 @@
           sha256 = "0l8qpcbzfi32h3vy7iwydx3hg2w60x9l3v3rabzjx412m5d00gsh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-python-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-python-pyflakes";
           sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
           name = "flymake-python-pyflakes";
         };
@@ -9021,7 +9231,7 @@
           sha256 = "0d2vmpgr5c2cbpxcqm5x1ckfysbpwcbaa9frcnp2yfp8scvkvqj0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-ruby";
           sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
           name = "flymake-ruby";
         };
@@ -9042,7 +9252,7 @@
           sha256 = "0c74qdgy9c4hv3nyjnbqdzypbg9399vq3p5ngp5lasc7iz6vi0h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-sass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-sass";
           sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
           name = "flymake-sass";
         };
@@ -9063,7 +9273,7 @@
           sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-shell";
           sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
           name = "flymake-shell";
         };
@@ -9084,7 +9294,7 @@
           sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyspell-lazy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyspell-lazy";
           sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
           name = "flyspell-lazy";
         };
@@ -9105,7 +9315,7 @@
           sha256 = "1rk7fsill0salrhb4anbf698nd21nxj8pni35brbmv64nj9fhfic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyspell-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyspell-popup";
           sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
           name = "flyspell-popup";
         };
@@ -9126,7 +9336,7 @@
           sha256 = "0r2j238iyxnww60xpbxggjmz6y2waayw4m51f0l39hszbhags2cv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fm";
           sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f";
           name = "fm";
         };
@@ -9147,7 +9357,7 @@
           sha256 = "0aj5qxzlfxxp7z27fiw9bvir5yi2zj0xzj5kbh17ix4wnhi03bhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/focus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/focus";
           sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
           name = "focus";
         };
@@ -9168,7 +9378,7 @@
           sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-dwim";
           sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
           name = "fold-dwim";
         };
@@ -9189,7 +9399,7 @@
           sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-dwim-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-dwim-org";
           sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
           name = "fold-dwim-org";
         };
@@ -9210,7 +9420,7 @@
           sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-this";
           sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
           name = "fold-this";
         };
@@ -9231,7 +9441,7 @@
           sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/font-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/font-utils";
           sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
           name = "font-utils";
         };
@@ -9252,7 +9462,7 @@
           sha256 = "0qq13jhn9i2ls6n3fbay4i2r0hfs426pkmmif43b87gjxb510irc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fontawesome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
           name = "fontawesome";
         };
@@ -9273,7 +9483,7 @@
           sha256 = "1jw888nqmbi9kcd9ycl2fqrmrnqxnmkx72n0b3nf3hp7j956yb21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/forecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/forecast";
           sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
           name = "forecast";
         };
@@ -9294,7 +9504,7 @@
           sha256 = "199kybf2bvywqfnwr5w893km82829k1j7sp079y6s2601hq8ylw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/foreman-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/foreman-mode";
           sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
           name = "foreman-mode";
         };
@@ -9315,7 +9525,7 @@
           sha256 = "171jna631b2iqcimfsik9c66gii8nc0zdb58m077w00rn7rcxbh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/form-feed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/form-feed";
           sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
           name = "form-feed";
         };
@@ -9336,7 +9546,7 @@
           sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/format-sql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/format-sql";
           sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
           name = "format-sql";
         };
@@ -9346,22 +9556,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    fountain-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fountain-mode";
-        version = "1.5.0";
+        version = "1.5.1";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "167238b3cdd5e510300abe3afd02b820f026b501";
-          sha256 = "0yycn339vqglny1bs4c8jsaf85cyj0rzzn8wzsf5k5srh9yivzdq";
+          rev = "a7ba3d78dcffe92105701efbf2630089a068b3da";
+          sha256 = "1187kbw06sv6yirrldbqwi44nfsg4a0rxa8c79p6ld82kcp16kns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fountain-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fountain-mode";
           sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
           name = "fountain-mode";
         };
-        packageRequires = [ s ];
+        packageRequires = [ emacs s ];
         meta = {
           homepage = "http://melpa.org/#/fountain-mode";
           license = lib.licenses.free;
@@ -9378,7 +9588,7 @@
           sha256 = "1vznkbly0lyh5kri9lcgy309ws96q3d5m1lghck9l8ain8hphhqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-restore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-restore";
           sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm";
           name = "frame-restore";
         };
@@ -9399,7 +9609,7 @@
           sha256 = "1c3yx9j3q8fkfiay4nzcabsq9i4ydqf6vxk8vv80h78gg9afrzrj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fringe-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fringe-helper";
           sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
           name = "fringe-helper";
         };
@@ -9412,15 +9622,15 @@
     fsharp-mode = callPackage ({ auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "1.7.2";
+        version = "1.7.3";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "9169baa9290e92d2e0ccc3cfd9c2a423136eb251";
-          sha256 = "1ckq45szq8lfg4spmvrj53s3p1hfl7x8k86cgq254gbs7kq8w7p2";
+          rev = "b2a70da8ba3c573e02c6a9951ef5f0089cec6c78";
+          sha256 = "115xl18nsg2j9sbp3qqzrjfpnzczk1zmrwrfrpqjq3jmv21ilsv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fsharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fsharp-mode";
           sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
           name = "fsharp-mode";
         };
@@ -9439,7 +9649,7 @@
           sha256 = "b348e285923e480fe696f888783c95becb392a6e05abc553d8be649987c7d190";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuel";
           sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
           name = "fuel";
         };
@@ -9460,7 +9670,7 @@
           sha256 = "0c3w3xs2jbdqgsqw0qmdbwii6p395qfznird4gg0hfr7lby2kmjq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/full-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/full-ack";
           sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
           name = "full-ack";
         };
@@ -9473,15 +9683,15 @@
     fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fullframe";
-        version = "0.2.1";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "fullframe";
-          rev = "6ce5342191a6837500bcb6d6026103eb53bb6752";
-          sha256 = "0y11yxlfbfb6f20rljpz54crwrmi9yljavfwmh33bq54fck296k7";
+          rev = "684f28fcb306d0232c2a7840f3fe4c933382729c";
+          sha256 = "1cjplkcsq4wlw1ixsfxih2xcx43wgzvmznxmkynqsgvn2f4w4g1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fullframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fullframe";
           sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
           name = "fullframe";
         };
@@ -9502,7 +9712,7 @@
           sha256 = "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/function-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
           name = "function-args";
         };
@@ -9523,7 +9733,7 @@
           sha256 = "1g7my9ha5cnwg3pjwa86wncg5gphv18xpnpmj3xc3vg7z5m45rss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuzzy";
           sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
           name = "fuzzy";
         };
@@ -9544,7 +9754,7 @@
           sha256 = "0c3g0yfclczdh6nxmg9lljjf288zibqy51bhh1b1cgdmxcbpg8bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fvwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fvwm-mode";
           sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
           name = "fvwm-mode";
         };
@@ -9565,7 +9775,7 @@
           sha256 = "08qnyr945938hwjg1ypkf2x4mfxbh3bbf1xrgz1rk2ddrfv7hmkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fwb-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fwb-cmds";
           sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
           name = "fwb-cmds";
         };
@@ -9578,15 +9788,15 @@
     fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fxrd-mode";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "fxrd-mode";
-          rev = "122afe6b7edeff117edf92dab1ba011ae71a5910";
-          sha256 = "003iqzwzf950dvn6q901y0jjadz7hqaafa9wrhzplay3kjnkjj9b";
+          rev = "7b49c7bec2ed4a579fa0234555667377e8ba0f53";
+          sha256 = "1sk2z71xfi4wqb7ap8jvad8cbzdbilwzqx9vy45zmgx1jh7g4ba9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fxrd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fxrd-mode";
           sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
           name = "fxrd-mode";
         };
@@ -9607,7 +9817,7 @@
           sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fzf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fzf";
           sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
           name = "fzf";
         };
@@ -9628,7 +9838,7 @@
           sha256 = "1q9bz294bc6bplwfrfzsczh444v9152wv7zm2l1pcpwv8n8581p6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gather";
           sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
           name = "gather";
         };
@@ -9649,7 +9859,7 @@
           sha256 = "1667zln7bav0bdhrc4b5z36n8rn36xvwh4y9ffgns67zfgwi64kk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/geiser";
           sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
           name = "geiser";
         };
@@ -9670,7 +9880,7 @@
           sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/genrnc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/genrnc";
           sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
           name = "genrnc";
         };
@@ -9691,7 +9901,7 @@
           sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/german-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/german-holidays";
           sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
           name = "german-holidays";
         };
@@ -9712,7 +9922,7 @@
           sha256 = "1m9ra9qp7bgf6anfqyn56n3xa9a25ran10k9wd355qknd5skq1zz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ggo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ggo-mode";
           sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
           name = "ggo-mode";
         };
@@ -9733,7 +9943,7 @@
           sha256 = "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ggtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ggtags";
           sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
           name = "ggtags";
         };
@@ -9754,7 +9964,7 @@
           sha256 = "0a5v91k9gm9vv15d3m8czicv8n39f0hvqhcr6lfw0w82n26xwsms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gh";
           sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
           name = "gh";
         };
@@ -9767,15 +9977,15 @@
     ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ghc";
-        version = "5.4.0.0";
+        version = "5.5.0.0";
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "ghc-mod";
-          rev = "edfce196107dbd43958d72c174ad66e4a7d30643";
-          sha256 = "1wiwkp4qcgdwnr4h1bn27hh1kyl2wjlrz2bbfv638y9gzc06rgch";
+          rev = "bd021e42b36e6cf3bc2ca3ef908299ba97ceeee5";
+          sha256 = "1m5q2s9nxm0m18njaxzryjly8rl3m598r94nn53xpazd4i5ln8cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghc";
           sha256 = "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g";
           name = "ghc";
         };
@@ -9796,7 +10006,7 @@
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghc-imported-from";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghc-imported-from";
           sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
           name = "ghc-imported-from";
         };
@@ -9817,7 +10027,7 @@
           sha256 = "0q3ps5f6mr9hyf6nq1wshcm1z6a5yhskqd7dbbwq5dm78552z6z8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gist";
           sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
           name = "gist";
         };
@@ -9838,7 +10048,7 @@
           sha256 = "06ws3x5qa92drmn6rcp502jk2yil6q9gkzdmb2gww9gb2g695wl5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git";
           sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
           name = "git";
         };
@@ -9859,7 +10069,7 @@
           sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-auto-commit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-auto-commit-mode";
           sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
           name = "git-auto-commit-mode";
         };
@@ -9880,7 +10090,7 @@
           sha256 = "0a3ws852ypi34ash39srkwzkfish4n3c5lma10d9xzddjrwapgj9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-command";
           sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
           name = "git-command";
         };
@@ -9893,15 +10103,15 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "2.4.0";
+        version = "2.5.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "2e757a8c919b53edddb186e36e055e011e3b0ab3";
-          sha256 = "0hklwwzi2gqywysxn16ps1fvn48max52cpk2nx7r4df4h52yk6wn";
+          rev = "a3747edc8a4cddc408f7718a3371b46a4b610744";
+          sha256 = "0dydm0gj6jbybi5nkqrpi5bic5yxhz0p5k5gayqzqzmnb1fhl247";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-commit";
           sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
           name = "git-commit";
         };
@@ -9914,15 +10124,15 @@
     git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-gutter";
-        version = "0.85";
+        version = "0.87";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-gutter";
-          rev = "febe69d909beb407d07dfc1b273ae7b7719fdd7c";
-          sha256 = "1721h4i185wj9nxkb19cnbwk5fwsajaqr54qq9xb669mm4pjn3ra";
+          rev = "c08ec4fc7fedf4e04e278c5d8984b0ecdf87fe2b";
+          sha256 = "0n02nss7gp0m898g7zw4rkj2kzrdiwp6mli0753p1fqph28j0gvm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter";
           sha256 = "12yjl9hsd72dwzl42hdcmjfdbxyi356jcq0kz8k7jvcsn57z4p2k";
           name = "git-gutter";
         };
@@ -9943,7 +10153,7 @@
           sha256 = "1cw5x1w14lxy8mqpxdrd9brgps0nig2prjjjda4a19wfsvy3clmv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter-fringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter-fringe";
           sha256 = "14wyiyyi2rram2sz3habvmygy5a5m2jfi6x9fqcyfr3vpcjn1k4i";
           name = "git-gutter-fringe";
         };
@@ -9964,7 +10174,7 @@
           sha256 = "1c7ijbpa7xw831k55cdm2gl8r597rxnp22jcmqnfpwqkqmk48ln9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter-fringe+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter-fringe+";
           sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
           name = "git-gutter-fringe-plus";
         };
@@ -9985,7 +10195,7 @@
           sha256 = "101hracd77mici778x3ixwrcicd6fqkcr9z76kapkr0dq5z42yjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter+";
           sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
           name = "git-gutter-plus";
         };
@@ -9998,15 +10208,15 @@
     git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-lens";
-        version = "0.4";
+        version = "0.4.1";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-lens";
-          rev = "1feacc217c58fd4a41f9378eb09658f664036509";
-          sha256 = "0s1adgsigaq47vx8bfbmr5z8jq9y230ykwbw0jqka61n4ibg9ish";
+          rev = "be62df785ae14fa8652fe2cdd342d3256f8c0933";
+          sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-lens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-lens";
           sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
           name = "git-lens";
         };
@@ -10027,7 +10237,7 @@
           sha256 = "171w8vx1r2v9yclnlk3mwbfaxhg0kbvk575jvi6vr9shpjqnrb0z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
           name = "git-link";
         };
@@ -10048,7 +10258,7 @@
           sha256 = "139yivbxdpmv8j6qz406769b040nbmj3j8r28n9gqy54zlwblgv8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-messenger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
           name = "git-messenger";
         };
@@ -10069,7 +10279,7 @@
           sha256 = "1hyq3il03cm6apfawps60r4km8r6pw0vphzba30smsqfk50z3ya3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-ps1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-ps1-mode";
           sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
           name = "git-ps1-mode";
         };
@@ -10082,15 +10292,15 @@
     git-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-timemachine";
-        version = "2.8";
+        version = "3.0";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-timemachine";
-          rev = "87804bbf6e633f42a48567f21bca52019632f64f";
-          sha256 = "1fq9lzn8vvjh0ayl5h0lywxr6zfg3k41xa66vqrf1hdan3a7ax1j";
+          rev = "7c66a878ee89861dcd59b5dfc598520daa156052";
+          sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-timemachine";
           sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
           name = "git-timemachine";
         };
@@ -10111,7 +10321,7 @@
           sha256 = "0igawn43i81icshimj5agv33ab120hd6182knlrn3i46p7lcs3lx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-wip-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-wip-timemachine";
           sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
           name = "git-wip-timemachine";
         };
@@ -10132,7 +10342,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitattributes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitattributes-mode";
           sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
           name = "gitattributes-mode";
         };
@@ -10153,7 +10363,7 @@
           sha256 = "0j0w6ywhiapmx7dk20yw3zgf8803kmccnjsr664am3g85kbb644v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitconfig";
           sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
           name = "gitconfig";
         };
@@ -10174,7 +10384,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitconfig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitconfig-mode";
           sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
           name = "gitconfig-mode";
         };
@@ -10195,7 +10405,7 @@
           sha256 = "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-browse-file";
           sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
           name = "github-browse-file";
         };
@@ -10216,7 +10426,7 @@
           sha256 = "18c169nxvdl7iv18pyqx690ldg6pkc8njaxdg1cww6ykqzqnfxh7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-clone";
           sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
           name = "github-clone";
         };
@@ -10237,7 +10447,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitignore-mode";
           sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
           name = "gitignore-mode";
         };
@@ -10258,7 +10468,7 @@
           sha256 = "1hc7j3gwljb1wk2727f66m3f7ga4icbklp54vlm0vf2bmii1ynil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitlab";
           sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
           name = "gitlab";
         };
@@ -10279,7 +10489,7 @@
           sha256 = "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmail-message-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmail-message-mode";
           sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
           name = "gmail-message-mode";
         };
@@ -10300,7 +10510,7 @@
           sha256 = "0p6n52m3y56nx7chwvmnslrnwc0xmh4fmmlkbkfz9n58hlmw8x1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmail2bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmail2bbdb";
           sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
           name = "gmail2bbdb";
         };
@@ -10321,7 +10531,7 @@
           sha256 = "0x0a94bfkk72kqyr5m6arx450qsg1axmp5r0c4r9m84z8j08r4v1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmpl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmpl-mode";
           sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
           name = "gmpl-mode";
         };
@@ -10342,7 +10552,7 @@
           sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnome-calendar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnome-calendar";
           sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
           name = "gnome-calendar";
         };
@@ -10363,7 +10573,7 @@
           sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gntp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gntp";
           sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
           name = "gntp";
         };
@@ -10384,7 +10594,7 @@
           sha256 = "0bwri3cvm2vr27kyqkrddm28fs08axnd4nm9amfgp54xp20bn4yn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnuplot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnuplot";
           sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
           name = "gnuplot";
         };
@@ -10405,7 +10615,7 @@
           sha256 = "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-desktop-notify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-desktop-notify";
           sha256 = "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b";
           name = "gnus-desktop-notify";
         };
@@ -10426,7 +10636,7 @@
           sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-x-gm-raw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-x-gm-raw";
           sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
           name = "gnus-x-gm-raw";
         };
@@ -10447,7 +10657,7 @@
           sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-autocomplete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-autocomplete";
           sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
           name = "go-autocomplete";
         };
@@ -10468,7 +10678,7 @@
           sha256 = "05yc0nylg3457an5j7yp3x23157j0hbi21qhcpgsa01144mwnwln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-direx";
           sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
           name = "go-direx";
         };
@@ -10489,7 +10699,7 @@
           sha256 = "0ha07nhd2g43l84r1r5dz6c8m3fmmn4bx5mhvi6as33achhip7bn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
           name = "go-eldoc";
         };
@@ -10510,7 +10720,7 @@
           sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-errcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-errcheck";
           sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
           name = "go-errcheck";
         };
@@ -10531,7 +10741,7 @@
           sha256 = "1qqsck11v3ki18qld7hrb7dis60c2ylmq15s7srsppzwil8wm3fx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-mode";
           sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
           name = "go-mode";
         };
@@ -10552,7 +10762,7 @@
           sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-scratch";
           sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
           name = "go-scratch";
         };
@@ -10573,7 +10783,7 @@
           sha256 = "00igv83hiyx7x3pf2grmjpd379brn33fm85f05k104mkkrhg99nm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/golden-ratio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/golden-ratio";
           sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
           name = "golden-ratio";
         };
@@ -10594,7 +10804,7 @@
           sha256 = "0j31062zfqmcd0zsbp19f3h7gq7dn78sg4xf2x838sr9421x6w8x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-this";
           sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
           name = "google-this";
         };
@@ -10615,7 +10825,7 @@
           sha256 = "0hvxyqkxv5hfsa9sv71m7d98g25a1xc962r961nw6vmbvsf64z6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-translate";
           sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
           name = "google-translate";
         };
@@ -10628,15 +10838,15 @@
     gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gotest";
-        version = "0.9.0";
+        version = "0.10.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "ab0da939aad5cec301126c59b7718cd3158b3233";
-          sha256 = "1b6zn1fmqvfb7bcpmhzkgcy5003dl22w3f293arlsd1xkbjgkxa2";
+          rev = "57f894e68b47352aeacaf0d9c61039b24ba42918";
+          sha256 = "0vf42j9jpa75879pxb1h7qgflcrrg78dgq5lg8v0sbpy7z86zaxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gotest";
           sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
           name = "gotest";
         };
@@ -10657,7 +10867,7 @@
           sha256 = "0pxzi56lw9ry91f70hjnvrsbyhcaqknlwicjjbhf6rhv57fplw8h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gotham-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gotham-theme";
           sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
           name = "gotham-theme";
         };
@@ -10678,7 +10888,7 @@
           sha256 = "188q7jr1y872as3w32m8lf6vwl2by1ibgdk6zk7dhpcjwd0ik7x7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-gem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-gem";
           sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
           name = "goto-gem";
         };
@@ -10699,7 +10909,7 @@
           sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-last-change";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-last-change";
           sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
           name = "goto-last-change";
         };
@@ -10720,7 +10930,7 @@
           sha256 = "0k86lrb55d701nj6pvlw3kjp1dcd3lzfya0hv6q56c529y69d782";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gradle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gradle-mode";
           sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
           name = "gradle-mode";
         };
@@ -10741,7 +10951,7 @@
           sha256 = "1rv6klh59y70shc7kwdzlksdzmy0881ss49c0h5m93cn5pd6aj1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grails-projectile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grails-projectile-mode";
           sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
           name = "grails-projectile-mode";
         };
@@ -10762,7 +10972,7 @@
           sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grandshell-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grandshell-theme";
           sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
           name = "grandshell-theme";
         };
@@ -10783,7 +10993,7 @@
           sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphene";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphene";
           sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
           name = "graphene";
         };
@@ -10816,7 +11026,7 @@
           sha256 = "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphene-meta-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphene-meta-theme";
           sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
           name = "graphene-meta-theme";
         };
@@ -10837,7 +11047,7 @@
           sha256 = "1zk664ilyz14p11csmqgzs73gx08hy32h3pnyymzqkavmgb6h3s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphviz-dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphviz-dot-mode";
           sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
           name = "graphviz-dot-mode";
         };
@@ -10858,7 +11068,7 @@
           sha256 = "0xcj1kqzgxifhrhpl9j2nfpnkd6213ix5z7f97269v3inpzaiyf5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grapnel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grapnel";
           sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
           name = "grapnel";
         };
@@ -10878,7 +11088,7 @@
           sha256 = "0djv2ps2ahw9b1b5i45hgy7l7cch7cgh7rzq601c0r6vi7gm2ac5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grass-mode";
           sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
           name = "grass-mode";
         };
@@ -10897,7 +11107,7 @@
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grin";
           sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
           name = "grin";
         };
@@ -10918,7 +11128,7 @@
           sha256 = "1bq73kcx744xnlm2yvccrzlbyx91c492sg7blx2a9z643v3gg1zs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grizzl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grizzl";
           sha256 = "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24";
           name = "grizzl";
         };
@@ -10939,7 +11149,7 @@
           sha256 = "14h0rcd3nkw3pmx8jwip20p6rzl9qdkip5g52gfjjbqfvaffsrkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gruber-darker-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gruber-darker-theme";
           sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
           name = "gruber-darker-theme";
         };
@@ -10960,7 +11170,7 @@
           sha256 = "0zpmhjwj64s72iv3dgsy07pfh20f25ngsy3pszmlrfkxk0926d8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grunt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grunt";
           sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
           name = "grunt";
         };
@@ -10981,7 +11191,7 @@
           sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gscholar-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gscholar-bibtex";
           sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
           name = "gscholar-bibtex";
         };
@@ -11002,7 +11212,7 @@
           sha256 = "1bmcvn8a7g9ahpv2fww673hx9pa7nnrj9kpljq65azf61vq2an2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guide-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guide-key";
           sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
           name = "guide-key";
         };
@@ -11023,7 +11233,7 @@
           sha256 = "040mcfhj2gggp8w1pgip7rxb1bnb23rxlm02wl6x1qv5i0q7g5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guide-key-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guide-key-tip";
           sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
           name = "guide-key-tip";
         };
@@ -11044,7 +11254,7 @@
           sha256 = "1y46qd9cgkfb0wp2cvksjncyp77hd2jnr4bm4zafqirc3qhbysx0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guru-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guru-mode";
           sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
           name = "guru-mode";
         };
@@ -11065,7 +11275,7 @@
           sha256 = "1ffk39lnmg9gfffkaj595p768d1p99q6sqym5g5ch6fmi6cx3a84";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hackernews";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hackernews";
           sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
           name = "hackernews";
         };
@@ -11086,7 +11296,7 @@
           sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ham-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ham-mode";
           sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
           name = "ham-mode";
         };
@@ -11107,7 +11317,7 @@
           sha256 = "0fmr7ji8x5ki9fzybpbg3xbhzws6n7ffk7d0zf9jl1x3jd8d6988";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haml-mode";
           sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
           name = "haml-mode";
         };
@@ -11128,7 +11338,7 @@
           sha256 = "08l6p9n2ggg4filad1k663qc2gjgfbia4knnnif4sw7h92yb31jl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hardcore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hardcore-mode";
           sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
           name = "hardcore-mode";
         };
@@ -11149,7 +11359,7 @@
           sha256 = "0mbdnsm903s380ajjgjjqa0m4mxsddzqfjdafrngy0pxgs16iv1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hardhat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hardhat";
           sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
           name = "hardhat";
         };
@@ -11170,7 +11380,7 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs";
           sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
           name = "haskell-emacs";
         };
@@ -11191,7 +11401,7 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs-base";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs-base";
           sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
           name = "haskell-emacs-base";
         };
@@ -11212,7 +11422,7 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs-text";
           sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
           name = "haskell-emacs-text";
         };
@@ -11225,15 +11435,15 @@
     haskell-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "13.16";
+        version = "13.18";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "ea81bbb966a839527a786739b7628fd9cd777456";
-          sha256 = "1gmpmfkr54sfzrif87zf92a1i13wx75bhp66h1rxhflg216m62yv";
+          rev = "e37c4e53775067ecc0dad67976bb10971b2b118f";
+          sha256 = "0433ay8azn1q9fk7rc5aw4klc9r2p7s44xzd87i0pgpdp154h52g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-mode";
           sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
           name = "haskell-mode";
         };
@@ -11254,7 +11464,7 @@
           sha256 = "0b3d7rvqvvcsp51aqfhl0zg9zg8j0p6vlfvga6jp9xc7626vh6f6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-snippets";
           sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
           name = "haskell-snippets";
         };
@@ -11274,7 +11484,7 @@
           sha256 = "02786f437bbbbb221c9c810a8d110bb4af172b986733ac35c932b18b38af7201";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-tab-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-tab-indent";
           sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
           name = "haskell-tab-indent";
         };
@@ -11295,7 +11505,7 @@
           sha256 = "14m8z13nvfqqgx40vzzbn0z9crwi3hhacmk1zfbv9cmhs95dwy6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haxor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haxor-mode";
           sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
           name = "haxor-mode";
         };
@@ -11316,7 +11526,7 @@
           sha256 = "15h1wkl1d9f2xfhm0nffqicg31rw7z2q0sizjphys9ljgxm43is4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
           name = "hcl-mode";
         };
@@ -11326,22 +11536,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "1.9.1";
+        version = "1.9.2";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "fe96a398aa09ed0d25f6782efa5833085aa63791";
-          sha256 = "0awr4nvzgp1kckxqli1xw4pk16gc22i8hchin63fqvk0gllcy454";
+          rev = "a80e0b48e2ee22a022a76a5f483d1b68efe8a9e3";
+          sha256 = "0cylf0mnfj0m1wm9mxpxrkiinrlvpax99mdnsc6zfj3zrn1qghnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm";
           sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9";
           name = "helm";
         };
-        packageRequires = [ async cl-lib emacs helm-core ];
+        packageRequires = [ async emacs helm-core popup ];
         meta = {
           homepage = "http://melpa.org/#/helm";
           license = lib.licenses.free;
@@ -11358,7 +11568,7 @@
           sha256 = "0ps86zpyywibjwcm9drmamla979ad61fyqr8d6bv71fr56k9ak21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ack";
           sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
           name = "helm-ack";
         };
@@ -11368,22 +11578,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "0.50";
+        version = "0.51";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "e0a4620fcc82d03bec7366542557539e7ecb653a";
-          sha256 = "03vv8arsvpshcfhmi2a3ams3q9q3p67avbbxyd3amyi3j336s2i7";
+          rev = "8f45c7e3294bea1bc583b2b46a02870cc7073311";
+          sha256 = "0ksx48n3g5n7ny2ny65bp3xx3p5g464dwxq30aji2b40yivaj0sz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ag";
           sha256 = "023zvgmi5b5b2qga3jqd7jrq9ap8n3rhvl6jrv9fsi565sg1fv43";
           name = "helm-ag";
         };
-        packageRequires = [ cl-lib helm ];
+        packageRequires = [ emacs helm ];
         meta = {
           homepage = "http://melpa.org/#/helm-ag";
           license = lib.licenses.free;
@@ -11400,7 +11610,7 @@
           sha256 = "015p5sszd54x81qm96gx6xwjkvbi4f3j9i2nhcvlkk75s95w1ijv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-aws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-aws";
           sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
           name = "helm-aws";
         };
@@ -11421,7 +11631,7 @@
           sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-backup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-backup";
           sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
           name = "helm-backup";
         };
@@ -11442,7 +11652,7 @@
           sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bundle-show";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
           name = "helm-bundle-show";
         };
@@ -11463,7 +11673,7 @@
           sha256 = "108584bmadgidqkdfvf333zkyb5v9f84pasz5h01fkh57ks8by9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-c-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-c-yasnippet";
           sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
           name = "helm-c-yasnippet";
         };
@@ -11484,7 +11694,7 @@
           sha256 = "1iqjc15pz5qr8zjxaxz1b2vys2689ri76jacmipxvgjk0y7vc5f0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-circe";
           sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
           name = "helm-circe";
         };
@@ -11505,7 +11715,7 @@
           sha256 = "1l61csd1gqz7kg5zjx60cfy824g42p682z7pk0rqzlrz8498wvkh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-commandlinefu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-commandlinefu";
           sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
           name = "helm-commandlinefu";
         };
@@ -11515,22 +11725,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-core = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "1.9.1";
+        version = "1.9.2";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "fe96a398aa09ed0d25f6782efa5833085aa63791";
-          sha256 = "0awr4nvzgp1kckxqli1xw4pk16gc22i8hchin63fqvk0gllcy454";
+          rev = "a80e0b48e2ee22a022a76a5f483d1b68efe8a9e3";
+          sha256 = "0cylf0mnfj0m1wm9mxpxrkiinrlvpax99mdnsc6zfj3zrn1qghnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-core";
           sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
           name = "helm-core";
         };
-        packageRequires = [ async cl-lib emacs ];
+        packageRequires = [ async emacs ];
         meta = {
           homepage = "http://melpa.org/#/helm-core";
           license = lib.licenses.free;
@@ -11547,7 +11757,7 @@
           sha256 = "0xnqkc4z22m41v5lgf87dd8xc4gmf932zbnbdhf9xic1gal1779c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-cscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-cscope";
           sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
           name = "helm-cscope";
         };
@@ -11568,7 +11778,7 @@
           sha256 = "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dash";
           sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
           name = "helm-dash";
         };
@@ -11589,7 +11799,7 @@
           sha256 = "1cm2vaw0j1x2w2m45k6iqbzm7nydfdx1x89673vsvb90whdgvjbp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-descbinds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-descbinds";
           sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
           name = "helm-descbinds";
         };
@@ -11610,7 +11820,7 @@
           sha256 = "0vmlpj6zfif5f3wzgq8lkfqprl3z5gjsqj86347krblgfzhqlz30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-firefox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-firefox";
           sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
           name = "helm-firefox";
         };
@@ -11631,7 +11841,7 @@
           sha256 = "00ls9v3jdpz3wka90crd193z3ipwnf1b0slmldn4vb9ivrndh6wn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ghc";
           sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
           name = "helm-ghc";
         };
@@ -11644,15 +11854,15 @@
     helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ghq";
-        version = "1.5.1";
+        version = "1.6.0";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-ghq";
-          rev = "2997646b2fb5421ab435b772dd2dbaeb92d70166";
-          sha256 = "0rlk9016rxj292kpxrnqgrm4xsjs4m4gk2fwh8z3fcihi013lxaw";
+          rev = "db37bfe290b234ed3f39dcce24667072172ded41";
+          sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
           name = "helm-ghq";
         };
@@ -11673,7 +11883,7 @@
           sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-github-stars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-github-stars";
           sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
           name = "helm-github-stars";
         };
@@ -11694,7 +11904,7 @@
           sha256 = "1hc7j3gwljb1wk2727f66m3f7ga4icbklp54vlm0vf2bmii1ynil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gitlab";
           sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
           name = "helm-gitlab";
         };
@@ -11707,15 +11917,15 @@
     helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-gtags";
-        version = "1.5.2";
+        version = "1.5.4";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-gtags";
-          rev = "7fb96b900fb8640993354a2f83732a50da529d03";
-          sha256 = "1gfshy0brlfa8z39savj2a0jlfpqffijshsyjpz28ig2ggv8amnh";
+          rev = "f14ff7140d0f070b089df7567f2cc6b437ab9924";
+          sha256 = "1hqmwbdcjssvvl7prdykhlgbfrf4qylkvqp0nnnxp8r1wy6h6aws";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gtags";
           sha256 = "0snx0b8b4yc507q3i4fzvrd68xgzqxly8kn5cwp26ik6cv840y29";
           name = "helm-gtags";
         };
@@ -11736,7 +11946,7 @@
           sha256 = "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hatena-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
           name = "helm-hatena-bookmark";
         };
@@ -11757,7 +11967,7 @@
           sha256 = "1imfzz6cfdq7fgrcgrafy2nln929mgh31vybk9frm7a9jpamqdxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hayoo";
           sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
           name = "helm-hayoo";
         };
@@ -11778,7 +11988,7 @@
           sha256 = "0bz2ngw816jvpw1a10j31y5hf1knz0mzz60l073h33qci11jbwid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ispell";
           sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
           name = "helm-ispell";
         };
@@ -11799,7 +12009,7 @@
           sha256 = "1nd562lffc41r3y5x7y46f37ra97avllk2m95w23f9g42h47f1ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-lobsters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-lobsters";
           sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
           name = "helm-lobsters";
         };
@@ -11820,7 +12030,7 @@
           sha256 = "0azs971d7pqd4ddxzy7bfs52cmrjbafwrcnf57afw39d772rzpdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-git";
           sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
           name = "helm-ls-git";
         };
@@ -11841,7 +12051,7 @@
           sha256 = "1hma79i69l8ilkr3l4b8zqk3ny62vqr1ym2blymia4ibwk4zqbda";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-hg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-hg";
           sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
           name = "helm-ls-hg";
         };
@@ -11862,7 +12072,7 @@
           sha256 = "17ls0bplnja2qvg3129x2irgsgs7l4bjj0qi7b9z16i6knjkwfya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-make";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-make";
           sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
           name = "helm-make";
         };
@@ -11883,7 +12093,7 @@
           sha256 = "03588hanfa20pjp9w1bqy8wsf5x6az0vfq0bmcnr4xvlf6fhkyxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-migemo";
           sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
           name = "helm-migemo";
         };
@@ -11904,7 +12114,7 @@
           sha256 = "1srx5f0s9x7zan7ayqd6scxfhcvr3nkd4yzs96hphd87rb18apzk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mode-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mode-manager";
           sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
           name = "helm-mode-manager";
         };
@@ -11925,7 +12135,7 @@
           sha256 = "0gknncyhr2392xkvghgy5mh6gdv6qzvswidx2wy04ypb4s0vxgq2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mt";
           sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
           name = "helm-mt";
         };
@@ -11946,7 +12156,7 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-nixos-options";
           sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
           name = "helm-nixos-options";
         };
@@ -11967,7 +12177,7 @@
           sha256 = "1hq1nnmgkx0a8sv6g8k4v9f0102qg7jga0hcjnr8lcji51nqrcya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-open-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-open-github";
           sha256 = "121sszwvihbv688nq5lhdclvsjj8759glh42h82r4pcw30lxggxb";
           name = "helm-open-github";
         };
@@ -11988,7 +12198,7 @@
           sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-orgcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-orgcard";
           sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
           name = "helm-orgcard";
         };
@@ -12009,7 +12219,7 @@
           sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-package";
           sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
           name = "helm-package";
         };
@@ -12030,7 +12240,7 @@
           sha256 = "1r2ndmrw5ivawb940j8jnmqzxv46qrzd3cqh9fvxx5yicf020fjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pages";
           sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
           name = "helm-pages";
         };
@@ -12051,7 +12261,7 @@
           sha256 = "01cj2897hqz02mfz32nxlyyp59iwm0gz1zj11s8ll7pwy9q3r90g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-perldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-perldoc";
           sha256 = "0b0cl2xj5w1r71zrjhnqhrzsnz1296jv21qx5adzslra6lk55q2r";
           name = "helm-perldoc";
         };
@@ -12072,7 +12282,7 @@
           sha256 = "0y0a18bj2k459fk51z7svnnasqkl78bx61y5ha1yv3sqnppgdw2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-proc";
           sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
           name = "helm-proc";
         };
@@ -12093,7 +12303,7 @@
           sha256 = "1q7hfj8ldwivhjp9ns5pvsn0ds6pyvl2zhl366c22s6q8jmbr8ik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-project-persist";
           sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
           name = "helm-project-persist";
         };
@@ -12114,7 +12324,7 @@
           sha256 = "0jm6nnnjyd4kmm1knh0mq3xhnw2hvs3linwlynj8yaliqvlv6brv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pt";
           sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
           name = "helm-pt";
         };
@@ -12135,7 +12345,7 @@
           sha256 = "1ik0vllakh73kc2zbgii4sm33n9pj388gaz69j4drz2mik307zvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pydoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pydoc";
           sha256 = "0cnbhjw951f8sci63cvzcc65d0ffdx3rb8l1g38qql5rzkam48fn";
           name = "helm-pydoc";
         };
@@ -12156,7 +12366,7 @@
           sha256 = "1f1ijna97dn190if3nwk5s5rldlpryfb7wvgg0imwqyp25h4all7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-recoll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-recoll";
           sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
           name = "helm-recoll";
         };
@@ -12177,7 +12387,7 @@
           sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-robe";
           sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
           name = "helm-robe";
         };
@@ -12198,7 +12408,7 @@
           sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rubygems-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rubygems-org";
           sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
           name = "helm-rubygems-org";
         };
@@ -12219,7 +12429,7 @@
           sha256 = "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-sage";
           sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
           name = "helm-sage";
         };
@@ -12240,7 +12450,7 @@
           sha256 = "0kz0vfp43n7f9l53rji2pb8v6ylg63i37q0bmidmjjvsinimwj44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-spaces";
           sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
           name = "helm-spaces";
         };
@@ -12261,7 +12471,7 @@
           sha256 = "1lkjrz9ma2bxr8vskdm3sgrmsyiic798q3271dw38d453bhv4bl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-swoop";
           sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
           name = "helm-swoop";
         };
@@ -12282,7 +12492,7 @@
           sha256 = "0rzbdrs5d5a0icpxrqik2iaz8i5bacw6nm2caf75s9w9j0j6s9li";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-themes";
           sha256 = "1j64w6dnxmq0rfycci9wfy2z5lbddsggf486pknxfgwwqgvns90l";
           name = "helm-themes";
         };
@@ -12303,7 +12513,7 @@
           sha256 = "14lbdvs9xdnipsn3lywbvgsqwqnbm8fxm6d1ilq0cj5z6zkxkya0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-unicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-unicode";
           sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4";
           name = "helm-unicode";
         };
@@ -12324,7 +12534,7 @@
           sha256 = "0s8zp3kx2kxlfyd26yr3lphwcybhbm8qa9vzmxr3kaylwy6jpz5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-w32-launcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-w32-launcher";
           sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
           name = "helm-w32-launcher";
         };
@@ -12345,7 +12555,7 @@
           sha256 = "1j6ssbjbm5ym3pg0icpfp735y4dfhlky9qhl9hwp2n3wmba5g9h1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-zhihu-daily";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-zhihu-daily";
           sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
           name = "helm-zhihu-daily";
         };
@@ -12366,7 +12576,7 @@
           sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hi2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hi2";
           sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
           name = "hi2";
         };
@@ -12387,7 +12597,7 @@
           sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-blocks";
           sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
           name = "highlight-blocks";
         };
@@ -12408,7 +12618,7 @@
           sha256 = "08czwa165rnd5z0dwwdddn7zi5w63sdk31l47bj0598kbly01n7r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-defined";
           sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
           name = "highlight-defined";
         };
@@ -12429,7 +12639,7 @@
           sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-indentation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-indentation";
           sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
           name = "highlight-indentation";
         };
@@ -12450,7 +12660,7 @@
           sha256 = "0ffhc5s0h34064bix4qyiiyx30m4hpv0phmxwcrwiyvanj9ggfai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-numbers";
           sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
           name = "highlight-numbers";
         };
@@ -12471,7 +12681,7 @@
           sha256 = "08ld4wjrkd77cghmrf1n2hn2yzid7bdqwz6b1rzzqaiwxl138iy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-parentheses";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-parentheses";
           sha256 = "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k";
           name = "highlight-parentheses";
         };
@@ -12492,7 +12702,7 @@
           sha256 = "1ahg9qzss67jpw0wp2izys6lyss4nqjy9320fpa4vdx39msdmjjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-quoted";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-quoted";
           sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
           name = "highlight-quoted";
         };
@@ -12513,7 +12723,7 @@
           sha256 = "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-symbol";
           sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
           name = "highlight-symbol";
         };
@@ -12534,7 +12744,7 @@
           sha256 = "0hb74j5137yj3rm2si16xzwmcvkiwx8ywh1qrlnrzv5gl4viyjzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hindent";
           sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
           name = "hindent";
         };
@@ -12555,7 +12765,7 @@
           sha256 = "0mzk4agkcaaw7gryi0wrxv0blqndqsjf1ivdvr2nrnqi798sdhbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-expand-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-expand-slime";
           sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
           name = "hippie-expand-slime";
         };
@@ -12576,7 +12786,7 @@
           sha256 = "0nfr8ad0klqwi97fjchvwx9mfc672lhv3ll166sr8vn6jlh7rkv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-namespace";
           sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
           name = "hippie-namespace";
         };
@@ -12597,7 +12807,7 @@
           sha256 = "0dy98sg92xvnr4algm2v2bnjcdwzv0b0vqk0312b0ziinkzisas1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/history";
           sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
           name = "history";
         };
@@ -12618,7 +12828,7 @@
           sha256 = "1mxicha6m61qxz1mv9z76x4g9fpqk4ch9i6jf7nnpxd6x4xz3f7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/historyf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/historyf";
           sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
           name = "historyf";
         };
@@ -12639,7 +12849,7 @@
           sha256 = "12ab825dldiqymy4md8ssfnbbhrgczkwdiwd3llsdq6sayar16as";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-anything";
           sha256 = "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k";
           name = "hl-anything";
         };
@@ -12660,7 +12870,7 @@
           sha256 = "1hgigbgppdhmr7rc901r95kyydjk05dck8mwbryh7kpglns365fa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-sentence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-sentence";
           sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
           name = "hl-sentence";
         };
@@ -12681,7 +12891,7 @@
           sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-sexp";
           sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
           name = "hl-sexp";
         };
@@ -12702,7 +12912,7 @@
           sha256 = "07irwpg794fdzsixmcbi1lnafj5gynhrdam7frcpmvb26a0l8fxq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
           name = "hl-todo";
         };
@@ -12723,7 +12933,7 @@
           sha256 = "1wg6vc9swwspi6s6jpig3my83i2pq8vkq2cy1q3an87rczacmfzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hoa-pp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hoa-pp-mode";
           sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
           name = "hoa-pp-mode";
         };
@@ -12744,7 +12954,7 @@
           sha256 = "1n8r4jrk71dg25ca6bsw11ky0dszdj4pvqwsmy3msqlji1ckvqyn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/homebrew-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/homebrew-mode";
           sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
           name = "homebrew-mode";
         };
@@ -12765,7 +12975,7 @@
           sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hookify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hookify";
           sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
           name = "hookify";
         };
@@ -12786,7 +12996,7 @@
           sha256 = "0k09n66jar0prq9aal2h3izp1y67jibdx0gjr0g4jx1p1yxig1dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ht";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ht";
           sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
           name = "ht";
         };
@@ -12807,7 +13017,7 @@
           sha256 = "0c648dl5zwjrqx9n6zr6nyzx2zcnv05d5i4hvhjpl9q3y011ncns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/html-to-markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/html-to-markdown";
           sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
           name = "html-to-markdown";
         };
@@ -12828,7 +13038,7 @@
           sha256 = "1h9n388fi17nbyfciqywgrq3n165kpiildbimx59qyk2ac3v7rqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/httpcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/httpcode";
           sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
           name = "httpcode";
         };
@@ -12849,7 +13059,7 @@
           sha256 = "0dd257988bdar9hl2711ch5qshx9jc11fqxcvbrd7rc1va5cshs9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/httprepl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/httprepl";
           sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
           name = "httprepl";
         };
@@ -12870,7 +13080,7 @@
           sha256 = "1b8992vzq5bh01pjlj181nzqjrqs4fbjpwvv8h7gjq42sf8w59sm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hyai";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hyai";
           sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
           name = "hyai";
         };
@@ -12891,7 +13101,7 @@
           sha256 = "0nwsmc4c3v0wbfy917ik9k7yz8yclfac695p7p9sh9y354k3maw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hyde";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hyde";
           sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
           name = "hyde";
         };
@@ -12912,7 +13122,7 @@
           sha256 = "08iw95lyizcyf6cjl37fm8wvay0vsk9758pk9gq9f2xiafcchl7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hydra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hydra";
           sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
           name = "hydra";
         };
@@ -12933,7 +13143,7 @@
           sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-projectile";
           sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
           name = "ibuffer-projectile";
         };
@@ -12954,7 +13164,7 @@
           sha256 = "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-vc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-vc";
           sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
           name = "ibuffer-vc";
         };
@@ -12975,7 +13185,7 @@
           sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/identica-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/identica-mode";
           sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
           name = "identica-mode";
         };
@@ -12996,7 +13206,7 @@
           sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idle-highlight-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idle-highlight-mode";
           sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
           name = "idle-highlight-mode";
         };
@@ -13017,7 +13227,7 @@
           sha256 = "1ffmsmi31jc0gqnbdxrd8ipsy790bn6hgq3rmayylavmdpg3qfd5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-complete-space-or-hyphen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-complete-space-or-hyphen";
           sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
           name = "ido-complete-space-or-hyphen";
         };
@@ -13038,7 +13248,7 @@
           sha256 = "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-completing-read+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-completing-read+";
           sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
           name = "ido-completing-read-plus";
         };
@@ -13051,15 +13261,15 @@
     ido-describe-bindings = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-describe-bindings";
-        version = "0.0.8";
+        version = "0.0.9";
         src = fetchFromGitHub {
           owner = "danil";
           repo = "ido-describe-bindings";
-          rev = "c84054942d03a19ee65716db89771c4a157ff696";
-          sha256 = "1q8vqmdfhbmciwn1i1ln7xx2i41kknv030hf6a88grl4rzqffm70";
+          rev = "1f5c78bf56f2cab137a323ec426e906f2215bf7f";
+          sha256 = "0055dda1la7yah33xsi19j4hcdmqp17ily2dvkipm4y6d3ww8yqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-describe-bindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-describe-bindings";
           sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
           name = "ido-describe-bindings";
         };
@@ -13080,7 +13290,7 @@
           sha256 = "0f1p6cnl0arcc2y1h99nqcflp7byvyf6hj6fmv5xqggs66qc72lb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-grid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-grid-mode";
           sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
           name = "ido-grid-mode";
         };
@@ -13101,7 +13311,7 @@
           sha256 = "1z7az7h90v72llxvdclcywvf1qd0nhkfa45bp99xi7cy7sqsqssf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-load-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-load-library";
           sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
           name = "ido-load-library";
         };
@@ -13114,15 +13324,15 @@
     ido-occur = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-occur";
-        version = "0.1.3";
+        version = "0.1.4";
         src = fetchFromGitHub {
           owner = "danil";
           repo = "ido-occur";
-          rev = "247ee110dc085f9f5577aa02241c3ad66164b455";
-          sha256 = "1qvx1v5xrfv1id6lfn767b667m2hn4rsw2nmb61j1i81csdiqjds";
+          rev = "7d2e42bf239cacb90e6240b8014e6b20b24e89cf";
+          sha256 = "0j12li001yq08vzwh1b25qyq09llizrkgaay9k07g9pvfxlx6zb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-occur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-occur";
           sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
           name = "ido-occur";
         };
@@ -13143,7 +13353,7 @@
           sha256 = "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-ubiquitous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-ubiquitous";
           sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
           name = "ido-ubiquitous";
         };
@@ -13164,7 +13374,7 @@
           sha256 = "1lv82q639xjnmvby56nwqn23ijh6f163bk675s33dkingm8csj8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-vertical-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-vertical-mode";
           sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
           name = "ido-vertical-mode";
         };
@@ -13185,7 +13395,7 @@
           sha256 = "0i3s80ws3qbhb3vsvf09mbq661c5140v4phgbl4cz6z545ha2bj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-yes-or-no";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-yes-or-no";
           sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
           name = "ido-yes-or-no";
         };
@@ -13206,7 +13416,7 @@
           sha256 = "0bq0kx0889rdy8aasxbpmb0a4awpk2b24zv6x1dmhacmc5rj11i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idomenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idomenu";
           sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
           name = "idomenu";
         };
@@ -13227,7 +13437,7 @@
           sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idris-mode";
           sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
           name = "idris-mode";
         };
@@ -13248,7 +13458,7 @@
           sha256 = "06qv95bgcb6n3zcjs2i1q80v9040z7m9pb9xbhxmqzcx68vpbpdm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iedit";
           sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
           name = "iedit";
         };
@@ -13269,7 +13479,7 @@
           sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iflipb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iflipb";
           sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
           name = "iflipb";
         };
@@ -13290,7 +13500,7 @@
           sha256 = "1j40ldvgd7nr7pabi8mhzdvi0ml9n62m8mfjlh9nrbnkcsifs9rk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ignoramus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ignoramus";
           sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
           name = "ignoramus";
         };
@@ -13311,7 +13521,7 @@
           sha256 = "0imvxzcja91cd19zm2frqfpxm8j0bc89w9s7q0pkpvyjz44kjbq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image-archive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image-archive";
           sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
           name = "image-archive";
         };
@@ -13332,7 +13542,7 @@
           sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image-dired+";
           sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
           name = "image-dired-plus";
         };
@@ -13353,7 +13563,7 @@
           sha256 = "0k69xbih0273xvmj035vcmm67l6hgjb99pb1jbva5x0pnszb1vdv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image+";
           sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
           name = "image-plus";
         };
@@ -13374,7 +13584,7 @@
           sha256 = "0qc96p5f7paxaxzv73w072cba8jb6ibdbhml7n7cm85b0rz1wf16";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu-anywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu-anywhere";
           sha256 = "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8";
           name = "imenu-anywhere";
         };
@@ -13395,7 +13605,7 @@
           sha256 = "192i3iaykw5a9fb9xaivfjj2pbziqdnadlrvqbxbl9h5wi52qq9c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu-list";
           sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
           name = "imenu-list";
         };
@@ -13416,7 +13626,7 @@
           sha256 = "18nx5z2vn0ikv4gxjprsqr63pcgf9s02gc3f769h8dji560kqxd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenus";
           sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
           name = "imenus";
         };
@@ -13437,7 +13647,7 @@
           sha256 = "19jqcbiwqknlpij9q63m1p69k4zb3v1qdx0858drprc2rl1p55cd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imgix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imgix";
           sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
           name = "imgix";
         };
@@ -13458,7 +13668,7 @@
           sha256 = "1pf7pqh8yzyvh4gzvp5npfq8kcfjcbzra0kkw7zmz769xxc8v84x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/immutant-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/immutant-server";
           sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
           name = "immutant-server";
         };
@@ -13471,15 +13681,15 @@
     import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "import-js";
-        version = "0.3.1";
+        version = "0.4.1";
         src = fetchFromGitHub {
           owner = "trotzig";
           repo = "import-js";
-          rev = "e16a73f16d38d3c30bb2303b176568de6f30f533";
-          sha256 = "1511zk9nm48wr5mhm6xs86n3w7iij6zs20yqza6w3yn460h0kxmb";
+          rev = "732cd36da156398c1ee3b5f08e5c3c3d020f24f8";
+          sha256 = "00gpyz63lqb2ydvjxjagf2cpja8gw6xbyw82cdj64k53mn86cyvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/import-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/import-js";
           sha256 = "1grvzy378qj14wlbmhb3j7fx2zkl9wp65b5g0brjimav08nz7bls";
           name = "import-js";
         };
@@ -13500,7 +13710,7 @@
           sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/import-popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/import-popwin";
           sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
           name = "import-popwin";
         };
@@ -13521,7 +13731,7 @@
           sha256 = "1dmr1arqy2vs9jdjha513mvw3yfwgkn4zs728q83asjy91sfcz7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-clojure";
           sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
           name = "inf-clojure";
         };
@@ -13542,7 +13752,7 @@
           sha256 = "11zsprv5ycnfqi358dd4cx70dbn6a8hccd4prf28lln7vhldbmjz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-ruby";
           sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
           name = "inf-ruby";
         };
@@ -13563,7 +13773,7 @@
           sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inflections";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
           name = "inflections";
         };
@@ -13584,7 +13794,7 @@
           sha256 = "031vb7ndz68x0119v4pyizz0ykd341ywcp5s7i4z35zx1vcqj8az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/init-loader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/init-loader";
           sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
           name = "init-loader";
         };
@@ -13605,7 +13815,7 @@
           sha256 = "06w1vnfhjy8g62z6xajin5akgh30pa0kk56am61kv6mi5ia8fc96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/init-open-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/init-open-recentf";
           sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
           name = "init-open-recentf";
         };
@@ -13626,7 +13836,7 @@
           sha256 = "1rfw38a63bvzglqx7mb8wlnzjvlmkhkn35hn66snqqgvnmnvi54g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/initsplit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/initsplit";
           sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
           name = "initsplit";
         };
@@ -13647,7 +13857,7 @@
           sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inline-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inline-crypt";
           sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
           name = "inline-crypt";
         };
@@ -13668,7 +13878,7 @@
           sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inlineR";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inlineR";
           sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
           name = "inlineR";
         };
@@ -13689,7 +13899,7 @@
           sha256 = "1mqnz40zirnyn3wa71wzzjph3a0sbgvzcywcr7xnzqpl6sp7g93f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/insert-shebang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/insert-shebang";
           sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
           name = "insert-shebang";
         };
@@ -13709,7 +13919,7 @@
           sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/instapaper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/instapaper";
           sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
           name = "instapaper";
         };
@@ -13730,7 +13940,7 @@
           sha256 = "1bidhc4pgszx2gqsm125nw7i5ysy0mzc1ifcfkfgns1cpjr74rpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interleave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interleave";
           sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
           name = "interleave";
         };
@@ -13751,7 +13961,7 @@
           sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iplayer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iplayer";
           sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
           name = "iplayer";
         };
@@ -13772,7 +13982,7 @@
           sha256 = "036q933yw7pimnnq43ydaqqfccgf4iwvjhjmsavp7l6y1w16rvmy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ir-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ir-black-theme";
           sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
           name = "ir-black-theme";
         };
@@ -13793,7 +14003,7 @@
           sha256 = "1wsh72dzm54srxdnlhnmbi8llc30syhbckycj5wmsamw8b89p7c2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/irony";
           sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
           name = "irony";
         };
@@ -13814,7 +14024,7 @@
           sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isgd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isgd";
           sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
           name = "isgd";
         };
@@ -13835,7 +14045,7 @@
           sha256 = "0rpxh1jv98dl9b5ldjkljk70z4hkl61kcmvy1lhpj3lxn8ysv87a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ix";
           sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
           name = "ix";
         };
@@ -13856,7 +14066,7 @@
           sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/j-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/j-mode";
           sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
           name = "j-mode";
         };
@@ -13875,7 +14085,7 @@
           sha256 = "af89d7052e555c7b5efb0c21387a50699056659fb83698691b70e75c88e4cd34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jabber";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jabber";
           sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
           name = "jabber";
         };
@@ -13896,7 +14106,7 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jade-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jade-mode";
           sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
           name = "jade-mode";
         };
@@ -13917,7 +14127,7 @@
           sha256 = "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jammer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jammer";
           sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
           name = "jammer";
         };
@@ -13938,7 +14148,7 @@
           sha256 = "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/japanlaw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/japanlaw";
           sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
           name = "japanlaw";
         };
@@ -13948,6 +14158,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
+    melpaBuild {
+        pname = "java-imports";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "dakrone";
+          repo = "emacs-java-imports";
+          rev = "275f354c245df741b45e88d085660722e81a12be";
+          sha256 = "1bngn6v6w60qb3zz7s3px7v3wk99a3hfvzrg9l06dz1q7xgyvsi1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/java-imports";
+          sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98";
+          name = "java-imports";
+        };
+        packageRequires = [ emacs pcache s ];
+        meta = {
+          homepage = "http://melpa.org/#/java-imports";
+          license = lib.licenses.free;
+        };
+      }) {};
     javadoc-lookup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "javadoc-lookup";
@@ -13959,7 +14190,7 @@
           sha256 = "0ljpqgp2w3lr61n2vr748n3wyshlqnnbin0643jffa319l99z35r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/javadoc-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/javadoc-lookup";
           sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
           name = "javadoc-lookup";
         };
@@ -13980,7 +14211,7 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi";
           sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
           name = "jedi";
         };
@@ -14001,7 +14232,7 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi-core";
           sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
           name = "jedi-core";
         };
@@ -14022,7 +14253,7 @@
           sha256 = "1gf6ir4viy8zr9fwmjz4s7zkr3m7947sa8mai56bnv83r2k3s9ir";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js-comint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
           name = "js-comint";
         };
@@ -14043,7 +14274,7 @@
           sha256 = "0d2hqlgm09rw0azha5dxmq63b56sa8b9qj7gd7invibl6nnyjh4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-closure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-closure";
           sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
           name = "js2-closure";
         };
@@ -14064,7 +14295,7 @@
           sha256 = "0r2szaxr3q0gvxqd9asn03q8jf3nclxv4mqdsjn96s98n45x388l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-highlight-vars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-highlight-vars";
           sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
           name = "js2-highlight-vars";
         };
@@ -14085,7 +14316,7 @@
           sha256 = "0xj87grvg7pbhh4d239gaqai5gl72klhpp9yksaqn77qnm98q4fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-mode";
           sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
           name = "js2-mode";
         };
@@ -14106,7 +14337,7 @@
           sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-refactor";
           sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
           name = "js2-refactor";
         };
@@ -14127,7 +14358,7 @@
           sha256 = "17d0nf1kz7mgv5qz57q6khy4w5vrmsliqirggahk9s6nnsx1j56n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js3-mode";
           sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
           name = "js3-mode";
         };
@@ -14148,7 +14379,7 @@
           sha256 = "0pjmslxwmlb9cb3j5qfsyxq1lg1ywzw1p9dvj330c2m7nla1j70x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jsfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jsfmt";
           sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
           name = "jsfmt";
         };
@@ -14169,7 +14400,7 @@
           sha256 = "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-mode";
           sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
           name = "json-mode";
         };
@@ -14190,7 +14421,7 @@
           sha256 = "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-reformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-reformat";
           sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
           name = "json-reformat";
         };
@@ -14211,7 +14442,7 @@
           sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-snatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-snatcher";
           sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
           name = "json-snatcher";
         };
@@ -14232,7 +14463,7 @@
           sha256 = "1wx28rr5dk238yz07xn95v88qmv10c1gz9pcxard2kszpnmrn6dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jsx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jsx-mode";
           sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
           name = "jsx-mode";
         };
@@ -14253,7 +14484,7 @@
           sha256 = "0kvk1qiy2cj0iw2c0mx0dyr3jjvhyj1gwym6l43n7clp5kqcij1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/julia-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/julia-mode";
           sha256 = "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm";
           name = "julia-mode";
         };
@@ -14274,7 +14505,7 @@
           sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump";
           sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
           name = "jump";
         };
@@ -14295,7 +14526,7 @@
           sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump-to-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump-to-line";
           sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
           name = "jump-to-line";
         };
@@ -14316,7 +14547,7 @@
           sha256 = "1785nsv61m51lpykai2wxrv6zmwbm5654v937fgw177p37054s83";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jvm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jvm-mode";
           sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
           name = "jvm-mode";
         };
@@ -14337,7 +14568,7 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar";
           sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
           name = "kaesar";
         };
@@ -14358,7 +14589,7 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar-file";
           sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
           name = "kaesar-file";
         };
@@ -14379,7 +14610,7 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar-mode";
           sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
           name = "kaesar-mode";
         };
@@ -14400,7 +14631,7 @@
           sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kakapo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kakapo-mode";
           sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
           name = "kakapo-mode";
         };
@@ -14421,7 +14652,7 @@
           sha256 = "0avcg307r4navvgj3hjkggk4gr7mzs4mljhxh223r8g69l9bm6m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/karma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/karma";
           sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
           name = "karma";
         };
@@ -14442,7 +14673,7 @@
           sha256 = "14ijniyvcfmj4y77yhiplsclincng2r3jbdnmmdnwzliv65f7l6q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-combo";
           sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
           name = "key-combo";
         };
@@ -14463,7 +14694,7 @@
           sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-seq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-seq";
           sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
           name = "key-seq";
         };
@@ -14484,7 +14715,7 @@
           sha256 = "07h6s1wdc83cqf08vqm4gh2r7bihbar4a31wr0140fn4rbhicwdw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keychain-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keychain-environment";
           sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
           name = "keychain-environment";
         };
@@ -14505,7 +14736,7 @@
           sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keydef";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keydef";
           sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
           name = "keydef";
         };
@@ -14526,7 +14757,7 @@
           sha256 = "0ways4ksb9pk2kkpgclsxgc0ycfwcr8vghlbv5ic4y0c4ycmlb2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyfreq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyfreq";
           sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
           name = "keyfreq";
         };
@@ -14547,7 +14778,7 @@
           sha256 = "06ajkqxv71hcrwc707ybzwfw4yzbsp6basnbs493ryr41gnvmnzs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keymap-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keymap-utils";
           sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
           name = "keymap-utils";
         };
@@ -14568,7 +14799,7 @@
           sha256 = "0z6sgz8nywsd00zaayafwy5hfi7kzxfifjkfr5cn1l7wlypyksfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyset";
           sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
           name = "keyset";
         };
@@ -14589,7 +14820,7 @@
           sha256 = "0ky167xh1hrmqsldybzjhyqjizgjzs1grn5mf8sm2j9qwcvjw2zv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kibit-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kibit-helper";
           sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
           name = "kibit-helper";
         };
@@ -14602,15 +14833,15 @@
     kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kill-or-bury-alive";
-        version = "0.1.1";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "kill-or-bury-alive";
-          rev = "6e0d1ff08889d9cf3f89e366e327d9de930cf67c";
-          sha256 = "11cqrjxfiflz89gkl9g5m0wx041s28xz879cvhl3i1yjnwyhzqay";
+          rev = "b488c3dbba657bbd524402f48fde16ab6b1211db";
+          sha256 = "1c5al7cyfnb0p5ya2aa5afadzbrrc079jx3r6zpkr64psskrhdv5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kill-or-bury-alive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kill-or-bury-alive";
           sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
           name = "kill-or-bury-alive";
         };
@@ -14631,7 +14862,7 @@
           sha256 = "0axvhikhg4fikiz4ifg0p4a5ygphbpjs0wd0gcbx29n0y54d1i93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kill-ring-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kill-ring-search";
           sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
           name = "kill-ring-search";
         };
@@ -14652,7 +14883,7 @@
           sha256 = "0imylcaiwpzvvb3g8kpsna1vk7v7bwdjfcsa98i41m1rv9yla86l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/killer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/killer";
           sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
           name = "killer";
         };
@@ -14673,7 +14904,7 @@
           sha256 = "0rzzjzkzgpiadm9awkj7wrh2hg97lhgwxg74gvdis3fc1xg2hyri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kivy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kivy-mode";
           sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
           name = "kivy-mode";
         };
@@ -14694,7 +14925,7 @@
           sha256 = "08q43k4450kgygyvqv18gwcmmb7y9x445401048lbixc4cp6p3cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/know-your-http-well";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/know-your-http-well";
           sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
           name = "know-your-http-well";
         };
@@ -14715,7 +14946,7 @@
           sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kurecolor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kurecolor";
           sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
           name = "kurecolor";
         };
@@ -14736,7 +14967,7 @@
           sha256 = "1i8wbhc6i88plpq48ccka0avdj2x5rcxm81j93dmwp70ld0zws8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/langtool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/langtool";
           sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
           name = "langtool";
         };
@@ -14757,7 +14988,7 @@
           sha256 = "1rr6cgx70avqf1b19la7g8cav926676a76cflkkw18c1bsw83ss3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-extra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-extra";
           sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
           name = "latex-extra";
         };
@@ -14778,7 +15009,7 @@
           sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-math-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-math-preview";
           sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
           name = "latex-math-preview";
         };
@@ -14795,11 +15026,11 @@
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger";
-          rev = "f612ef0b25a6f679fae47f8371bcd4c25a380b02";
-          sha256 = "011a0l2jx4x687s3mqhhyrgpwxqcjv0cn4alhd55caql6z5cwh5h";
+          rev = "9b49ade03a3e5d9089ee031bdf733004cee8a36e";
+          sha256 = "0cp5ywmk48sd7c8s8d5a0sv0ng4fl0hybss2z8fwhw6z47iypzmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ledger-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ledger-mode";
           sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s";
           name = "ledger-mode";
         };
@@ -14820,7 +15051,7 @@
           sha256 = "04h6vk7w25yp4kzkwqnsmc59bm0182qqkyk5nxm3a1lv1v1590lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lentic";
           sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
           name = "lentic";
         };
@@ -14841,7 +15072,7 @@
           sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/less-css-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/less-css-mode";
           sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
           name = "less-css-mode";
         };
@@ -14862,7 +15093,7 @@
           sha256 = "1l9qjmyb4a3f6i2iimpmjczbx890cd1p24n941s13sg67xfbm7hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/letcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/letcheck";
           sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
           name = "letcheck";
         };
@@ -14883,7 +15114,7 @@
           sha256 = "1w9n5v4g4w34gii6nk2aan4w230dmm0dhml4s9q1fzmvk1ngld6k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lfe-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lfe-mode";
           sha256 = "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx";
           name = "lfe-mode";
         };
@@ -14904,7 +15135,7 @@
           sha256 = "0hi8s20vw4a5i5n5jlm5dzgsl1qpfyqbpskqszjls1xrrf3dd4zl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lice";
           sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
           name = "lice";
         };
@@ -14925,7 +15156,7 @@
           sha256 = "11sw43z5b0vypmhi0yysf2bxjy8fqpzl61y503jb7nhcfywmfkys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lingr";
           sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
           name = "lingr";
         };
@@ -14946,7 +15177,7 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/link";
           sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
           name = "link";
         };
@@ -14967,7 +15198,7 @@
           sha256 = "1v4fadxv7ym6lc09nd2xpz2k5vrikjv7annw99ii5cqrwhqa5838";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/link-hint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/link-hint";
           sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
           name = "link-hint";
         };
@@ -14988,7 +15219,7 @@
           sha256 = "1m4g4b96cxs05pfln7kdi6gvrdbv76f8dk806py5lq0gq7da2csc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/linum-relative";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/linum-relative";
           sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
           name = "linum-relative";
         };
@@ -15009,7 +15240,7 @@
           sha256 = "05iqhnhj61f30yk4ih63rimmyp134gyq18frc8qgrnwym64dsm6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispy";
           sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
           name = "lispy";
         };
@@ -15037,7 +15268,7 @@
           sha256 = "0qyj04p63fdh3iasp5cna1z5fhibmfyl9lvwyh22ajzsfbr3nhnk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispyscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispyscript-mode";
           sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
           name = "lispyscript-mode";
         };
@@ -15058,7 +15289,7 @@
           sha256 = "197cqkiwxgamhfwbc8h492cmjll3fypkwzcphj26dfnr22v63kwq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-packages-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-packages-ext";
           sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
           name = "list-packages-ext";
         };
@@ -15079,7 +15310,7 @@
           sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-unicode-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-unicode-display";
           sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
           name = "list-unicode-display";
         };
@@ -15100,7 +15331,7 @@
           sha256 = "0dmcmvf3dxmp1f71nq5xwsdrnyb04qr14ay4ckpaca2bmi7q0x5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-utils";
           sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
           name = "list-utils";
         };
@@ -15121,7 +15352,7 @@
           sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lit-mode";
           sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
           name = "lit-mode";
         };
@@ -15142,7 +15373,7 @@
           sha256 = "1fh9wrw5irn0g3dy8gkk63csdcxgi3w2038mxx3sk6ki3r2bmhw8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/literate-coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/literate-coffee-mode";
           sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
           name = "literate-coffee-mode";
         };
@@ -15163,7 +15394,7 @@
           sha256 = "1cwydbhhbs5v9y2s872zxc5lflqmfrdvnc8xz0qars52d7lg4br5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/live-code-talks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/live-code-talks";
           sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
           name = "live-code-talks";
         };
@@ -15184,7 +15415,7 @@
           sha256 = "1y81qqsjj2sa319xkwhvq7bl3f5gma4cs7w8x2w510ms32fgqa8x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/live-py-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/live-py-mode";
           sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
           name = "live-py-mode";
         };
@@ -15205,7 +15436,7 @@
           sha256 = "1089sbx20r30sis39vwy29fxhb2n3hh35rdv09lpzdxdq01s8wwp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loc-changes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loc-changes";
           sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
           name = "loc-changes";
         };
@@ -15226,7 +15457,7 @@
           sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/log4e";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/log4e";
           sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
           name = "log4e";
         };
@@ -15268,7 +15499,7 @@
           sha256 = "0g5vq9xy9lwczs77lr91c1srhhfmasnnnmjvgc55hbl6iwmbizbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logalimacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logalimacs";
           sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
           name = "logalimacs";
         };
@@ -15289,7 +15520,7 @@
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logito";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logito";
           sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
           name = "logito";
         };
@@ -15310,7 +15541,7 @@
           sha256 = "1yacic778ranlqblrcdhyf5igbrcin8aj30vjdm4klpmqb73hf1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
           name = "logview";
         };
@@ -15331,7 +15562,7 @@
           sha256 = "1rpvw0dvym559vb4nrfy74jq06nbsz2b0n60lcykagcir8mpcidk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loop";
           sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
           name = "loop";
         };
@@ -15352,7 +15583,7 @@
           sha256 = "11y5jyq4xg9zlm1qi2y97nh05vhva9pai9yyr4x2pr41xz3s8fpk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/love-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/love-minor-mode";
           sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
           name = "love-minor-mode";
         };
@@ -15373,7 +15604,7 @@
           sha256 = "1psk4202rmkkfy1ir1ax4x4djfngd5pfry7x30ybq2ifqzymb9qb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lua-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lua-mode";
           sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
           name = "lua-mode";
         };
@@ -15394,7 +15625,7 @@
           sha256 = "01847f8xmjfxvvi7hf73l7ypkdazwg8ciinm117zp4jkgnv0apz0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/m-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/m-buffer";
           sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc";
           name = "m-buffer";
         };
@@ -15415,7 +15646,7 @@
           sha256 = "0dgsl1x6r8m9vvff1ia0kmz21h0dji2jl5cqlpx1m947zh45dahj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macro-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macro-math";
           sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
           name = "macro-math";
         };
@@ -15436,7 +15667,7 @@
           sha256 = "0dkigxa39f3cmndxw79mgadwsj7w3bphns6l2hzhv6w0wdllpifp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macrostep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macrostep";
           sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
           name = "macrostep";
         };
@@ -15449,15 +15680,15 @@
     magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "magic-filetype";
-        version = "0.1.1";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "magic-filetype.el";
-          rev = "1a3e425ab5b7b6614b7ece5885d23f12f45572f0";
-          sha256 = "128dqgh7kvjywiq0wq6ipnr1l1v2dzrz5j0rd3n2783r9nz0i7r5";
+          rev = "db734bdd7aa429e188a628e772c40542b0216d5c";
+          sha256 = "0i38942lr4b7d624313hgydyy0ynmd6psjkz8xcvbb7gw0kcc436";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magic-filetype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magic-filetype";
           sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
           name = "magic-filetype";
         };
@@ -15470,16 +15701,16 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "2.4.0";
+        version = "2.5.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "2e757a8c919b53edddb186e36e055e011e3b0ab3";
-          sha256 = "0hklwwzi2gqywysxn16ps1fvn48max52cpk2nx7r4df4h52yk6wn";
+          rev = "a3747edc8a4cddc408f7718a3371b46a4b610744";
+          sha256 = "0dydm0gj6jbybi5nkqrpi5bic5yxhz0p5k5gayqzqzmnb1fhl247";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit";
-          sha256 = "099i9h375yfhcylz8mvsm45mkkiyyhx0s1q3icba5n875jvq7smz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit";
+          sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q";
           name = "magit";
         };
         packageRequires = [
@@ -15506,7 +15737,7 @@
           sha256 = "0d7dick96g1vj6c9wh10rgwhwv5j3ixgw1m3z45szszswlrp1bih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-annex";
           sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
           name = "magit-annex";
         };
@@ -15527,7 +15758,7 @@
           sha256 = "1vn6x53kpwv3zf2b5xjswyz6v853r8b9dg88qhwd2h480hrx6kal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-filenotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-filenotify";
           sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7";
           name = "magit-filenotify";
         };
@@ -15548,7 +15779,7 @@
           sha256 = "1jlww053s580d7rlvmr1dl79wxasa0hhh2jnwb1ra353d6h3a73w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-find-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-find-file";
           sha256 = "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b";
           name = "magit-find-file";
         };
@@ -15569,7 +15800,7 @@
           sha256 = "0ym24gjd6c04zry08abcb09zvjbgj8nc1j12q0r51fhzzadxcxbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gerrit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gerrit";
           sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
           name = "magit-gerrit";
         };
@@ -15590,7 +15821,7 @@
           sha256 = "19iqa2kzarpa75xy34hqvpy1y7dzx84pj540wwkj04dnpb4fwj2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gh-pulls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gh-pulls";
           sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
           name = "magit-gh-pulls";
         };
@@ -15611,7 +15842,7 @@
           sha256 = "00711dgbzmplqrfww8xf261ymz3jmhisnv9x1rhcw0ywmlfkbckz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gitflow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gitflow";
           sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
           name = "magit-gitflow";
         };
@@ -15624,15 +15855,15 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "2.4.0";
+        version = "2.5.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "2e757a8c919b53edddb186e36e055e011e3b0ab3";
-          sha256 = "0hklwwzi2gqywysxn16ps1fvn48max52cpk2nx7r4df4h52yk6wn";
+          rev = "a3747edc8a4cddc408f7718a3371b46a4b610744";
+          sha256 = "0dydm0gj6jbybi5nkqrpi5bic5yxhz0p5k5gayqzqzmnb1fhl247";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-popup";
           sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
           name = "magit-popup";
         };
@@ -15653,7 +15884,7 @@
           sha256 = "1pqbrrp4366kwfk1d32h2lb70id32ynfc03i7m2832w97f1xp16c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-rockstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-rockstar";
           sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
           name = "magit-rockstar";
         };
@@ -15674,7 +15905,7 @@
           sha256 = "1mk8g8rr9vf8jm0mmsj33p8gc71nhlv3847hvqywy6z40nhcjnyb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-stgit";
           sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
           name = "magit-stgit";
         };
@@ -15695,7 +15926,7 @@
           sha256 = "1g8zq0s38di96wlhljp370kyj4a0ir1z3vb94k66v2m5nj83ap68";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-svn";
           sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
           name = "magit-svn";
         };
@@ -15716,7 +15947,7 @@
           sha256 = "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-topgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-topgit";
           sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
           name = "magit-topgit";
         };
@@ -15737,7 +15968,7 @@
           sha256 = "0fp5gbin1sgsdz39spk74vadkzig3ydwhpzx9vg7f231kk5f6wzx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/make-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/make-color";
           sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
           name = "make-color";
         };
@@ -15758,7 +15989,7 @@
           sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/makey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/makey";
           sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
           name = "makey";
         };
@@ -15779,7 +16010,7 @@
           sha256 = "0z0ml7l1a45ych61qfc5fvkybl9hh37pgl6lzkaz6mcif1sl8gn1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/malabar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/malabar-mode";
           sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
           name = "malabar-mode";
         };
@@ -15800,7 +16031,7 @@
           sha256 = "0hwxwwjzjxv2mmkxmalr2hp3x8apwcyvn2bz4d4yd4wrzcscay97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/malinka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/malinka";
           sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
           name = "malinka";
         };
@@ -15821,7 +16052,7 @@
           sha256 = "1272fsjzsza9dxm8s64b7x2jzr3ks8wjpwvgcxha2dnsjzklcdcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mallard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mallard-mode";
           sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
           name = "mallard-mode";
         };
@@ -15842,7 +16073,7 @@
           sha256 = "1fkijm0gikbwmxa9hf7s1rcwb0ipzjygd1mlicsm78rxvdd8k877";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/map-progress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/map-progress";
           sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
           name = "map-progress";
         };
@@ -15863,7 +16094,7 @@
           sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/map-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/map-regexp";
           sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
           name = "map-regexp";
         };
@@ -15884,7 +16115,7 @@
           sha256 = "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marcopolo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marcopolo";
           sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
           name = "marcopolo";
         };
@@ -15905,7 +16136,7 @@
           sha256 = "0fcyspz7n97n84d9203mxgn8ar4rn52qa49s3vayfrbkn038j5qw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mark-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mark-tools";
           sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
           name = "mark-tools";
         };
@@ -15925,7 +16156,7 @@
           sha256 = "8091933b49e8dfe57aa10377bd434b7c9b5807e9b78aa7a301885a44db1f7481";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-mode";
           sha256 = "02lmhihv495drv9cb40h6l0xsbx7yglbvsdzc4r0vf78j87rs33f";
           name = "markdown-mode";
         };
@@ -15946,7 +16177,7 @@
           sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-mode+";
           sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
           name = "markdown-mode-plus";
         };
@@ -15967,7 +16198,7 @@
           sha256 = "10h5zh03c3v0c6pqcxvlns6l70k2l916nqvza53ikjpldmc4mln2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-preview-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-preview-mode";
           sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
           name = "markdown-preview-mode";
         };
@@ -15988,7 +16219,7 @@
           sha256 = "0jgr327qlh7acwi6sld27xdsvr89parspk6wmfklwszvy1v13633";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-toc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-toc";
           sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
           name = "markdown-toc";
         };
@@ -16009,7 +16240,7 @@
           sha256 = "0nk2rm14ccwrh1aaxzm80rllsz8g38h9w52m0pf3nnwh6sa757nk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markup-faces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markup-faces";
           sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
           name = "markup-faces";
         };
@@ -16030,7 +16261,7 @@
           sha256 = "0pbli67wia8pximvgd68x6i9acdgsk51g9hjpqfm49rqg5nqalh9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marmalade";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marmalade";
           sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
           name = "marmalade";
         };
@@ -16051,7 +16282,7 @@
           sha256 = "0sriyjjhgis7fgq276j5mw6n84jdwxf8lq0iqqiaqwmc66l985mv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marshal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marshal";
           sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
           name = "marshal";
         };
@@ -16064,14 +16295,14 @@
     matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
     melpaBuild {
         pname = "matrix-client";
-        version = "0.2.0";
+        version = "0.3.0";
         src = fetchgit {
           url = "git://fort.kickass.systems/personal/rrix/pub/matrix.el";
-          rev = "de09c69d2d5ca604839239fe49b10a2ed5ac2809";
-          sha256 = "0516772e4aae604359bee659d101fb62b73cc9016cbbe0b749c77402954ec341";
+          rev = "421ad8ebf3858acc99634a4cca442c57ca2b3707";
+          sha256 = "34e1f7bd0c4ab21b2b0ca6d2a6ba83c9a1a5591e9de9ceb1c5f8fe06a4738acb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/matrix-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/matrix-client";
           sha256 = "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6";
           name = "matrix-client";
         };
@@ -16092,7 +16323,7 @@
           sha256 = "0x92b1qrhyrdh0z0xriyjc12h0wpk16x4yawj5i828ca6mz0qh5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maven-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maven-test-mode";
           sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
           name = "maven-test-mode";
         };
@@ -16113,7 +16344,7 @@
           sha256 = "08gbkd8wln89j9yxp0zzd539hbwy1db31gca3vxxrpszixx8280y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maxframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maxframe";
           sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
           name = "maxframe";
         };
@@ -16134,7 +16365,7 @@
           sha256 = "1si2givpzihjb1szbcdm3iy9kkm7bj0hq10s0h2dfm8axdnlirm5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mb-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mb-url";
           sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
           name = "mb-url";
         };
@@ -16155,7 +16386,7 @@
           sha256 = "00gwd2jf5ncgyay5w2jc2mhv18jf4ydnzpfkxaxw9zjbdxg4ym2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mbe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mbe";
           sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
           name = "mbe";
         };
@@ -16176,7 +16407,7 @@
           sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mc-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mc-extras";
           sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
           name = "mc-extras";
         };
@@ -16197,7 +16428,7 @@
           sha256 = "1vsla0a5x4kfyj3ca4r1v8cspp12dadi0frpailclaxfmpmpl5d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mediawiki";
           sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
           name = "mediawiki";
         };
@@ -16218,7 +16449,7 @@
           sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/melpa-upstream-visit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/melpa-upstream-visit";
           sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
           name = "melpa-upstream-visit";
         };
@@ -16239,7 +16470,7 @@
           sha256 = "1y4ra5z3ayw3w7dszzlkk3qz3nv2jg1vvx8cf0y5j1pqpx8vy3jf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mentor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
           name = "mentor";
         };
@@ -16260,7 +16491,7 @@
           sha256 = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/merlin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/merlin";
           sha256 = "0wnh7512sknagdk56j6gd8vamh9ns3vnggm56s73pik0m009w0xr";
           name = "merlin";
         };
@@ -16270,6 +16501,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    metafmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "metafmt";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "lvillani";
+          repo = "metafmt";
+          rev = "19dc36b3d085bba6f8e59ddbb1cbb7e2c085c461";
+          sha256 = "0zxal6alf99a2zfzizckibp5iwdk9kklfhml2r0r3wfvswb0rb3z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metafmt";
+          sha256 = "0vx1xrjr10nd90cr6ppgd3kc3c8bhkg3m4clnb50zagkpfqsy9ma";
+          name = "metafmt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/metafmt";
+          license = lib.licenses.free;
+        };
+      }) {};
     metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
     melpaBuild {
         pname = "metaweblog";
@@ -16281,7 +16533,7 @@
           sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/metaweblog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metaweblog";
           sha256 = "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y";
           name = "metaweblog";
         };
@@ -16302,7 +16554,7 @@
           sha256 = "1dhws4a298zrm88cdn66sikdk06n0p60d32cxsgybakkhg5c5wgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mew";
           sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
           name = "mew";
         };
@@ -16323,7 +16575,7 @@
           sha256 = "1bp4xqklf422n0zwwyj0ag3a4nndg8klazrga6rlvpy01hgg3drl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mhc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mhc";
           sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
           name = "mhc";
         };
@@ -16344,7 +16596,7 @@
           sha256 = "1ckb5hymwj4wmsxakalsky4mkzn9vxhxr6416b2cr6r5jxj4xgsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/migemo";
           sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
           name = "migemo";
         };
@@ -16365,7 +16617,7 @@
           sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/milkode";
           sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
           name = "milkode";
         };
@@ -16386,7 +16638,7 @@
           sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuffer-complete-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuffer-complete-cycle";
           sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
           name = "minibuffer-complete-cycle";
         };
@@ -16407,7 +16659,7 @@
           sha256 = "07nbn2pwlp33kr136xsm6lzddhjs538xkz0fbays89psblmy4kwj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuffer-cua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuffer-cua";
           sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
           name = "minibuffer-cua";
         };
@@ -16428,7 +16680,7 @@
           sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/miniedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/miniedit";
           sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
           name = "miniedit";
         };
@@ -16449,7 +16701,7 @@
           sha256 = "0kjhn48sf2ps3k5pv06gqmqc4hlk6di9ld3ssw6vwfh8313x1fc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minimal-session-saver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minimal-session-saver";
           sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
           name = "minimal-session-saver";
         };
@@ -16470,7 +16722,7 @@
           sha256 = "0nd0jl5r5drnh98wdpqj2i7pgs7zvcizsh4qbvh8n0iw0c3f0pwh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minitest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minitest";
           sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
           name = "minitest";
         };
@@ -16490,7 +16742,7 @@
           sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-mako";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-mako";
           sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
           name = "mmm-mako";
         };
@@ -16511,7 +16763,7 @@
           sha256 = "097s4xnwfy8d1wzmz65g2f8bnjjjlj67w1yzwn4d3yasb171nbv8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-mode";
           sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
           name = "mmm-mode";
         };
@@ -16532,7 +16784,7 @@
           sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmt";
           sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
           name = "mmt";
         };
@@ -16542,6 +16794,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mocha = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mocha";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "scottaj";
+          repo = "mocha.el";
+          rev = "ea042751717b920a61770b6a945999431badbc39";
+          sha256 = "1v915yy920yrwrrnw9bxggm1zvlm9ndjwv9ydln3r07b0a1mkka2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocha";
+          sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx";
+          name = "mocha";
+        };
+        packageRequires = [ js2-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/mocha";
+          license = lib.licenses.free;
+        };
+      }) {};
     mocker = callPackage ({ eieio ? null, el-x, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mocker";
@@ -16553,7 +16826,7 @@
           sha256 = "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocker";
           sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
           name = "mocker";
         };
@@ -16566,15 +16839,15 @@
     modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "modalka";
-        version = "0.1.1";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "modalka";
-          rev = "f8ee86264a8e961b5821e11fdd490d5c4fc489c3";
-          sha256 = "1pgr1zlp26c7xy77qfvjfmv5i2j1c45xp59x83k8nllyhckxyqn6";
+          rev = "5a1e914bb76dfde539df26f3108793bba98bd4f9";
+          sha256 = "0r24186d1q9436h3qhqz1z8q978d01an0dvpvzirf4x9ickrib3k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modalka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modalka";
           sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
           name = "modalka";
         };
@@ -16594,7 +16867,7 @@
           sha256 = "b7afff1d8fb0b3f044d266af479df51fbb6021ff433628a9dc669695c1ddae40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mode-icons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mode-icons";
           sha256 = "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp";
           name = "mode-icons";
         };
@@ -16615,7 +16888,7 @@
           sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mode-line-debug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mode-line-debug";
           sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
           name = "mode-line-debug";
         };
@@ -16636,7 +16909,7 @@
           sha256 = "02w7k4s4698p4adjy4a36na28sb1s2zw4xsjs7p2hv9iiw9kmyvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monokai-theme";
           sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
           name = "monokai-theme";
         };
@@ -16657,7 +16930,7 @@
           sha256 = "1a0pv8fkv1cjdb0k5bmjd67a273bzcmxjwzgy4jpb3ng1qbb2xnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monroe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monroe";
           sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
           name = "monroe";
         };
@@ -16678,7 +16951,7 @@
           sha256 = "1ndgw4799d816pkn2bwja5kmigydpmj9znn8cax4dxsd9fg2hzjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/morlock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/morlock";
           sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
           name = "morlock";
         };
@@ -16699,7 +16972,7 @@
           sha256 = "01mdy7sps0xryz5gfpl083rv7ixkxs2rkz5yaqjlam2rypdcsyy2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/move-dup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/move-dup";
           sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
           name = "move-dup";
         };
@@ -16720,7 +16993,7 @@
           sha256 = "1mg7arw4wbbm84frq3sws5937fh901qn0xnjk9jcp3pvc4d0sxwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mowedline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mowedline";
           sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
           name = "mowedline";
         };
@@ -16741,7 +17014,7 @@
           sha256 = "13bf5jn1kgqg59j5czlzvajq2fw1rz4h5jqfc7x8w1a067nymf2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moz";
           sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
           name = "moz";
         };
@@ -16762,7 +17035,7 @@
           sha256 = "1w1i1clkjg9mj1g4i2y3xw3hyj8s7h9gr04qgyb9c1q8vh11z8d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moz-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moz-controller";
           sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
           name = "moz-controller";
         };
@@ -16783,7 +17056,7 @@
           sha256 = "1pjhch8vah0kf73fl2fk6khhrx1kflggd3zlxrf7w4fxr0qn8la3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mpv";
           sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
           name = "mpv";
         };
@@ -16804,7 +17077,7 @@
           sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/msvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/msvc";
           sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
           name = "msvc";
         };
@@ -16825,7 +17098,7 @@
           sha256 = "0wrg6f7czn61f9wmrk27dzcdskznm5i1pwwjck5h768j0y9dfv6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mu4e-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu4e-alert";
           sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
           name = "mu4e-alert";
         };
@@ -16846,7 +17119,7 @@
           sha256 = "1lyd8pcawn106zwlbq6gdq05i2zhry1qh9cdyjiw61nvgbbfi0yx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mu4e-maildirs-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu4e-maildirs-extension";
           sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
           name = "mu4e-maildirs-extension";
         };
@@ -16867,7 +17140,7 @@
           sha256 = "11zabs7qpdhri6n90ck7pgwcbz46d813nyl73h5m1i8jvz1wzx7v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi";
           sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
           name = "multi";
         };
@@ -16888,7 +17161,7 @@
           sha256 = "1d9y3dw27pgzgv6wk575d5ign55xdqgbl3ycyq1z7sji1477lz6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-web-mode";
           sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
           name = "multi-web-mode";
         };
@@ -16909,7 +17182,7 @@
           sha256 = "10k4c9vl0bfidrry0msyqamijizjghg54g26yaqbr2vi0mbbz22k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multiple-cursors";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multiple-cursors";
           sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
           name = "multiple-cursors";
         };
@@ -16930,7 +17203,7 @@
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustache-mode";
           sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
           name = "mustache-mode";
         };
@@ -16951,7 +17224,7 @@
           sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mwim";
           sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
           name = "mwim";
         };
@@ -16972,7 +17245,7 @@
           sha256 = "0550k0rfm0zai306642v689mcpsw9pbd5vs0il82cihwvrxjifc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mykie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mykie";
           sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
           name = "mykie";
         };
@@ -16993,7 +17266,7 @@
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/name-this-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/name-this-color";
           sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
           name = "name-this-color";
         };
@@ -17014,7 +17287,7 @@
           sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/names";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/names";
           sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
           name = "names";
         };
@@ -17035,7 +17308,7 @@
           sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrow-reindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrow-reindent";
           sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
           name = "narrow-reindent";
         };
@@ -17056,7 +17329,7 @@
           sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrowed-page-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrowed-page-navigation";
           sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
           name = "narrowed-page-navigation";
         };
@@ -17077,7 +17350,7 @@
           sha256 = "1l7asqwi5gcvb2mn8608025lwypf2vqzrkc3a9phdfjp0qn2apdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nasm-mode";
           sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
           name = "nasm-mode";
         };
@@ -17098,7 +17371,7 @@
           sha256 = "119hy8rs83f17d6zizdaxn2ck3sylxbyz7adszbznjc8zrbaw0ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nav-flash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nav-flash";
           sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
           name = "nav-flash";
         };
@@ -17119,7 +17392,7 @@
           sha256 = "15jh1lsgqfnpbmrikm8kdh5bj60yb96f2as2anppjjsgl6w96glh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navi-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navi-mode";
           sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
           name = "navi-mode";
         };
@@ -17140,7 +17413,7 @@
           sha256 = "09cb07f98aclgq8jf5419305zydkk1hz4nvzrwqz7syrlpvx8xi5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navorski";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navorski";
           sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
           name = "navorski";
         };
@@ -17161,7 +17434,7 @@
           sha256 = "16i1k1zr6ng1dlxb1b73mxjf25f4kvf3x5vfffsi3qnfm960bg3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ncl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ncl-mode";
           sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9";
           name = "ncl-mode";
         };
@@ -17182,7 +17455,7 @@
           sha256 = "19xxg4ya6vndk2ljdnl284zs8qf9dkq4ghr7pmsclp9n7zh46v48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nemerle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nemerle";
           sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6";
           name = "nemerle";
         };
@@ -17203,7 +17476,7 @@
           sha256 = "1gmi0xxwkh33w5gxc8488m1vv6ycizqhlw1kpn81zhqdzzq3s06n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/neotree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
           name = "neotree";
         };
@@ -17224,7 +17497,7 @@
           sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nginx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nginx-mode";
           sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
           name = "nginx-mode";
         };
@@ -17245,7 +17518,7 @@
           sha256 = "1wc0cvmfhpvfzdy127d1n812q93dd9sp3mmqnc8jzy8i3frqqqq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ninja-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ninja-mode";
           sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
           name = "ninja-mode";
         };
@@ -17258,15 +17531,15 @@
     nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "1.10";
+        version = "1.11.1";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "71a5161365f40699092e491bbff88473237fc432";
-          sha256 = "03kbdrar5w475qng4j7bbak5y6ipb7pgpxj3hblcn3pnvgh7whv6";
+          rev = "da4495eb1747a5ab8fe4a8e6ccd1c28fba684a0a";
+          sha256 = "1rxj9rg3rg7yx874nsj65kam26s1bn96cnmys60dp0zh20gc1r1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nix-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nix-mode";
           sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
           name = "nix-mode";
         };
@@ -17287,7 +17560,7 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nixos-options";
           sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
           name = "nixos-options";
         };
@@ -17308,7 +17581,7 @@
           sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noccur";
           sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
           name = "noccur";
         };
@@ -17329,7 +17602,7 @@
           sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nodejs-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nodejs-repl";
           sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
           name = "nodejs-repl";
         };
@@ -17348,7 +17621,7 @@
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nose";
           sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
           name = "nose";
         };
@@ -17367,7 +17640,7 @@
           sha256 = "fd2669401c276af12b6c9b739e835ee76b7910bba34bf850e4909c00e79adbd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/notmuch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/notmuch";
           sha256 = "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r";
           name = "notmuch";
         };
@@ -17388,7 +17661,7 @@
           sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/notmuch-labeler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/notmuch-labeler";
           sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
           name = "notmuch-labeler";
         };
@@ -17409,7 +17682,7 @@
           sha256 = "1l07nrlfd5qj8jnqacjba7mb6prapg8d8h3881l3kb66sn02ahgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nrepl-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nrepl-sync";
           sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
           name = "nrepl-sync";
         };
@@ -17430,7 +17703,7 @@
           sha256 = "0c4qfbb345yna5c30czq8nhcx283z1fnpp6h16p7vjqs6y37czsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nsis-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nsis-mode";
           sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
           name = "nsis-mode";
         };
@@ -17451,7 +17724,7 @@
           sha256 = "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nvm";
           sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
           name = "nvm";
         };
@@ -17472,7 +17745,7 @@
           sha256 = "14vd0f4y5l470hx7kg54sx3352459mhjnrh7jl822gkl8c904lmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nyan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nyan-mode";
           sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
           name = "nyan-mode";
         };
@@ -17493,7 +17766,7 @@
           sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nyan-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nyan-prompt";
           sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
           name = "nyan-prompt";
         };
@@ -17514,7 +17787,7 @@
           sha256 = "0r12023yy8j96bp8z2ml6ffyr2c9rcd5abkh6vqnkwsdxkzx6wrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/o-blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/o-blog";
           sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
           name = "o-blog";
         };
@@ -17535,7 +17808,7 @@
           sha256 = "1zbqiqilms8vxqlvzb3gjh8gh2cl7cpmh3yiqsj94jx69w8dy4xl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-http";
           sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
           name = "ob-http";
         };
@@ -17556,7 +17829,7 @@
           sha256 = "1xx6hyq3gk4bavcx6i9bhipbn4mn5rv2ga9lryq09qgq2l9znclk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-sml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-sml";
           sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
           name = "ob-sml";
         };
@@ -17577,7 +17850,7 @@
           sha256 = "10hm20dzhkxk61ass3bd5gdn1bs2l60y3zjnpkxinzn7m6aaniia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-translate";
           sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
           name = "ob-translate";
         };
@@ -17598,7 +17871,7 @@
           sha256 = "05ay599nc6jdw2fjss4izz1ynv2wc4svff932n8j9hvrhygipb2w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ocodo-svg-modelines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ocodo-svg-modelines";
           sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
           name = "ocodo-svg-modelines";
         };
@@ -17619,7 +17892,7 @@
           sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ocp-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ocp-indent";
           sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
           name = "ocp-indent";
         };
@@ -17640,7 +17913,7 @@
           sha256 = "19fg6r7aiirfsbp2h1a824476sn1ln4nz8kvpdzkzvyf1hzx68gw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/octicons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/octicons";
           sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
           name = "octicons";
         };
@@ -17661,7 +17934,7 @@
           sha256 = "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/offlineimap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/offlineimap";
           sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
           name = "offlineimap";
         };
@@ -17682,7 +17955,7 @@
           sha256 = "1rj97yg2n9fi80qlb4z6iahqid3yinlhx9mrbh6gi1niz58ws69h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/olivetti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/olivetti";
           sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
           name = "olivetti";
         };
@@ -17703,7 +17976,7 @@
           sha256 = "07grj81alrr6qgs3jmqkjzphkvi26w6jm5hf1f5wyx7h6q293ady";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-kill";
           sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
           name = "omni-kill";
         };
@@ -17724,7 +17997,7 @@
           sha256 = "030f983n19n64f8irif102nncvam04xpx020vfgja9886wlj40pk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-log";
           sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
           name = "omni-log";
         };
@@ -17745,7 +18018,7 @@
           sha256 = "1rfs6z56pnacy6m7yvm2hrb0ykfvaiyichivcmb9ssdgqp92cbxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-scratch";
           sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
           name = "omni-scratch";
         };
@@ -17766,7 +18039,7 @@
           sha256 = "0c34rci5793hd674x2srhqvnj46llrbkrw1xpzf73s4ib5zhh7xi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-tags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-tags";
           sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
           name = "omni-tags";
         };
@@ -17787,7 +18060,7 @@
           sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omnisharp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omnisharp";
           sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
           name = "omnisharp";
         };
@@ -17817,7 +18090,7 @@
           sha256 = "119pk7gg4fw5bdvir8077ra603b5nbqvd7ph9cqrwxa056jzvry8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/opam";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/opam";
           sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
           name = "opam";
         };
@@ -17838,7 +18111,7 @@
           sha256 = "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/operate-on-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/operate-on-number";
           sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
           name = "operate-on-number";
         };
@@ -17859,7 +18132,7 @@
           sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-ac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-ac";
           sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
           name = "org-ac";
         };
@@ -17880,7 +18153,7 @@
           sha256 = "0gkxxzdk8bd1yi5x9217pkq9d01ccq8znxc7h8qcw0p1336rigfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-agenda-property";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-agenda-property";
           sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
           name = "org-agenda-property";
         };
@@ -17901,7 +18174,7 @@
           sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-autolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-autolist";
           sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
           name = "org-autolist";
         };
@@ -17922,7 +18195,7 @@
           sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-bullets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-bullets";
           sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75";
           name = "org-bullets";
         };
@@ -17943,7 +18216,7 @@
           sha256 = "18x8c6jcqkfam79z4hskr8h1lvzvd5rlfgymmj1ps6p6hd3j4ihl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-elisp-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-elisp-help";
           sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
           name = "org-elisp-help";
         };
@@ -17964,7 +18237,7 @@
           sha256 = "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-gcal";
           sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
           name = "org-gcal";
         };
@@ -17985,7 +18258,7 @@
           sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-gnome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-gnome";
           sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
           name = "org-gnome";
         };
@@ -18006,7 +18279,7 @@
           sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-if";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-if";
           sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
           name = "org-if";
         };
@@ -18027,7 +18300,7 @@
           sha256 = "0980scx1dzslbdzmhv720branc4jd4bdkyji34gahinx4w9brj79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-journal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-journal";
           sha256 = "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s";
           name = "org-journal";
         };
@@ -18048,7 +18321,7 @@
           sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-link-travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-link-travis";
           sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
           name = "org-link-travis";
         };
@@ -18069,7 +18342,7 @@
           sha256 = "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-linkany";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-linkany";
           sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
           name = "org-linkany";
         };
@@ -18089,7 +18362,7 @@
           sha256 = "5cb84c3c4bf3f7c3e0c9ab869dababb785d44198b1e1072dc9c0937fc483aa14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-mac-iCal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-mac-iCal";
           sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
           name = "org-mac-iCal";
         };
@@ -18110,7 +18383,7 @@
           sha256 = "0yxfhzygiki8sha1dddac4g72r51yi4jnga2scmk51f9jgwqbihp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-multiple-keymap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-multiple-keymap";
           sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
           name = "org-multiple-keymap";
         };
@@ -18131,7 +18404,7 @@
           sha256 = "15fy6xpz6mk4j3nkrhiqal2dp77rhxmk8a7xiw037xr1jgq9sd9a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-outlook";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-outlook";
           sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
           name = "org-outlook";
         };
@@ -18152,7 +18425,7 @@
           sha256 = "0zc20m63a1iz9aziid5jsvcbl86k9dg9js4k3almchh55az4a0i3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-page";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-page";
           sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
           name = "org-page";
         };
@@ -18173,7 +18446,7 @@
           sha256 = "14lshgyrlzjcrqdfsn17llm70ijbs86cv9mccy87vlr01rbsz6lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pdfview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pdfview";
           sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
           name = "org-pdfview";
         };
@@ -18194,7 +18467,7 @@
           sha256 = "1fjdza723615bhdm5x6gbd03vi7ywzpbjn8p59saimczqngfdpmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pomodoro";
           sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
           name = "org-pomodoro";
         };
@@ -18215,7 +18488,7 @@
           sha256 = "16aq5p65q5a0an14q9xzsnkaa5bzkrwhm9cv5ljajjfcjsjcvmb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-projectile";
           sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
           name = "org-projectile";
         };
@@ -18236,7 +18509,7 @@
           sha256 = "1cxjzj955rvp0ijbp7ifpmkxdhimz8hqjw5c9gv6zwjqb5iih9ry";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-protocol-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-protocol-jekyll";
           sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
           name = "org-protocol-jekyll";
         };
@@ -18257,7 +18530,7 @@
           sha256 = "0hhgfw0sqvl9jmmslwxn6v3dii99v09yz2h0ia5np9lzyxsc207a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-readme";
           sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
           name = "org-readme";
         };
@@ -18278,7 +18551,7 @@
           sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-repo-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-repo-todo";
           sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
           name = "org-repo-todo";
         };
@@ -18299,7 +18572,7 @@
           sha256 = "0zx9gpvm5gy9k45lbhaks9s935id727lszsh40gmpdp5zxf3rjk1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-sync";
           sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
           name = "org-sync";
         };
@@ -18320,7 +18593,7 @@
           sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-table-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-table-comment";
           sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
           name = "org-table-comment";
         };
@@ -18330,6 +18603,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-tfl";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "storax";
+          repo = "org-tfl";
+          rev = "c9e024ac55d9e0c61a273e75bd68981a623c9ab2";
+          sha256 = "1x241jaw726zjsplwf6svbvr8af09k6kqj7icpvcbyayivkbhxy2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tfl";
+          sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf";
+          name = "org-tfl";
+        };
+        packageRequires = [ cl-lib emacs org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-tfl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-themis = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-themis";
+        version = "0.4.1";
+        src = fetchFromGitHub {
+          owner = "zellio";
+          repo = "org-themis";
+          rev = "4b4bf1fa1e853664bf006dda8afe2db00e522aaa";
+          sha256 = "12fksqi9flf84h1lbmbcjnqxa7dairp50wvlwfhbp1hbb8l9z63a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-themis";
+          sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln";
+          name = "org-themis";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/org-themis";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-time-budgets = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-time-budgets";
@@ -18341,7 +18656,7 @@
           sha256 = "09iw2jffb2qrx5r07zd1j8sk5wafamjkc2khqyfwc5kx6xyp1f46";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-time-budgets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-time-budgets";
           sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
           name = "org-time-budgets";
         };
@@ -18362,7 +18677,7 @@
           sha256 = "0qqa62fsmra6v4061kpki8wbhfcwkgnb2gzxwvnaqlcmhivksg6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-toodledo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-toodledo";
           sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
           name = "org-toodledo";
         };
@@ -18383,7 +18698,7 @@
           sha256 = "053wf36lq9piyzq7rv2lid34zanj6l9fvawp3r3nsniy5nlfckqx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-tracktable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tracktable";
           sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
           name = "org-tracktable";
         };
@@ -18404,7 +18719,7 @@
           sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-transform-tree-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-transform-tree-table";
           sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
           name = "org-transform-tree-table";
         };
@@ -18425,7 +18740,7 @@
           sha256 = "0aacxxwhwjzby0f9r4q0lra5lqcrw5snnm1yc63jrs6c0ifakk45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-tree-slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tree-slide";
           sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
           name = "org-tree-slide";
         };
@@ -18446,7 +18761,7 @@
           sha256 = "1561nxjva8892via0l8315y3fih4r4q9gzycmvh33db8gqzq4l86";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-trello";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-trello";
           sha256 = "1rm91xccvdsqghdnrnjvyp8xfvrw5ac677vzzz24rz9dssh2mz9b";
           name = "org-trello";
         };
@@ -18474,7 +18789,7 @@
           sha256 = "1qf4pqsg12y1qx7di0y5dp0f4slyp69h2q6y21hldzknhwxx4yy4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-vcard";
           sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
           name = "org-vcard";
         };
@@ -18495,7 +18810,7 @@
           sha256 = "0av1477jn3s4s5kymd7sbb0av437vb5mnfc6rpfgzwji7b8mfr7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org2blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org2blog";
           sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
           name = "org2blog";
         };
@@ -18516,7 +18831,7 @@
           sha256 = "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org2jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org2jekyll";
           sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
           name = "org2jekyll";
         };
@@ -18537,7 +18852,7 @@
           sha256 = "02mxp17p7bj4xamg0m6zk832hmpqcgzc7bjbjcnvbvrawhc255hy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgbox";
           sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
           name = "orgbox";
         };
@@ -18550,15 +18865,15 @@
     orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "orgit";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "orgit";
-          rev = "731c5cb4f1c7e2ee5b819ca159c0c01e2b306c73";
-          sha256 = "0d7rh5bi5v04njj1nh8q8kdr6aw68lcw4ghx6kwq97aff4qmcrp1";
+          rev = "12bfadf603d8a1f616a1bdac5f909a0c20e6aba4";
+          sha256 = "1wxxdx3c5qacsii4kysk438cjr1hnmpir78kp6xgk9xw5g9snlnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgit";
           sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
           name = "orgit";
         };
@@ -18579,7 +18894,7 @@
           sha256 = "00vhzblzscp3mkl6x1nz116i4isjwcc5gkpdksym3mr5nqvqhd97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orglink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orglink";
           sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
           name = "orglink";
         };
@@ -18600,7 +18915,7 @@
           sha256 = "0g1xhh88a65vcq6rlh7ii16pra4pv519ajcws0h93ldbbjiy7p0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-browse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-browse";
           sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
           name = "osx-browse";
         };
@@ -18621,7 +18936,7 @@
           sha256 = "1vywqzw8hydi944q4ghgxbbvvmwfpa9wj5nmrnixfcw8h4mfcxvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-dictionary";
           sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
           name = "osx-dictionary";
         };
@@ -18642,7 +18957,7 @@
           sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-location";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-location";
           sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
           name = "osx-location";
         };
@@ -18663,7 +18978,7 @@
           sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-plist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-plist";
           sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8";
           name = "osx-plist";
         };
@@ -18684,7 +18999,7 @@
           sha256 = "1pn6xvq41di1jb5d3i8wgs54w0m2414cq3f1vk0xpibshkq7sr4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-trash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-trash";
           sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
           name = "osx-trash";
         };
@@ -18705,7 +19020,7 @@
           sha256 = "1v9kx5xr7xcr6i664h2g6j8824yjsjdn5pvgmawvxrrplbjmiqnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outorg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outorg";
           sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
           name = "outorg";
         };
@@ -18726,7 +19041,7 @@
           sha256 = "1v04iyx57w8scw3iqrivii7q0sh8sa7xacswdhd18mw9kvjrbj98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outshine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outshine";
           sha256 = "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4";
           name = "outshine";
         };
@@ -18747,7 +19062,7 @@
           sha256 = "0qxk2rf84j86syxi8xknsq252irwg7sz396v3bb4wqz4prpj0kzc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ov";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ov";
           sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
           name = "ov";
         };
@@ -18768,7 +19083,7 @@
           sha256 = "0jz8p6bwpfncxwi6ssmi6ngx8sjjica565i6ln0gsr5i11zfb7nx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/overseer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/overseer";
           sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
           name = "overseer";
         };
@@ -18789,7 +19104,7 @@
           sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/owdriver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/owdriver";
           sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
           name = "owdriver";
         };
@@ -18810,7 +19125,7 @@
           sha256 = "047fcvpvwzaqisw4q3p6hxgjyqsi2n9nms1qx9w4znvxrnjq8jz3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-ioslide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-ioslide";
           sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
           name = "ox-ioslide";
         };
@@ -18831,7 +19146,7 @@
           sha256 = "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
           name = "ox-pandoc";
         };
@@ -18852,7 +19167,7 @@
           sha256 = "026g48sgqwnqs5zmrabhiv3l8052l4c1vsbsf6bdxv4a6yp0l654";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-twbs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-twbs";
           sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
           name = "ox-twbs";
         };
@@ -18873,7 +19188,7 @@
           sha256 = "073qpa223ja673p63mhvy4l6yyv3k7z05ifwvn7bmq4b5fq42hw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pabbrev";
           sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
           name = "pabbrev";
         };
@@ -18894,7 +19209,7 @@
           sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package+";
           sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
           name = "package-plus";
         };
@@ -18915,7 +19230,7 @@
           sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-safe-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-safe-delete";
           sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
           name = "package-safe-delete";
         };
@@ -18936,7 +19251,7 @@
           sha256 = "138l07qmxj4fkvf43f1hdn4skadxb50c023bc5101l3njzmf74wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
           name = "package-utils";
         };
@@ -18957,7 +19272,7 @@
           sha256 = "0k5l0l4vjw38r911zd9c9cv015vpw2y8abp82s2s9pm8nqc3bnci";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/packed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/packed";
           sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
           name = "packed";
         };
@@ -18978,7 +19293,7 @@
           sha256 = "1acz3w2zdcds0h6p2k9h3lmjsk519asqrxjw7f3pyrcq7x2qbhc4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/page-break-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/page-break-lines";
           sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
           name = "page-break-lines";
         };
@@ -18999,7 +19314,7 @@
           sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pallet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pallet";
           sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
           name = "pallet";
         };
@@ -19012,15 +19327,15 @@
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "2.13.3";
+        version = "2.14";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "067f9aa8ba27bd50b602dbfdaa155e2f381c7139";
-          sha256 = "14kxmcsgdrq9r8c17x8hz8vid0bn6rikvmddhc6wpbmp7shngvr1";
+          rev = "ebf43f8a62beea6b66c9999e660b0fc82854ac08";
+          sha256 = "1i5mh8bilg7vplb1ps81s5r6zjf2k6yjcmklrql4w7vw9jrvy566";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pandoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pandoc-mode";
           sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
           name = "pandoc-mode";
         };
@@ -19041,7 +19356,7 @@
           sha256 = "0gmdzagyg0p7q1gyj2a3aqp2g4asljpib3n67nikr0v99c2mki5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pangu-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pangu-spacing";
           sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
           name = "pangu-spacing";
         };
@@ -19062,7 +19377,7 @@
           sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paper-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paper-theme";
           sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
           name = "paper-theme";
         };
@@ -19072,22 +19387,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    paradox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hydra, json ? null, let-alist, lib, melpaBuild, seq, spinner }:
+    paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
     melpaBuild {
         pname = "paradox";
-        version = "2.3.6";
+        version = "2.3.7";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "paradox";
-          rev = "d62d883b8c980d679970bed79c12091df9120a77";
-          sha256 = "06c2a55bmnhfvjpd43kq6d2l9yijgiq16yq19x6m8050f8hzxnyb";
+          rev = "8eca9880ed52d0d53d7d5e28858ec95987fa22e1";
+          sha256 = "1vc59n9jmsn5d15v2m9xl64564h3q0c78pv4a4n3dhd1iz797l3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paradox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paradox";
           sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
           name = "paradox";
         };
-        packageRequires = [ cl-lib emacs hydra json let-alist seq spinner ];
+        packageRequires = [ emacs hydra let-alist seq spinner ];
         meta = {
           homepage = "http://melpa.org/#/paradox";
           license = lib.licenses.free;
@@ -19102,7 +19417,7 @@
           sha256 = "7587cd2cf6e5b245678bbca8cbad07db8576ff976a504cd8d6e52fa85cf99f8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit";
           sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
           name = "paredit";
         };
@@ -19123,7 +19438,7 @@
           sha256 = "0jbjwjl92pf0kih3p2x20ms2kpyzzam8fir661nimpmk802ahgkj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit-everywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit-everywhere";
           sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
           name = "paredit-everywhere";
         };
@@ -19144,7 +19459,7 @@
           sha256 = "033gdya7f6p4kkapnmnbxlm88g4rbsmym4cc4jkcmp91idh63syq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paren-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paren-face";
           sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
           name = "paren-face";
         };
@@ -19165,7 +19480,7 @@
           sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parent-mode";
           sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
           name = "parent-mode";
         };
@@ -19186,7 +19501,7 @@
           sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parsebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parsebib";
           sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
           name = "parsebib";
         };
@@ -19207,7 +19522,7 @@
           sha256 = "18m0973l670cjbzpa1vfv06gymhsa2f1pjcp329s0npb735x5whj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pass";
           sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
           name = "pass";
         };
@@ -19228,7 +19543,7 @@
           sha256 = "1g0mvg9i8f2qccb4b0m4d74zkjx9gjfv47x57by6cdaf9yywqryi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/passthword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/passthword";
           sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
           name = "passthword";
         };
@@ -19248,7 +19563,7 @@
           sha256 = "f71d0b36570983c35e08b6672c186b5c308b57536a96a747f09665bab794be30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/password-store";
           sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
           name = "password-store";
         };
@@ -19269,7 +19584,7 @@
           sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastehub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastehub";
           sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
           name = "pastehub";
         };
@@ -19290,7 +19605,7 @@
           sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastelmac-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastelmac-theme";
           sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
           name = "pastelmac-theme";
         };
@@ -19311,7 +19626,7 @@
           sha256 = "0kkgqaxyrv65rfg2ng1vmmmrc9bm98yqpsv2pcb760287dn0l27m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paxedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paxedit";
           sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
           name = "paxedit";
         };
@@ -19332,7 +19647,7 @@
           sha256 = "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcache";
           sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
           name = "pcache";
         };
@@ -19353,7 +19668,7 @@
           sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcomplete-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcomplete-extension";
           sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
           name = "pcomplete-extension";
         };
@@ -19374,7 +19689,7 @@
           sha256 = "03k3xhrim4s3yvbnl8g8ci5g7chlffycdw7d6a1pz3077mxf1f1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcsv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcsv";
           sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
           name = "pcsv";
         };
@@ -19395,7 +19710,7 @@
           sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pdf-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pdf-tools";
           sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
           name = "pdf-tools";
         };
@@ -19416,7 +19731,7 @@
           sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peg";
           sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
           name = "peg";
         };
@@ -19436,7 +19751,7 @@
           sha256 = "1rh87jf0a15q35a8h00bx6k5wa931rb6gh600zbs7j4r3y8qsylf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/per-buffer-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/per-buffer-theme";
           sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
           name = "per-buffer-theme";
         };
@@ -19457,7 +19772,7 @@
           sha256 = "0h05j55y3csq91a5m2fg99y4rzsh7zca7hnifb6kic5zb3nahi00";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persistent-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persistent-scratch";
           sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
           name = "persistent-scratch";
         };
@@ -19478,7 +19793,7 @@
           sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persistent-soft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persistent-soft";
           sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
           name = "persistent-soft";
         };
@@ -19499,7 +19814,7 @@
           sha256 = "129cl5az4rr5j7krpyyi5khhbl8klw7ji9ysarz0s7ivy096jq7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persp-mode";
           sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
           name = "persp-mode";
         };
@@ -19520,7 +19835,7 @@
           sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perspective";
           sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
           name = "perspective";
         };
@@ -19541,7 +19856,7 @@
           sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ph";
           sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
           name = "ph";
         };
@@ -19562,7 +19877,7 @@
           sha256 = "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search-mc";
           sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
           name = "phi-search-mc";
         };
@@ -19583,7 +19898,7 @@
           sha256 = "0zs11811kx6x1zgc1icd8gw420saa7z6zshpzmrddnbznya4qql6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-auto-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-auto-yasnippets";
           sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
           name = "php-auto-yasnippets";
         };
@@ -19604,7 +19919,7 @@
           sha256 = "0pwhw59ki19f9rkgvvnjzhby67s0y9hpsrg6cwqxakjlm66w96q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-mode";
           sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
           name = "php-mode";
         };
@@ -19625,7 +19940,7 @@
           sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phpcbf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phpcbf";
           sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
           name = "phpcbf";
         };
@@ -19646,7 +19961,7 @@
           sha256 = "1s4a0ygm79shv6f0rghrkq9jb7jc7sh9cjxzlzj0c8zpvsxl0hlz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phpunit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phpunit";
           sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
           name = "phpunit";
         };
@@ -19667,7 +19982,7 @@
           sha256 = "12jhdkgfck2a6d5jj65l9d98dm34gsyi0ya4h21dbbvz35zivz70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pinyin-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pinyin-search";
           sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
           name = "pinyin-search";
         };
@@ -19688,7 +20003,7 @@
           sha256 = "1dsg49156mfhkd8ip4ny03sc06zchxr1qpbcx48f5sn4m9j5d3vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pip-requirements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pip-requirements";
           sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
           name = "pip-requirements";
         };
@@ -19709,7 +20024,7 @@
           sha256 = "1wg8pcwd70ixn2bxh01934zl12ry4pgx3l9dccpbjdi40gira00d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pixiv-novel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pixiv-novel-mode";
           sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
           name = "pixiv-novel-mode";
         };
@@ -19730,7 +20045,7 @@
           sha256 = "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pkg-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pkg-info";
           sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
           name = "pkg-info";
         };
@@ -19751,7 +20066,7 @@
           sha256 = "0a8qb1ldk6bjs7fpxgxrf90md7q46fhl71gmay8yafdkh6hn0kqr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pkgbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pkgbuild-mode";
           sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
           name = "pkgbuild-mode";
         };
@@ -19772,7 +20087,7 @@
           sha256 = "1k3bqv5y2xp1jl2hpf8qhs11yzhcl8k40fxqjzv7mvc0ysq9y6wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/platformio-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/platformio-mode";
           sha256 = "022l20sfyfkvp6kmmqxr7gcmcdx6b1dgsakjjnx8fknrpxr5kyps";
           name = "platformio-mode";
         };
@@ -19793,7 +20108,7 @@
           sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plenv";
           sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
           name = "plenv";
         };
@@ -19814,7 +20129,7 @@
           sha256 = "0f00dv5jwbhs99j4jc6lvr5n0mv1y80yg7zpp6yrmhww6829l5rg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsense";
           sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
           name = "plsense";
         };
@@ -19835,7 +20150,7 @@
           sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsense-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsense-direx";
           sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
           name = "plsense-direx";
         };
@@ -19845,6 +20160,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "pony-snippets";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "seantallen";
+          repo = "pony-snippets";
+          rev = "56018b23a11563c6766ed706024b22aa5a4556b4";
+          sha256 = "0xjvxfkrl6wl31s7rvbv9zczn6d6i9vf20waqlr3c2ff3zy55ygy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pony-snippets";
+          sha256 = "06rrzfg20kzpscnqr2lin9jvrcydq4wnrv7nj1d0lm6988qz88jx";
+          name = "pony-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/pony-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ponylang-mode";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "SeanTAllen";
+          repo = "ponylang-mode";
+          rev = "d05425eca7c924109263bdac72083137a7967454";
+          sha256 = "0jlycv0ck5kbszwc0v2gbka6k5h39nz8763ws0v8jada7zzmyvxm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ponylang-mode";
+          sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1";
+          name = "ponylang-mode";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ponylang-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }:
     melpaBuild {
         pname = "pophint";
@@ -19856,7 +20213,7 @@
           sha256 = "18i0kivn6prh5pwdr7b4pxfxqsc8l4mks1h6cfs7iwnfn15g5k19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pophint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pophint";
           sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
           name = "pophint";
         };
@@ -19877,7 +20234,7 @@
           sha256 = "1y538siabcf1n00wr4iz5gbxfndw661kx2mn9w1g4lg7yi4n0h0h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup";
           sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
           name = "popup";
         };
@@ -19898,7 +20255,7 @@
           sha256 = "084hb3zn1aiabbyxgaalszb2qjf9z64z960ks5fvz8nh7n6y7ny4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-complete";
           sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
           name = "popup-complete";
         };
@@ -19919,7 +20276,7 @@
           sha256 = "083q5q53j1dcv4m2jdamh28bdk6ajzcypmyb3xr52dnqdm3bw6im";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-imenu";
           sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
           name = "popup-imenu";
         };
@@ -19940,7 +20297,7 @@
           sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popwin";
           sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
           name = "popwin";
         };
@@ -19961,7 +20318,7 @@
           sha256 = "0w8bnspnk871qndp18hs0wk4x9x31xr9rwbvf5dc8mcbnj29ch33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pos-tip";
           sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
           name = "pos-tip";
         };
@@ -19982,7 +20339,7 @@
           sha256 = "1nx3b24i26kgm52xw21x4m15qjkxw3sg5r6qyvck0fyhj0gw69gr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powerline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powerline";
           sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
           name = "powerline";
         };
@@ -20003,7 +20360,7 @@
           sha256 = "010b151wblgxlfpy590yanbl2r8qhpbqgi02v0pyir340frm9ngn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powershell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powershell";
           sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
           name = "powershell";
         };
@@ -20024,7 +20381,7 @@
           sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ppd-sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ppd-sr-speedbar";
           sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
           name = "ppd-sr-speedbar";
         };
@@ -20045,7 +20402,7 @@
           sha256 = "013fig9i4fyx16krp2vfv953p3rwdzr38zs6i50af4pqz4vrcfvh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-mode";
           sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
           name = "pretty-mode";
         };
@@ -20066,7 +20423,7 @@
           sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/processing-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/processing-mode";
           sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
           name = "processing-mode";
         };
@@ -20087,7 +20444,7 @@
           sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/processing-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/processing-snippets";
           sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
           name = "processing-snippets";
         };
@@ -20108,7 +20465,7 @@
           sha256 = "0r32rjfsbna0g2376gdv0c0im1lzw1cwbp9690rgqjj95ls4saa3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prodigy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prodigy";
           sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
           name = "prodigy";
         };
@@ -20129,7 +20486,7 @@
           sha256 = "1hv8ifrpwn434sm41vkgbwni21ma5kfybkwasi6zp0f2b5i9ziw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-explorer";
           sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
           name = "project-explorer";
         };
@@ -20150,7 +20507,7 @@
           sha256 = "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-persist";
           sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
           name = "project-persist";
         };
@@ -20171,7 +20528,7 @@
           sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-persist-drawer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-persist-drawer";
           sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
           name = "project-persist-drawer";
         };
@@ -20191,7 +20548,7 @@
           sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-root";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-root";
           sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
           name = "project-root";
         };
@@ -20212,7 +20569,7 @@
           sha256 = "1rl6n6v9f4m7m969frx8b51a4lzfix2bxx6rfcfbh6kzhc00qnxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
           name = "projectile";
         };
@@ -20225,15 +20582,15 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "0.6.7";
+        version = "0.7.0";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "dee51e39003489ece8077750d3cf93dee6b373fa";
-          sha256 = "03z9zsldzj0nwksw3bj4j58p7n14n6cqv917pwn1sb67l0wziqg2";
+          rev = "21ce05e412b0efebfeab9f84d38c679758ddbf76";
+          sha256 = "0f0siz230xsv20h8wmwa1i8wdsp964y6qmb2i3l485yh03bz1x95";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-rails";
           sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
           name = "projectile-rails";
         };
@@ -20254,7 +20611,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-sift";
           sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
           name = "projectile-sift";
         };
@@ -20275,7 +20632,7 @@
           sha256 = "1rw55w2fpb3rw7j136kclkhppz21f7d7di4cvlv7zj5zpdl5zz88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projekt";
           sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
           name = "projekt";
         };
@@ -20296,7 +20653,7 @@
           sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prompt-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prompt-text";
           sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
           name = "prompt-text";
         };
@@ -20317,7 +20674,7 @@
           sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prop-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prop-menu";
           sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
           name = "prop-menu";
         };
@@ -20338,7 +20695,7 @@
           sha256 = "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/protobuf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/protobuf-mode";
           sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
           name = "protobuf-mode";
         };
@@ -20359,7 +20716,7 @@
           sha256 = "0wgxrwl7dpy084sc76wiwpixycb171g7xwc66m5gnlrv79qyac73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psci";
           sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
           name = "psci";
         };
@@ -20380,7 +20737,7 @@
           sha256 = "0msa8c29djhy5h3zpdvx25f4y1c50rgsk8iz6r127psrxdlfrvg8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psession";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psession";
           sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
           name = "psession";
         };
@@ -20401,7 +20758,7 @@
           sha256 = "1p0k770h96iw8bxm8ssi0a91m050s615q036870lrlsz35mzc5kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pt";
           sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
           name = "pt";
         };
@@ -20422,7 +20779,7 @@
           sha256 = "15c2p5ffvkp80v6fvxa3bgrk8mj18famngqkz2dammxnbppvnvvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/puml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/puml-mode";
           sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
           name = "puml-mode";
         };
@@ -20443,7 +20800,7 @@
           sha256 = "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/punctuality-logger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/punctuality-logger";
           sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
           name = "punctuality-logger";
         };
@@ -20464,7 +20821,7 @@
           sha256 = "012lv7hrwlhvins81vw3yjkhdwbpi6g1dx55i101qyrpzv5ifngm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pungi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pungi";
           sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
           name = "pungi";
         };
@@ -20485,7 +20842,7 @@
           sha256 = "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/puppet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/puppet-mode";
           sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
           name = "puppet-mode";
         };
@@ -20506,7 +20863,7 @@
           sha256 = "1wk319akv0scvyyjsd48pisi2i1gkahhsan9hfszrs6xx3anvfd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/purescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/purescript-mode";
           sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
           name = "purescript-mode";
         };
@@ -20527,7 +20884,7 @@
           sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pushbullet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pushbullet";
           sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
           name = "pushbullet";
         };
@@ -20548,7 +20905,7 @@
           sha256 = "06xdq2slwhkcqlbv7x86zmv55drzif9cwjlj543cwhncphl2x9rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-autopep8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-autopep8";
           sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
           name = "py-autopep8";
         };
@@ -20569,7 +20926,7 @@
           sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-isort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-isort";
           sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
           name = "py-isort";
         };
@@ -20590,7 +20947,7 @@
           sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-yapf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-yapf";
           sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
           name = "py-yapf";
         };
@@ -20611,7 +20968,7 @@
           sha256 = "0qg1kjzsv2mcvlsivqy8ys3djbs5yala37r9h2zcxdicl88q0l11";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pycarddavel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pycarddavel";
           sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
           name = "pycarddavel";
         };
@@ -20632,7 +20989,7 @@
           sha256 = "1y3q1k195wp2kgp00a1y34i20zm80wdv2kxigh6gbn2r6qzkqrar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyenv-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyenv-mode";
           sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
           name = "pyenv-mode";
         };
@@ -20653,7 +21010,7 @@
           sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-environment";
           sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
           name = "python-environment";
         };
@@ -20674,7 +21031,7 @@
           sha256 = "00i7cc4r7275l22k3708xi4hqw2j44yivdb1madzrpf314v3kabr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-x";
           sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
           name = "python-x";
         };
@@ -20695,7 +21052,7 @@
           sha256 = "1af9cd8l5ac58mj92xc7a3diy995cv29abnbb3fl6x4208l4xs3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pythonic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pythonic";
           sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
           name = "pythonic";
         };
@@ -20716,7 +21073,7 @@
           sha256 = "0jidmc608amd0chs4598zkj0nvyll0al093121hkczsbpgbllq9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyvenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyvenv";
           sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
           name = "pyvenv";
         };
@@ -20737,7 +21094,7 @@
           sha256 = "110z27n3h7p2yalicfhnv832ikfcf7p0hrf5qkryz1sdmz79wb3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/qiita";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/qiita";
           sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
           name = "qiita";
         };
@@ -20758,7 +21115,7 @@
           sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/qml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/qml-mode";
           sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
           name = "qml-mode";
         };
@@ -20779,7 +21136,7 @@
           sha256 = "0lfmdlb626b3gbmlvacwn84vpqam6gk9lp29wk0hcraw69vaw1v8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quasi-monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quasi-monochrome-theme";
           sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
           name = "quasi-monochrome-theme";
         };
@@ -20800,7 +21157,7 @@
           sha256 = "09sdv5lf5k347415r9fzljm374rb29gq6kldx2awd164fkdnm8ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quickrun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quickrun";
           sha256 = "1szgirakfnkn9ksls16p233sr7x9ck5m1f1kbk6ancj36yja2nki";
           name = "quickrun";
         };
@@ -20821,7 +21178,7 @@
           sha256 = "02bddznlqys37fnhdpp2g9xa9m7kfgrj1vl0hc5kr42hggk9wwmg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/r-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/r-autoyas";
           sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
           name = "r-autoyas";
         };
@@ -20842,7 +21199,7 @@
           sha256 = "0pbswxzgfqcp6vjlwhvnablj91kxq588j2fmcjzhf0aigkj7dxfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/racer";
           sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
           name = "racer";
         };
@@ -20863,7 +21220,7 @@
           sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-blocks";
           sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
           name = "rainbow-blocks";
         };
@@ -20884,7 +21241,7 @@
           sha256 = "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-delimiters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-delimiters";
           sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
           name = "rainbow-delimiters";
         };
@@ -20905,7 +21262,7 @@
           sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-identifiers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-identifiers";
           sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
           name = "rainbow-identifiers";
         };
@@ -20926,7 +21283,7 @@
           sha256 = "1q65jj6bghvzhlqmpg61a7vn8izc01wp2fjiqx013zxpg9awvzmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rake";
           sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
           name = "rake";
         };
@@ -20947,7 +21304,7 @@
           sha256 = "0fkj89p0rb0r472p1rk8xpx8c74pg968pc2mmw3838y4fpc8i198";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ranger";
           sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
           name = "ranger";
         };
@@ -20968,7 +21325,7 @@
           sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rase";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rase";
           sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
           name = "rase";
         };
@@ -20989,7 +21346,7 @@
           sha256 = "09c6v4lnv6vm2cckbdpx2fdi9xkz9l68qvhx35vaawxhrkgvypzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rbenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rbenv";
           sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
           name = "rbenv";
         };
@@ -21010,7 +21367,7 @@
           sha256 = "0yhmdkvswnn5rga5xzysfpivbz9wdkzbm49licilc2fp1dgcvd6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-styles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-styles";
           sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
           name = "rcirc-styles";
         };
@@ -21031,7 +21388,7 @@
           sha256 = "0r95fzi0x8r18x7r574mp503qaiqyicrq78zlggyz6qihi95pmqj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rdf-prefix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rdf-prefix";
           sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
           name = "rdf-prefix";
         };
@@ -21052,7 +21409,7 @@
           sha256 = "1ka5q2q18hgh7wl5yn04489121bq4nx369rz8nb7dr5l14cas0xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/real-auto-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/real-auto-save";
           sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
           name = "real-auto-save";
         };
@@ -21073,7 +21430,7 @@
           sha256 = "07j1grdbqv3iv5ghmgsjw678bxjajcxi27clz4krcz3ys5b1h70v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/realgud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/realgud";
           sha256 = "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s";
           name = "realgud";
         };
@@ -21094,7 +21451,7 @@
           sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recover-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recover-buffers";
           sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
           name = "recover-buffers";
         };
@@ -21115,7 +21472,7 @@
           sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rect+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rect+";
           sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
           name = "rect-plus";
         };
@@ -21136,7 +21493,7 @@
           sha256 = "048pjrd04w6w4v6r56yblbqgkjh01xib7k1i6rjc6288jh5vr1vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rectangle-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rectangle-utils";
           sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
           name = "rectangle-utils";
         };
@@ -21157,7 +21514,7 @@
           sha256 = "19c5rkb4nn6fs85lixrgrv8gagr69h430inig31dvm4fip9xdjp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redpen-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redpen-paragraph";
           sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
           name = "redpen-paragraph";
         };
@@ -21178,7 +21535,7 @@
           sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relative-line-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relative-line-numbers";
           sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
           name = "relative-line-numbers";
         };
@@ -21199,7 +21556,7 @@
           sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relax";
           sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
           name = "relax";
         };
@@ -21220,7 +21577,7 @@
           sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repeatable-motion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repeatable-motion";
           sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
           name = "repeatable-motion";
         };
@@ -21233,15 +21590,15 @@
     repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }:
     melpaBuild {
         pname = "repl-toggle";
-        version = "0.3.0";
+        version = "0.3.3";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "repl-toggle";
-          rev = "84541e0d734d6608bc8bff87c997aaefe5e1f092";
-          sha256 = "14ij4daddbkpay28g15zfafslh7fd5265j7az0gagvx4qymgficn";
+          rev = "0249c2a72e6bf782c2c15b0cb1d925410543184f";
+          sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repl-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repl-toggle";
           sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
           name = "repl-toggle";
         };
@@ -21262,7 +21619,7 @@
           sha256 = "1pxvwiqhv2nmsxkdwn9jx7na1vgk9dg9yxidglxpmvpid6fy4qdk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/replace-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/replace-symbol";
           sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
           name = "replace-symbol";
         };
@@ -21283,7 +21640,7 @@
           sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repo";
           sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
           name = "repo";
         };
@@ -21304,7 +21661,7 @@
           sha256 = "1xzp2hnkr9lsjx50cxlpki9mvyhjsv0vyc77480jrlnpspakj7qs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/req-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/req-package";
           sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
           name = "req-package";
         };
@@ -21325,7 +21682,7 @@
           sha256 = "0j7nakxj750rhdnm0nk075s7rx38rc9npbb55kg7r9vb2qilnvmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/request";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/request";
           sha256 = "09gxfy34a13wr0agmhn0nldxaiyc72rx9xi56jirsvji4dg5j6mm";
           name = "request";
         };
@@ -21346,7 +21703,7 @@
           sha256 = "0j7nakxj750rhdnm0nk075s7rx38rc9npbb55kg7r9vb2qilnvmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/request-deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/request-deferred";
           sha256 = "19s8q9a01v0g897s9ass1mr5wbzy82rrfcnqpvcvp05q4y787dn9";
           name = "request-deferred";
         };
@@ -21367,7 +21724,7 @@
           sha256 = "1b832r7779rmr6rhzj7klc0l5xzwc4rids87g2hczpb5dhqnchca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/requirejs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/requirejs";
           sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
           name = "requirejs";
         };
@@ -21388,7 +21745,7 @@
           sha256 = "1ywcnrrr4wp6c951mqfscvdgcmwyvxy80p40vi27nzbl977lb1xv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/resize-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
           name = "resize-window";
         };
@@ -21409,7 +21766,7 @@
           sha256 = "0y4ga1lj2x2f0r535ivs09m2l0q76iz72w42wknhsw9lmdsyl5nz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/restart-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/restart-emacs";
           sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
           name = "restart-emacs";
         };
@@ -21430,7 +21787,7 @@
           sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reveal-in-osx-finder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reveal-in-osx-finder";
           sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
           name = "reveal-in-osx-finder";
         };
@@ -21451,7 +21808,7 @@
           sha256 = "15xnz4fi22wsximimwmirlz11v4ksfj8nilyjfw6acd92yrhzg6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reverse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reverse-theme";
           sha256 = "1lq8nwhf8n5i280v0kqksndm4b3n6x34wnd5fa5i48ljwr5cinih";
           name = "reverse-theme";
         };
@@ -21472,7 +21829,7 @@
           sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rich-minority";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rich-minority";
           sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
           name = "rich-minority";
         };
@@ -21493,7 +21850,7 @@
           sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rigid-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rigid-tabs";
           sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
           name = "rigid-tabs";
         };
@@ -21514,7 +21871,7 @@
           sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rinari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rinari";
           sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
           name = "rinari";
         };
@@ -21535,7 +21892,7 @@
           sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rnc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rnc-mode";
           sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q";
           name = "rnc-mode";
         };
@@ -21548,15 +21905,15 @@
     robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "robe";
-        version = "0.7.8";
+        version = "0.7.9";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "robe";
-          rev = "c5a0ae6f68c699ec3cdbb73a3e01e76f62d75f48";
-          sha256 = "1fckb18x9ikm6dlwwdfg9q4wyjjwdqy3r1w2ic01xb0dbyls41gw";
+          rev = "7c56895b6c2fd5d6c9572182f5de10ebe5bfc977";
+          sha256 = "01xd3nc7bmf4r4d37x08rw2dlsg6gns8mraahi4rwkg6a9lwl44n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/robe";
           sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
           name = "robe";
         };
@@ -21569,15 +21926,15 @@
     roguel-ike = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "roguel-ike";
-        version = "0.1";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "roguel-ike";
-          rev = "6d9322ad9d43d0c7465f125c8e08b222866e6923";
-          sha256 = "108j3106n9anas07mj26xlrvscsl5irshd39czkippla84gwmgyc";
+          rev = "706dcb0687e8016d7d776f9d9e5ace9fdbbca43c";
+          sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/roguel-ike";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/roguel-ike";
           sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
           name = "roguel-ike";
         };
@@ -21598,7 +21955,7 @@
           sha256 = "133ficdghshlmwq5dn42cg3h51jdg4lcwqr4cd2s2s52rz8plw9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rope-read-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rope-read-mode";
           sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
           name = "rope-read-mode";
         };
@@ -21619,7 +21976,7 @@
           sha256 = "0mfkq8n28lal4lqwp6v0ilz8wrwgg61sbm0jggznwisjqqy3lzrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rsense";
           sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
           name = "rsense";
         };
@@ -21640,7 +21997,7 @@
           sha256 = "0hrn5n7aaymwimk511kjij44vqaxbmhly1gwmlmsrnbvvma7f2mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rspec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rspec-mode";
           sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
           name = "rspec-mode";
         };
@@ -21653,16 +22010,16 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "2.0";
+        version = "2.1";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "ba85598841648490e64246be802fc2dcdd45bc3c";
-          sha256 = "0ndyvpgbvfcnxf74ffaby36rqsnwj10j1s9vr3gan9mqi6spcggf";
+          rev = "ad85fda48b8c1038bc90c9fb0e8e79f2c5e30bca";
+          sha256 = "0shzxxx7qajmfrxqipmlak899hgmxkqf9zkbmr0g04wamxmyfs65";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rtags";
-          sha256 = "16jvbr4nm48p3dj9wmysjaxyz4ajcay19risqrs9fzrifkr21c9p";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rtags";
+          sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
           name = "rtags";
         };
         packageRequires = [];
@@ -21682,7 +22039,7 @@
           sha256 = "10djjp1520xc05qkciaiaiiciscaln6c74h7ymba40mvzlf67y9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rubocop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rubocop";
           sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
           name = "rubocop";
         };
@@ -21703,7 +22060,7 @@
           sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-compilation";
           sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
           name = "ruby-compilation";
         };
@@ -21724,7 +22081,7 @@
           sha256 = "1cpz9vkp57nk682c5xm20g7bfj5g2aq5ahpk4nhgx7pvd3xvr1ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-end";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-end";
           sha256 = "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis";
           name = "ruby-end";
         };
@@ -21745,7 +22102,7 @@
           sha256 = "01n9j7sag49m4bdl6065jklnxnc5kck51izg884s1is459qgy86k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-hash-syntax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-hash-syntax";
           sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
           name = "ruby-hash-syntax";
         };
@@ -21766,7 +22123,7 @@
           sha256 = "008zj9rg2cmh0xd7g6kgx6snm5sspxs4jmfa8hd43wx5y9pmlb8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-test-mode";
           sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
           name = "ruby-test-mode";
         };
@@ -21787,7 +22144,7 @@
           sha256 = "1zvhq9l717rjgkm7bxz5gqkmh5i49cshwzlimb3h78kpjw3hxl2k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-tools";
           sha256 = "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y";
           name = "ruby-tools";
         };
@@ -21808,7 +22165,7 @@
           sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rvm";
           sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
           name = "rvm";
         };
@@ -21829,7 +22186,7 @@
           sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/s";
           sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
           name = "s";
         };
@@ -21850,7 +22207,7 @@
           sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sackspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sackspace";
           sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
           name = "sackspace";
         };
@@ -21871,7 +22228,7 @@
           sha256 = "0aw95qkql6apyn79la0jbpr0nlixhl9zvi9miry2h5y5pawb3yvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sage-shell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sage-shell-mode";
           sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx";
           name = "sage-shell-mode";
         };
@@ -21892,7 +22249,7 @@
           sha256 = "0lxrq3mzabkwj5bv0mgd7fnx3dsx8vxd5kjgb79rjfra0m7pfgln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sass-mode";
           sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
           name = "sass-mode";
         };
@@ -21913,7 +22270,7 @@
           sha256 = "1mcag7qad1npjn096byakb8pmmi2g64nlf2vcc12irzmwia85fml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sauron";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sauron";
           sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
           name = "sauron";
         };
@@ -21934,7 +22291,7 @@
           sha256 = "1gh97rc528cpam3jsncc03cyf4pps71b8blmdikml71lks07lgwb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/save-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/save-sexp";
           sha256 = "12jx47picdpw668q75qsp9gncrnxnlk1slhzvxsk5pvkdwh26h66";
           name = "save-sexp";
         };
@@ -21955,7 +22312,7 @@
           sha256 = "0y846zmcz5x2jn5bndm0mfi18jc5cd1fkidgc4wvqmm0w30gyx4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sbt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sbt-mode";
           sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
           name = "sbt-mode";
         };
@@ -21976,7 +22333,7 @@
           sha256 = "1gfhk595vnf6565nv6m1v8dc4a3a9z34jj1qdh02lk8azg5ylk89";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-mode2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-mode2";
           sha256 = "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch";
           name = "scala-mode2";
         };
@@ -21997,7 +22354,7 @@
           sha256 = "0hhsgyil8aqdkkip5325yrdq89gnijglcbf1dsvl4wvnmq7a1rik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-outline-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-outline-popup";
           sha256 = "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7";
           name = "scala-outline-popup";
         };
@@ -22018,7 +22375,7 @@
           sha256 = "13s8hp16wxd9fb8gf05dn0xr692kkgiqg7v49fgr00gas4xgpfpm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scpaste";
           sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
           name = "scpaste";
         };
@@ -22039,7 +22396,7 @@
           sha256 = "0zpjf9cp8g4rgnwgmhlpwnanf9lzqm3rm1mkihf0gk5qzxvwsdh9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scss-mode";
           sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
           name = "scss-mode";
         };
@@ -22060,7 +22417,7 @@
           sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/search-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/search-web";
           sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
           name = "search-web";
         };
@@ -22081,7 +22438,7 @@
           sha256 = "0nsm7z056rh32sq7abgdwyaz4dbz8v9pgbha5jvpk7y0zmnabrgs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sekka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sekka";
           sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
           name = "sekka";
         };
@@ -22102,7 +22459,7 @@
           sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/selectric-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/selectric-mode";
           sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
           name = "selectric-mode";
         };
@@ -22123,7 +22480,7 @@
           sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/servant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/servant";
           sha256 = "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h";
           name = "servant";
         };
@@ -22144,7 +22501,7 @@
           sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/serverspec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/serverspec";
           sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
           name = "serverspec";
         };
@@ -22165,7 +22522,7 @@
           sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/session";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/session";
           sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
           name = "session";
         };
@@ -22186,7 +22543,7 @@
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sexp-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sexp-move";
           sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
           name = "sexp-move";
         };
@@ -22207,7 +22564,7 @@
           sha256 = "0yy162sz7vwj0i9w687a5x1c2fq31vc3i6gqhbywspviczdp4q1y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shackle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shackle";
           sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
           name = "shackle";
         };
@@ -22228,7 +22585,7 @@
           sha256 = "11g9lsgakq8nf689k49p9l536ffi62g3bh11mh9ix1l058xamqw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shampoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shampoo";
           sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
           name = "shampoo";
         };
@@ -22249,7 +22606,7 @@
           sha256 = "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
           name = "shell-pop";
         };
@@ -22270,7 +22627,7 @@
           sha256 = "0mcxp74sk9bn36gbhhimgns07iqa4dgbq2pvpqy41igqwb84w306";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-split-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-split-string";
           sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
           name = "shell-split-string";
         };
@@ -22291,7 +22648,7 @@
           sha256 = "0ia7sdip4hl27avckv3qpqgm3k4ynvp3xxq1cy53bqfzzx0gcria";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-switcher";
           sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
           name = "shell-switcher";
         };
@@ -22312,7 +22669,7 @@
           sha256 = "0wvaa5nrbblayjvzjyj6cd942ywg7xz5d8fqaffxcvwlcdihvm7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-toggle";
           sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
           name = "shell-toggle";
         };
@@ -22333,7 +22690,7 @@
           sha256 = "1nli26llyfkj1cz2dwn18c5pz1pnpz3866hapfibvdmwrg4z6cax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shelldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shelldoc";
           sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
           name = "shelldoc";
         };
@@ -22354,7 +22711,7 @@
           sha256 = "0mn7bwvj1yv75a2531jp929j6ypckdfqdg6b5ig0kkbcrrwb7kxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shelltest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shelltest-mode";
           sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
           name = "shelltest-mode";
         };
@@ -22375,7 +22732,7 @@
           sha256 = "1vf766ja8f4xp1f5pmwgz6a85km0nxvc5dn571lwidfrrdbr9rkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shm";
           sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
           name = "shm";
         };
@@ -22396,7 +22753,7 @@
           sha256 = "09454mcjd8n1090pjc5mk1dc6bn3bgh60ddpnv9hkajkzpcjxx4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shpec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shpec-mode";
           sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
           name = "shpec-mode";
         };
@@ -22417,7 +22774,7 @@
           sha256 = "050gmxdk88zlfjwi07jsj2mvsfcv5imhzcpa6ip3cqkzpmw3pl32";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shrink-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shrink-whitespace";
           sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
           name = "shrink-whitespace";
         };
@@ -22438,7 +22795,7 @@
           sha256 = "103yvfgkj78i4bnv1fwk76izsa8h4wyj3vwj1vq7xggj607hkxzq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shut-up";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shut-up";
           sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
           name = "shut-up";
         };
@@ -22459,7 +22816,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sift";
           sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
           name = "sift";
         };
@@ -22480,7 +22837,7 @@
           sha256 = "1qmkc0w28l53zzf5yd2grrk1sq222g5qnsm35ph25s1cfvc1qb2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-httpd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-httpd";
           sha256 = "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59";
           name = "simple-httpd";
         };
@@ -22501,7 +22858,7 @@
           sha256 = "0v0vmkix9f0hb2183irr6xra8mwi47g6rn843sas7jy2ycaqd91v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simpleclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simpleclip";
           sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
           name = "simpleclip";
         };
@@ -22522,7 +22879,7 @@
           sha256 = "04giklbd1fsw2zysr7aqg17h6cpyn4i9jbknm4d4v6581f2pcl93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplenote2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplenote2";
           sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
           name = "simplenote2";
         };
@@ -22543,7 +22900,7 @@
           sha256 = "1p1771qm3jndnf4rdhb1bri5cjiksvxizagi7vfb7mjmsmx18w61";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplezen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplezen";
           sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
           name = "simplezen";
         };
@@ -22553,6 +22910,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sisyphus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
+    melpaBuild {
+        pname = "sisyphus";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "sisyphus";
+          rev = "880d519d6b1e7202a72b1632733690310efb197f";
+          sha256 = "0jy08kj7cy744lbdyil0j50b08vm76bzxwmzd99v4sz12s3qcd2s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sisyphus";
+          sha256 = "08400jazj7w63l8g9ypy6w9dj8r0xh4d2yg3nfwqqf5lhfnj9bnj";
+          name = "sisyphus";
+        };
+        packageRequires = [ dash emacs m-buffer ];
+        meta = {
+          homepage = "http://melpa.org/#/sisyphus";
+          license = lib.licenses.free;
+        };
+      }) {};
     skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "skeletor";
@@ -22564,7 +22942,7 @@
           sha256 = "101xn4glqi7b5vhdqqahj2ib4pm30pzq8sad7zagxw9csihcri3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skeletor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skeletor";
           sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
           name = "skeletor";
         };
@@ -22585,7 +22963,7 @@
           sha256 = "0g5sapd76pjnfhxlw149zj0fpn6l3pz3l8qlcn2c237vm8vn6qv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-less";
           sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
           name = "skewer-less";
         };
@@ -22606,7 +22984,7 @@
           sha256 = "05jndz0c26q60s416vqgvr66axdmxb7qsr2g70fvl5iqavnayhpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-mode";
           sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
           name = "skewer-mode";
         };
@@ -22627,7 +23005,7 @@
           sha256 = "09ccdgg2wgw3xmlkpjsaqmnmf7f8rhjy4g6ypsn1sk5rgbgk8aj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slamhound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slamhound";
           sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
           name = "slamhound";
         };
@@ -22648,7 +23026,7 @@
           sha256 = "0rk12am1dq52khwkwrmg70zarhni2avj4sy44jqckb4x7sv7djfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slideview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slideview";
           sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
           name = "slideview";
         };
@@ -22669,7 +23047,7 @@
           sha256 = "1cl8amk1kc7a953l1khjms04j40mfkpnbsjz3qa123msgachrsg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slim-mode";
           sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
           name = "slim-mode";
         };
@@ -22682,15 +23060,15 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "2.15";
+        version = "2.16";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "da7c32d0c54a6f2d9a4be0662c7b2d576b11eda1";
-          sha256 = "10ydinwsm7m5jlggynhsihxl18zl8cph4rliic8i72hjc3nhqfmy";
+          rev = "0d8c192c12a0a3d055f9bf4cc554083fc931995c";
+          sha256 = "1sx7g0g2j3pz9gqj76773asv1912c0p4zmh3jbssnyy2vp942h27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime";
           sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
           name = "slime";
         };
@@ -22711,7 +23089,7 @@
           sha256 = "0rdhd6kymbzhkc96dxy3nr21ajrkc7iy6zvq1va22r90f96jj9x4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-company";
           sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
           name = "slime-company";
         };
@@ -22732,7 +23110,7 @@
           sha256 = "0lp584k35asqlvbhglv124jazdgp3h7pzl0akfwbdmby9zayqk96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-ritz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-ritz";
           sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
           name = "slime-ritz";
         };
@@ -22753,7 +23131,7 @@
           sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-volleyball";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-volleyball";
           sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
           name = "slime-volleyball";
         };
@@ -22774,7 +23152,7 @@
           sha256 = "1aihr5pbdqjb5j6xsghi7qbrmp46kddv76xmyx5z98m93n70wzqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly";
           sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
           name = "sly";
         };
@@ -22795,7 +23173,7 @@
           sha256 = "11p89pz6zmnjng5177w31ilcmifvnhv9mfjy79ic7amg01h09hsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-company";
           sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
           name = "sly-company";
         };
@@ -22816,7 +23194,7 @@
           sha256 = "0yvlmwnhdph5qj1998jz0idcl7901j6fxa9hivr7kic57j8kbq71";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mode-line";
           sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
           name = "smart-mode-line";
         };
@@ -22837,7 +23215,7 @@
           sha256 = "0yvlmwnhdph5qj1998jz0idcl7901j6fxa9hivr7kic57j8kbq71";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mode-line-powerline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mode-line-powerline-theme";
           sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
           name = "smart-mode-line-powerline-theme";
         };
@@ -22858,7 +23236,7 @@
           sha256 = "1kfihh4s8578cwqyzn5kp3iib7f9vvg6rfc3klqzgads187ryd4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-tabs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-tabs-mode";
           sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
           name = "smart-tabs-mode";
         };
@@ -22879,7 +23257,7 @@
           sha256 = "1mx4hdbrk6v52y5r47fbd6kgqyk3lvqgq8lw3hkww0pqfwwp4x6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartparens";
           sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
           name = "smartparens";
         };
@@ -22900,7 +23278,7 @@
           sha256 = "0j5lg9gryl8vbzw8d3r2fl0c9wxa0c193mcvdfidd25b98wccc3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartrep";
           sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
           name = "smartrep";
         };
@@ -22921,7 +23299,7 @@
           sha256 = "1sd7dh9114mvr4xnp43xx4b7qmwkaj1a1fv7pwc28fhiy89d2md4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartscan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartscan";
           sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
           name = "smartscan";
         };
@@ -22942,7 +23320,7 @@
           sha256 = "1pcpg3lalbrc24z3vwcaysps8dbdzmncdgqdd5ig6yk2a9wyj9ng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smeargle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
           name = "smeargle";
         };
@@ -22963,7 +23341,7 @@
           sha256 = "1hcjh577xz3inx28r8wb4g2b1424ccw8pffvgdmpf80xp1llldj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smex";
           sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
           name = "smex";
         };
@@ -22984,7 +23362,7 @@
           sha256 = "05kf3hb3nb32jzw50a2z9vlf3f0pj40klzxvqj4fxlci777imsvk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smooth-scrolling";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smooth-scrolling";
           sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
           name = "smooth-scrolling";
         };
@@ -23005,7 +23383,7 @@
           sha256 = "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/solarized-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/solarized-theme";
           sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
           name = "solarized-theme";
         };
@@ -23026,7 +23404,7 @@
           sha256 = "0b5w3vdr8llg3hqd22gnc6b6y089lq6vfk0ajkws6gfldz2gg2v1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sos";
           sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
           name = "sos";
         };
@@ -23047,7 +23425,7 @@
           sha256 = "1wbd7v5bnd4qgqk8rrgllal0i949n8xzvb3yhf0vnxr06wdzy0a4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sotlisp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sotlisp";
           sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
           name = "sotlisp";
         };
@@ -23068,7 +23446,7 @@
           sha256 = "0q2ragq4hw89d3w48ykwljb19n2nhz8z6bsmb10shimaf203652g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sound-wav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sound-wav";
           sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
           name = "sound-wav";
         };
@@ -23089,7 +23467,7 @@
           sha256 = "1l9xrw88wq32wm3qx922ihdb9mlv9rrdalwvz9i2790fmw7y84vz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
           name = "sourcekit";
         };
@@ -23110,7 +23488,7 @@
           sha256 = "1k2gfw4dydzqxbfdmcghajbb2lyg1j4wgdhp8chlql3dax1f503d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcemap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
           name = "sourcemap";
         };
@@ -23131,7 +23509,7 @@
           sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcetalk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcetalk";
           sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
           name = "sourcetalk";
         };
@@ -23144,15 +23522,15 @@
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
-        version = "1.1.0";
+        version = "1.1.2";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "3ad012e9a86a40c86460408dcdde704b125a1888";
-          sha256 = "13sqigkw41jmh0f7c1lmx4ipvcrlsp7k8h7vs2drpacf84yl6dn9";
+          rev = "88e22c1c9c69093efc7310ca996d2efb3cbbba1d";
+          sha256 = "1ncwv6sqm1ch396qi1c8276dc910rnm0f3m8xjkskplv3cjaq0ai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spaceline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spaceline";
           sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
           name = "spaceline";
         };
@@ -23173,7 +23551,7 @@
           sha256 = "1gmmmkzxxlpz2ml6qk24vndlrbyl55r5cba76jn342zrxvb357ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sparkline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sparkline";
           sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
           name = "sparkline";
         };
@@ -23194,7 +23572,7 @@
           sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sparql-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
           name = "sparql-mode";
         };
@@ -23215,7 +23593,7 @@
           sha256 = "1k6c7450v0ln6l9b8z1hib2s2b4rmjbskynvwwyilgdnvginfhi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speech-tagger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speech-tagger";
           sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
           name = "speech-tagger";
         };
@@ -23236,7 +23614,7 @@
           sha256 = "1q6v0xfdxm57lyj4zxyqv6n5ik5w9drk7yf9w8spb5r22jg0dg8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sphinx-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sphinx-doc";
           sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
           name = "sphinx-doc";
         };
@@ -23257,7 +23635,7 @@
           sha256 = "17qsmjsbk8aq3azjxid6h9fzz77bils74scp21sqn8vdnijx8991";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/splitjoin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/splitjoin";
           sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
           name = "splitjoin";
         };
@@ -23278,7 +23656,7 @@
           sha256 = "05y8xv6zapspwr5bii41lgirslas22wsbm0kgb4dm79qbk9j1kzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spotify";
           sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
           name = "spotify";
         };
@@ -23299,7 +23677,7 @@
           sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sprintly-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sprintly-mode";
           sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
           name = "sprintly-mode";
         };
@@ -23320,7 +23698,7 @@
           sha256 = "1dcb18fq84vlfgb038i2x6vy7mhin2q6jn4jl9fh256n12cx4nrn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sqlup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sqlup-mode";
           sha256 = "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7";
           name = "sqlup-mode";
         };
@@ -23341,7 +23719,7 @@
           sha256 = "0wx8l8gkh8rbf2g149f35gpnmkk45s9x4r844aqw5by4zkvix4rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/srefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/srefactor";
           sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
           name = "srefactor";
         };
@@ -23362,7 +23740,7 @@
           sha256 = "0igqifws73cayvjnhhrsqpy14sr27avymfhaqzrpj76m2fsh6fj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stash";
           sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
           name = "stash";
         };
@@ -23383,7 +23761,7 @@
           sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/status";
           sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
           name = "status";
         };
@@ -23404,7 +23782,7 @@
           sha256 = "0pik6mq8syhxk9l9ns8wgvg5312qkckm3cilb3irwdm1dvnl5hpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stekene-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stekene-theme";
           sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
           name = "stekene-theme";
         };
@@ -23423,7 +23801,7 @@
           sha256 = "12c5df549d653c8ec3476ed271a4e9a4065a61a467229c070bb2e6295e285e16";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stgit";
           sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
           name = "stgit";
         };
@@ -23444,7 +23822,7 @@
           sha256 = "15gdcpbba3h84s7xnpk69nav6bixdixnirdh5n1rly010q0m5s5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-edit";
           sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
           name = "string-edit";
         };
@@ -23465,7 +23843,7 @@
           sha256 = "03azfs6z0jg66ppalijcxl973vdbhj4c3g84sm5dm8xv6rnxrv2s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-utils";
           sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
           name = "string-utils";
         };
@@ -23486,7 +23864,7 @@
           sha256 = "035ym1c1vzg6hjsnd258z4dkrfc11lj4c0y4gpgybhk54dq3w9dk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stripe-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stripe-buffer";
           sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
           name = "stripe-buffer";
         };
@@ -23506,7 +23884,7 @@
           sha256 = "f5e3b0fdbdb1c747c40f7b6746de195e37bd4caccdcc05c6aa14124f29e71428";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stumpwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stumpwm-mode";
           sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
           name = "stumpwm-mode";
         };
@@ -23527,7 +23905,7 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stylus-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stylus-mode";
           sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
           name = "stylus-mode";
         };
@@ -23537,6 +23915,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    subatomic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "subatomic-theme";
+        version = "1.8.1";
+        src = fetchFromGitHub {
+          owner = "cryon";
+          repo = "subatomic";
+          rev = "6a4086af748b1ecb27f6ba2aa2614988db16d594";
+          sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subatomic-theme";
+          sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc";
+          name = "subatomic-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/subatomic-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     subemacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "subemacs";
@@ -23548,7 +23947,7 @@
           sha256 = "189547d0g9ax0nr221bkdchlfcj60dsy8lgbbrvq3n3xrmlvl362";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subemacs";
           sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
           name = "subemacs";
         };
@@ -23569,7 +23968,7 @@
           sha256 = "0mx892vn4a32df30iqmf2vsz1gdl3i557fw0194g6a66n9w2q7xf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subshell-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subshell-proc";
           sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
           name = "subshell-proc";
         };
@@ -23590,7 +23989,7 @@
           sha256 = "1kmyivsyxr6gb2k36ssyr779rpk8qsrb27q5rjsir9fgc95qhvjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sudden-death";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sudden-death";
           sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
           name = "sudden-death";
         };
@@ -23611,7 +24010,7 @@
           sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/suomalainen-kalenteri";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/suomalainen-kalenteri";
           sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
           name = "suomalainen-kalenteri";
         };
@@ -23632,7 +24031,7 @@
           sha256 = "1pq71simdb4pcbzzavlxdfbgh548m15f493h821k04n67ydzlmj3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/super-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/super-save";
           sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
           name = "super-save";
         };
@@ -23653,7 +24052,7 @@
           sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/svg-mode-line-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/svg-mode-line-themes";
           sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
           name = "svg-mode-line-themes";
         };
@@ -23674,7 +24073,7 @@
           sha256 = "1h56qkbx5abz1l94wrdpbzspiz24mfgkppzfalvbvx5qwl079cvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sweetgreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sweetgreen";
           sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
           name = "sweetgreen";
         };
@@ -23687,15 +24086,15 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "0.3.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "e09694f0f95a64b2c96487cbdcb66636a77ea22a";
-          sha256 = "1fi5zdvplw7h5hnyi37k92c8s8qnjgizbnv1mah18y8d30n1r77n";
+          rev = "4e9da69ba776ec2a4a97c75534e6274bffc4fc8a";
+          sha256 = "07xrcg33vsw19kz692hm7blzvnf7b6isllsz79fvs8q3l5c9mfjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swift-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swift-mode";
           sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
           name = "swift-mode";
         };
@@ -23716,7 +24115,7 @@
           sha256 = "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swiper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swiper";
           sha256 = "13lld7kjz1n1ryxvrfsy0iym5l9m9ybrf7bpcmkzsalpp15j3mvm";
           name = "swiper";
         };
@@ -23737,7 +24136,7 @@
           sha256 = "1y2dbd3ikdpjvi8xz10jkrx2773h7cgr6jxm5b2bldm81lvi8x64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swiper-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swiper-helm";
           sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
           name = "swiper-helm";
         };
@@ -23758,7 +24157,7 @@
           sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/switch-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/switch-window";
           sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
           name = "switch-window";
         };
@@ -23779,7 +24178,7 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sws-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sws-mode";
           sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
           name = "sws-mode";
         };
@@ -23800,7 +24199,7 @@
           sha256 = "02f63k8rzb3bcch6vj6w5c5ncccqg83siqnc8hyi0lhy1bfx240p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sx";
           sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
           name = "sx";
         };
@@ -23821,7 +24220,7 @@
           sha256 = "0hi2jflrlpp7xkbj852vp9hcl8bfmf04jqw1hawxrw4bxdp95jh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/synosaurus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/synosaurus";
           sha256 = "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg";
           name = "synosaurus";
         };
@@ -23842,7 +24241,7 @@
           sha256 = "1pn69f4w48jdj3wd1myj6qq2mhvygmlzbq2dws2qkjlp3kbwa6da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syntactic-sugar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syntactic-sugar";
           sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
           name = "syntactic-sugar";
         };
@@ -23862,7 +24261,7 @@
           sha256 = "1p9bp09nibw7rra3r6nj496zdx09db6k82dxnxs1lfgdiswfdq2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syntax-subword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syntax-subword";
           sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
           name = "syntax-subword";
         };
@@ -23883,7 +24282,7 @@
           sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/system-specific-settings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/system-specific-settings";
           sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
           name = "system-specific-settings";
         };
@@ -23904,7 +24303,7 @@
           sha256 = "0axskr4q0kw8pmnl1pv2z3n6x3pn6v28qcgz3qf745lqgmsgbng9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/systemd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/systemd";
           sha256 = "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir";
           name = "systemd";
         };
@@ -23925,7 +24324,7 @@
           sha256 = "09nndx83ws5v2i9x0dzk6l1a0lq29ffzh3y05n0n64nf5j0a7zvk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ta";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ta";
           sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
           name = "ta";
         };
@@ -23946,7 +24345,7 @@
           sha256 = "1xd67s92gyr49v73j7r7cbhsc40bkw8aqh21whgbypdgzpyc7azc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tabbar-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tabbar-ruler";
           sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
           name = "tabbar-ruler";
         };
@@ -23967,7 +24366,7 @@
           sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tablist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tablist";
           sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
           name = "tablist";
         };
@@ -23988,7 +24387,7 @@
           sha256 = "0kq40g46s8kgiafrhdq99h79rz9h5fvgz59k7ralmf86bl4sdmdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tagedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tagedit";
           sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
           name = "tagedit";
         };
@@ -24009,7 +24408,7 @@
           sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/telepathy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/telepathy";
           sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
           name = "telepathy";
         };
@@ -24030,7 +24429,7 @@
           sha256 = "0smdlzrcbmip6c6c3rd0871wv5xyagavwsxhhgvki6ybyzdj9a19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/telephone-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
           name = "telephone-line";
         };
@@ -24051,7 +24450,7 @@
           sha256 = "1d1hrnxhi7h5d5i4198hx5lj7fbc280lpkxmk2nb8z6j7z0aki7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-alert";
           sha256 = "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n";
           name = "term-alert";
         };
@@ -24072,7 +24471,7 @@
           sha256 = "1idz9c38q47lll55w1znya00hlkwa42029ys70sb14inc51cml51";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-cmd";
           sha256 = "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy";
           name = "term-cmd";
         };
@@ -24093,7 +24492,7 @@
           sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-run";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-run";
           sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
           name = "term-run";
         };
@@ -24114,7 +24513,7 @@
           sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/termbright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/termbright-theme";
           sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
           name = "termbright-theme";
         };
@@ -24135,7 +24534,7 @@
           sha256 = "1n4z5hgpv1f0360zgdxz1q4gmhjjrxm7ygxh1g4zjy6kbhgylmxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern";
           sha256 = "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif";
           name = "tern";
         };
@@ -24156,7 +24555,7 @@
           sha256 = "1n4z5hgpv1f0360zgdxz1q4gmhjjrxm7ygxh1g4zjy6kbhgylmxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern-auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern-auto-complete";
           sha256 = "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1";
           name = "tern-auto-complete";
         };
@@ -24177,7 +24576,7 @@
           sha256 = "0l63lzm96gg3ihgc4l671i342qxigwdbn4xfkbxnarb0206gnb5p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern-django";
           sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
           name = "tern-django";
         };
@@ -24198,7 +24597,7 @@
           sha256 = "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/terraform-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
           name = "terraform-mode";
         };
@@ -24219,7 +24618,7 @@
           sha256 = "108csr1d7w0105rb6brzgbksb9wmq1p573vxbq0miv5k894j447f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-case-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-case-mode";
           sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
           name = "test-case-mode";
         };
@@ -24240,7 +24639,7 @@
           sha256 = "02vp4m3aw7rs4gxn91v6j3y8pr04hpydrg05ck3ivv46snkfagdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-kitchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-kitchen";
           sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
           name = "test-kitchen";
         };
@@ -24261,7 +24660,7 @@
           sha256 = "08g7fan1y3wi4w7cdij14awadqss6prqg3k7qzf0wrnbm13dzhmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-simple";
           sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
           name = "test-simple";
         };
@@ -24282,7 +24681,7 @@
           sha256 = "1a0fzn66gv421by0x6wj3z6bvzv274a9p8c2aaax0dskncl5lgk1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textmate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textmate";
           sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
           name = "textmate";
         };
@@ -24303,7 +24702,7 @@
           sha256 = "0fjapb7naysf34g4ac5gsa90b2s2ss7qgpyd9mfv3mdqrsp2dyw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textmate-to-yas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textmate-to-yas";
           sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
           name = "textmate-to-yas";
         };
@@ -24324,7 +24723,7 @@
           sha256 = "09vf3qs949n4iqzd14iq2kgvypwdwdv8ii8l5jcqfppgspd8m8yd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/theme-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/theme-changer";
           sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
           name = "theme-changer";
         };
@@ -24345,7 +24744,7 @@
           sha256 = "1srylw9wwkyq92f9v6ds9zp9z8sl800wbxjbir80g1lwv4hghaii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thrift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thrift";
           sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
           name = "thrift";
         };
@@ -24366,7 +24765,7 @@
           sha256 = "1vq5yp6pyjam2csz22mcp353a4d5r7f9m6bsjizfmgr2ld7bwhx7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/timer-revert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/timer-revert";
           sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
           name = "timer-revert";
         };
@@ -24387,7 +24786,7 @@
           sha256 = "0p7piqbhwxp2idslqnzl5x4y9aqgba9ryxrjy3d0avky5z9kappl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/timesheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/timesheet";
           sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
           name = "timesheet";
         };
@@ -24408,7 +24807,7 @@
           sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tox";
           sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
           name = "tox";
         };
@@ -24429,7 +24828,7 @@
           sha256 = "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tracking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tracking";
           sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
           name = "tracking";
         };
@@ -24450,7 +24849,7 @@
           sha256 = "14fzgpafry3v072f22krap81jfpdc17bpimp16hv7f20sny29a5v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/transmission";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/transmission";
           sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
           name = "transmission";
         };
@@ -24471,7 +24870,7 @@
           sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/travis";
           sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
           name = "travis";
         };
@@ -24492,7 +24891,7 @@
           sha256 = "18na22fhwqz80qinmnpsvp6ghc9irva1scixi6s4q6plmgr4m397";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/truthy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/truthy";
           sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
           name = "truthy";
         };
@@ -24513,7 +24912,7 @@
           sha256 = "1ma3k9bbw427cj1n2gjajbqii482jhs2lgjggz9clpc21bn5wqfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tss";
           sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
           name = "tss";
         };
@@ -24534,7 +24933,7 @@
           sha256 = "060jksd9aamqx1n4l0bb9v4icsf7cr8jkyw0mbhgyz32nmxh3v6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ttrss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ttrss";
           sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
           name = "ttrss";
         };
@@ -24555,7 +24954,7 @@
           sha256 = "0jpcjy2a77mywba2vm61knj26pgylsmv5a21cdp80q40bac4i6bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tuareg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tuareg";
           sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
           name = "tuareg";
         };
@@ -24576,7 +24975,7 @@
           sha256 = "0ihjjw5wxz5ybl3600k937pszw3442cijs4gbqqip9vhd5y9m8gy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tumble";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tumble";
           sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
           name = "tumble";
         };
@@ -24597,7 +24996,7 @@
           sha256 = "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tup-mode";
           sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
           name = "tup-mode";
         };
@@ -24618,7 +25017,7 @@
           sha256 = "0glw5lns7hwp8jznnfm6dyjw454sv2n84gy07ma7s1q3yczhq5bc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twilight-anti-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twilight-anti-bright-theme";
           sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
           name = "twilight-anti-bright-theme";
         };
@@ -24639,7 +25038,7 @@
           sha256 = "193v98i84xybm3n0f30jin5q10i87vbcnbdhl4zqi7jij9p5v98z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twittering-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twittering-mode";
           sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
           name = "twittering-mode";
         };
@@ -24660,7 +25059,7 @@
           sha256 = "1risfbsaafh760vnl4ryys91g4k78g0fxj2zlcndpxxv34gwkhy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typed-clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typed-clojure-mode";
           sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
           name = "typed-clojure-mode";
         };
@@ -24681,7 +25080,7 @@
           sha256 = "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typo";
           sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
           name = "typo";
         };
@@ -24702,7 +25101,7 @@
           sha256 = "0k41hwb6jgv3hngfrphlyhmfhvy4k05mvn0brm64xk7lj56y8q2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ubuntu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ubuntu-theme";
           sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
           name = "ubuntu-theme";
         };
@@ -24723,7 +25122,7 @@
           sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ucs-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ucs-utils";
           sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
           name = "ucs-utils";
         };
@@ -24744,7 +25143,7 @@
           sha256 = "0dmkn8qlnyvgaj7dqh82mqj1fik59zfi2yxcic9i6q9walxc3cas";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/undercover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/undercover";
           sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
           name = "undercover";
         };
@@ -24765,7 +25164,7 @@
           sha256 = "1g1ldyz42q3i2xlgvhd4s93cvkh0fm8m3l344zjcw8rvqaisyphj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/underwater-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/underwater-theme";
           sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
           name = "underwater-theme";
         };
@@ -24786,7 +25185,7 @@
           sha256 = "1qy0q1fp7cmvmxynqrb086dkb727lmk5h1k98y14j75b94ilpy0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unfill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unfill";
           sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
           name = "unfill";
         };
@@ -24807,7 +25206,7 @@
           sha256 = "0n06dvf6r7qblz8vz38qc37xrn29wa1c0jyzis1qw9zzf6hmmzj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-enbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-enbox";
           sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
           name = "unicode-enbox";
         };
@@ -24828,7 +25227,7 @@
           sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-fonts";
           sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
           name = "unicode-fonts";
         };
@@ -24855,7 +25254,7 @@
           sha256 = "0qy1hla7vf674ynqdzsaw2cnk92nhpcimww5q94rc0a95pzw64wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-progress-reporter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-progress-reporter";
           sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
           name = "unicode-progress-reporter";
         };
@@ -24876,7 +25275,7 @@
           sha256 = "0q7cbl89yg3fjxaxsqsksxhw7ibdslbb004z5y1m579n7zgcrljy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-whitespace";
           sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
           name = "unicode-whitespace";
         };
@@ -24897,7 +25296,7 @@
           sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unify-opening";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unify-opening";
           sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
           name = "unify-opening";
         };
@@ -24918,7 +25317,7 @@
           sha256 = "1w2w0gmyr0nbq8kv3ldj30h9xma76gi1khbdia1y30kss677rr8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unkillable-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unkillable-scratch";
           sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
           name = "unkillable-scratch";
         };
@@ -24939,7 +25338,7 @@
           sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/use-package";
           sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
           name = "use-package";
         };
@@ -24960,7 +25359,7 @@
           sha256 = "1azv6grd5h2r1spy996nv6q1c5l6qawv6k0dc2i5k96szl0r668r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/utop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/utop";
           sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
           name = "utop";
         };
@@ -24981,7 +25380,7 @@
           sha256 = "0z53n9qsglp87f6q1pa3sixrjni9k46j31zg15gcwrmflmfrw8ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uzumaki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uzumaki";
           sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
           name = "uzumaki";
         };
@@ -25002,7 +25401,7 @@
           sha256 = "04r73s3fhvdcryv0l57awkpg1hi3kg6zcqxbxb03jc89h0f9vdlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vagrant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vagrant";
           sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
           name = "vagrant";
         };
@@ -25023,7 +25422,7 @@
           sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vbasense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vbasense";
           sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
           name = "vbasense";
         };
@@ -25044,7 +25443,7 @@
           sha256 = "07dx3dyvkwcin0gb6j4jx0ldfxs4rqhygl56a8i81yy05adkaq2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vcomp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vcomp";
           sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
           name = "vcomp";
         };
@@ -25065,7 +25464,7 @@
           sha256 = "034475m2d2vlrlc2l88gdx0ga3krsdh08wkjxwnbb2dfyz3p8r9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vdirel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vdirel";
           sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
           name = "vdirel";
         };
@@ -25086,7 +25485,7 @@
           sha256 = "0lzq31zqnk32vfp3kicnvgfr3nkv8amjzxmk9nrz1kwgmq7gvkjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vector-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vector-utils";
           sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
           name = "vector-utils";
         };
@@ -25107,7 +25506,7 @@
           sha256 = "0k8wbylvws4yxh2jzxkz0fw5kwgblxvmagz54igbjj5mfm45pgsp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vhdl-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vhdl-tools";
           sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
           name = "vhdl-tools";
         };
@@ -25128,7 +25527,7 @@
           sha256 = "1750gx65ymibam8ahx5blfv5jc26f3mzbklk1jrmfwpsalyghdd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vim-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vim-region";
           sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
           name = "vim-region";
         };
@@ -25149,7 +25548,7 @@
           sha256 = "1f94qx8rbnn21cl0grxqa9gzkbrz68vmqsihv8vvi8qf1c1dmd0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimgolf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimgolf";
           sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
           name = "vimgolf";
         };
@@ -25170,7 +25569,7 @@
           sha256 = "082qrbljlahkq1fz2dfl434f1xv47jc1v9k0srh7lrm14616dzq3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimish-fold";
           sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
           name = "vimish-fold";
         };
@@ -25191,7 +25590,7 @@
           sha256 = "100w8rxdqln4xiwi0df15pvyaiyhjlwcjdh8nb0j95qpwji41vmf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-fill-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-fill-column";
           sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
           name = "visual-fill-column";
         };
@@ -25212,7 +25611,7 @@
           sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vlf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vlf";
           sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
           name = "vlf";
         };
@@ -25233,7 +25632,7 @@
           sha256 = "0q1rwqjwqcnsr57s531pwlm464q8wx5vvdm5rj2xy9b3yi6phis1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/voca-builder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/voca-builder";
           sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
           name = "voca-builder";
         };
@@ -25254,7 +25653,7 @@
           sha256 = "0jl3n79wmbxnrbf83qjq0v5pzhvv67i9r5sp2zj8nc86hh7dvjsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wacspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wacspace";
           sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
           name = "wacspace";
         };
@@ -25275,7 +25674,7 @@
           sha256 = "0mnfk2ys8axjh696cq5msr5cdr91icl1i3mi0dd2y00lvh6sbm7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wc-goal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wc-goal-mode";
           sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
           name = "wc-goal-mode";
         };
@@ -25288,15 +25687,15 @@
     wcheck-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wcheck-mode";
-        version = "2015.11.29";
+        version = "2016.1.30";
         src = fetchFromGitHub {
           owner = "tlikonen";
           repo = "wcheck-mode";
-          rev = "866954f040217059607633cf4c0f5e8a1ff5fd9a";
-          sha256 = "1l92k59yvdfhmj4yghcl5bqprynavr3s28v7h8y98v82laxp2q9m";
+          rev = "adb9dd9f39cb0bd0000d140d6e778c4864dfde08";
+          sha256 = "113prlamr2j6y6n0w43asffawwa4qiq63mgwm85v04h6pr8bd90l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wcheck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wcheck-mode";
           sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
           name = "wcheck-mode";
         };
@@ -25317,7 +25716,7 @@
           sha256 = "0qx92jqzsimjk92pql2h8pzhq66mqijwqgjqwp7rmq5b6k0nvx1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weather-metno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weather-metno";
           sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
           name = "weather-metno";
         };
@@ -25338,7 +25737,7 @@
           sha256 = "1w7jnsc6lzlrlkj0nrlfnyca78lw53144hrf9k43b0g0zl8n9zqj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-completion-data";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-completion-data";
           sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
           name = "web-completion-data";
         };
@@ -25359,7 +25758,7 @@
           sha256 = "00fzzjqa1v2dzlpgjxb2qj3nn6iizg177mk7vjvcv4814g4dhcal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
           name = "web-mode";
         };
@@ -25379,7 +25778,7 @@
           sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weblogger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weblogger";
           sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk";
           name = "weblogger";
         };
@@ -25400,7 +25799,7 @@
           sha256 = "0f90m2s40jish4wjwfpmbgw024r7n2l5b9q9wr6rd3vdcwks3mcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weechat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weechat";
           sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
           name = "weechat";
         };
@@ -25421,7 +25820,7 @@
           sha256 = "14vmgfz45wmpjfhfx3pfjn3bak8qvj1zk1w4xc5w1cfl6vnij6hv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weibo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weibo";
           sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
           name = "weibo";
         };
@@ -25442,7 +25841,7 @@
           sha256 = "11mi23djk690n4984hk3pv61rrkdnxpkmywsqibi3xki27v2al36";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/which-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/which-key";
           sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
           name = "which-key";
         };
@@ -25463,7 +25862,7 @@
           sha256 = "01fwhrfi92pcrwc4yn03pflc9wj07mhzj0a0i5amar4f9bj6m5b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whitaker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whitaker";
           sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
           name = "whitaker";
         };
@@ -25484,7 +25883,7 @@
           sha256 = "0xmwhybb8x6wwfr55ym5xg4dhy1aqx1abxy9qskn7h3zf1z4pgg2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whitespace-cleanup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whitespace-cleanup-mode";
           sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
           name = "whitespace-cleanup-mode";
         };
@@ -25505,7 +25904,7 @@
           sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whole-line-or-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whole-line-or-region";
           sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
           name = "whole-line-or-region";
         };
@@ -25526,7 +25925,7 @@
           sha256 = "0fqv63m8z5m5ghh4j8ccdnmgcdkvi4jqpg9z7lp17g4p9pq3xfjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/widget-mvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/widget-mvc";
           sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
           name = "widget-mvc";
         };
@@ -25547,7 +25946,7 @@
           sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wiki-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wiki-nav";
           sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
           name = "wiki-nav";
         };
@@ -25568,7 +25967,7 @@
           sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/win-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/win-switch";
           sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
           name = "win-switch";
         };
@@ -25589,7 +25988,7 @@
           sha256 = "049bwa5g0z1b9nrsc1vc4511aqcq9fvl16xg493wj651g6q9qigb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-end-visible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-end-visible";
           sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
           name = "window-end-visible";
         };
@@ -25610,7 +26009,7 @@
           sha256 = "0jyymmbz03zj2ydca1rv6ra0b2brjl7pyl4897zd00j5kvqjdyif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-layout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-layout";
           sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
           name = "window-layout";
         };
@@ -25631,7 +26030,7 @@
           sha256 = "1rz2a1l3apavsknlfy0faaivqgpj4x9jz3hbysbg9pydpcwqgf64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-numbering";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-numbering";
           sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
           name = "window-numbering";
         };
@@ -25652,7 +26051,7 @@
           sha256 = "08j0akwjp4arkw3zm0lazb13f6dq0m8y9k9nmypd7xk0m77byymd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-purpose";
           sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d";
           name = "window-purpose";
         };
@@ -25673,7 +26072,7 @@
           sha256 = "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/windsize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/windsize";
           sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
           name = "windsize";
         };
@@ -25689,11 +26088,11 @@
         version = "0.9.0";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "34fc6f12d740";
-          sha256 = "0ppj8mrlc20i2syyiwvj5rp53swrm929h0ksxxlqvn3nvl9gsajd";
+          rev = "f41388ee99f1";
+          sha256 = "16711d1ds508nmjw81jm2cfdpqzc55gc175fkhayk0f5swlvd11m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wisp-mode";
           sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
           name = "wisp-mode";
         };
@@ -25714,7 +26113,7 @@
           sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wispjs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wispjs-mode";
           sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
           name = "wispjs-mode";
         };
@@ -25727,16 +26126,16 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "2.4.0";
+        version = "2.5.0";
         src = fetchFromGitHub {
           owner = "magit";
-          repo = "magit";
-          rev = "2e757a8c919b53edddb186e36e055e011e3b0ab3";
-          sha256 = "0hklwwzi2gqywysxn16ps1fvn48max52cpk2nx7r4df4h52yk6wn";
+          repo = "with-editor";
+          rev = "580f225a6c4476feb36b707c6c705b027339717b";
+          sha256 = "0dymhkbkzicjw0379bdzbb594x5xcjbgbn428a30i2i0jwv66pfz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/with-editor";
-          sha256 = "042fa55yakdn2di4l5dilnmqpslac46wpr1zpl4xk3v3i4nn9ndv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/with-editor";
+          sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
           name = "with-editor";
         };
         packageRequires = [ async dash emacs ];
@@ -25756,7 +26155,7 @@
           sha256 = "0nmzh6dynbm8vglp4pqz81s2z68jbnasvamvi1x1iawf8g9zfyix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wn-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wn-mode";
           sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
           name = "wn-mode";
         };
@@ -25777,7 +26176,7 @@
           sha256 = "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wonderland";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wonderland";
           sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
           name = "wonderland";
         };
@@ -25798,7 +26197,7 @@
           sha256 = "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wordsmith-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wordsmith-mode";
           sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
           name = "wordsmith-mode";
         };
@@ -25819,7 +26218,7 @@
           sha256 = "03hjwm51sngkh7jjiwnqhflllqq6i99ib47rm2ja9ii0qyhj1qa0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wrap-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wrap-region";
           sha256 = "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq";
           name = "wrap-region";
         };
@@ -25840,7 +26239,7 @@
           sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/writegood-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/writegood-mode";
           sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
           name = "writegood-mode";
         };
@@ -25861,7 +26260,7 @@
           sha256 = "0f554h834p12255mhwjnxbh1ls65476k60cwddqyl844ph75w8jv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/writeroom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/writeroom-mode";
           sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
           name = "writeroom-mode";
         };
@@ -25882,7 +26281,7 @@
           sha256 = "1lv0l27lrp6xyl0c5yhlnyjwx872izq02z8x34da9jv3walxpk8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ws-butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ws-butler";
           sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
           name = "ws-butler";
         };
@@ -25903,7 +26302,7 @@
           sha256 = "0qfbf9xmln60yd0na1508xmxkvnx0pis4dvbf16cjv0i41dq6i87";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wsd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wsd-mode";
           sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
           name = "wsd-mode";
         };
@@ -25924,7 +26323,7 @@
           sha256 = "13id1vf590gc0kwkhh6mgq2gj2bra2kycxjlvql7v0s7cdvamjhq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/x86-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/x86-lookup";
           sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
           name = "x86-lookup";
         };
@@ -25945,7 +26344,7 @@
           sha256 = "154xnfcmil9xjjmq4cyrfpir4ga4mgcmmbd7dja1m7rpk1734xk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xbm-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xbm-life";
           sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
           name = "xbm-life";
         };
@@ -25966,7 +26365,7 @@
           sha256 = "1n1msmqap4a2qnjwrchf9cjkzcl20hbrx0vsc4lkbvq3p5riv5p7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xcscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xcscope";
           sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
           name = "xcscope";
         };
@@ -25979,15 +26378,15 @@
     xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xquery-tool";
-        version = "0.1.3";
+        version = "0.1.8";
         src = fetchFromGitHub {
           owner = "paddymcall";
           repo = "xquery-tool.el";
-          rev = "248db2c5bace1232508ad69a5616205dda92d5cf";
-          sha256 = "1yxf0byq6d4cl3g25q4f2fqp4x9zpz1hm74yg9v1nr0lk5sgas95";
+          rev = "126164abeb77bd7932c73590939637895005c48b";
+          sha256 = "1yy759qc4njc8bqh8hmgc0mq5vk5spz5syxgflqhjijk8nrvyfgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xquery-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xquery-tool";
           sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
           name = "xquery-tool";
         };
@@ -26008,7 +26407,7 @@
           sha256 = "1zdj4664gvwc4kyx7fx5232l3c5anm0xyrrnrw596q604q6xxj2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-color";
           sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
           name = "xterm-color";
         };
@@ -26029,7 +26428,7 @@
           sha256 = "1wqx6hlqcmqiljydih5fx89dw06g8w728pyn4iqsap8jwgjngb09";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xtest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xtest";
           sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
           name = "xtest";
         };
@@ -26050,7 +26449,7 @@
           sha256 = "1rplafm6mldsirj7xg66vsx03n263yii3il3fkws69xmv7sx1a6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yafolding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yafolding";
           sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
           name = "yafolding";
         };
@@ -26071,7 +26470,7 @@
           sha256 = "0l9b888wv72j4hhkcfzsh09iqjxp2qjbjcjcfmvfhxf7il11pv8h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yagist";
           sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
           name = "yagist";
         };
@@ -26092,7 +26491,7 @@
           sha256 = "1mj1gwrflpdlmc7wl1axygn1jqlrjys1dh3cpdh27zrgsjvhd6c1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaml-mode";
           sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
           name = "yaml-mode";
         };
@@ -26113,7 +26512,7 @@
           sha256 = "007837w6gd7k253h7g2in6l3ihcbwv733yiffs26pnymgk21xdqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yascroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yascroll";
           sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
           name = "yascroll";
         };
@@ -26126,15 +26525,15 @@
     yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "0.9.0.1";
+        version = "0.9.1snapshot";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "yasnippet";
-          rev = "be2f815c43deb74e0f809ed47debc4aa2e67ea1e";
-          sha256 = "04cqcv10i6mym8j9fhd4fklmwa1q4nfg99kpp0bwx7issqhziqv5";
+          rev = "80941c077f8248ee1e8dcc64b3b57e741b9e5755";
+          sha256 = "0m6y2m2nsg6camwh0hjv9jcw6p5a0b4dwig1d58s2g15n3hca3dy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yasnippet";
           sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
           name = "yasnippet";
         };
@@ -26155,7 +26554,7 @@
           sha256 = "1yplaj7pry43qps8hvqxj9983ah4jvaiq94l171a7f8qi28386s8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yatemplate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yatemplate";
           sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
           name = "yatemplate";
         };
@@ -26174,7 +26573,7 @@
           sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yatex";
           sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
           name = "yatex";
         };
@@ -26195,7 +26594,7 @@
           sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaxception";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaxception";
           sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
           name = "yaxception";
         };
@@ -26216,7 +26615,7 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ycmd";
           sha256 = "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q";
           name = "ycmd";
         };
@@ -26237,7 +26636,7 @@
           sha256 = "0yvz7lmid4jcikb9jmc7h2lcry3fdyy809k25nyasj2bk41xqqsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yesql-ghosts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yesql-ghosts";
           sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
           name = "yesql-ghosts";
         };
@@ -26258,7 +26657,7 @@
           sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/youdao-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/youdao-dictionary";
           sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
           name = "youdao-dictionary";
         };
@@ -26279,7 +26678,7 @@
           sha256 = "0bgq34k7p9qkxhrg7dvmkfpi1r47czyw12l0cm93z3m817z5hjrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zenburn-theme";
           sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
           name = "zenburn-theme";
         };
@@ -26300,7 +26699,7 @@
           sha256 = "1pxy6ia7di3i5kigybkz78f7fgbsyr1js9asrfbbx3kkpxpm2vfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zerodark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
           name = "zerodark-theme";
         };
@@ -26321,7 +26720,7 @@
           sha256 = "1ksjd3askc3k1l0b3nia5mzkxa74bidh2x0xlrj4qs4im5445vnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zombie-trellys-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zombie-trellys-mode";
           sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
           name = "zombie-trellys-mode";
         };
@@ -26342,7 +26741,7 @@
           sha256 = "1lrgirfvcvbir7csshkhhwj99jj1x5aprhw7xfiicv7nan9m6gjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zone-nyan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-nyan";
           sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
           name = "zone-nyan";
         };
@@ -26363,7 +26762,7 @@
           sha256 = "1dwf3980rnwc85s73j8accwgpcdhsa6fqdrppbrqb8f7c05q8303";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zoom-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zoom-window";
           sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
           name = "zoom-window";
         };
@@ -26384,7 +26783,7 @@
           sha256 = "0j6x3az8vpq2ggafjxdl8x3ln7lhh58c27z72mwywp4a2ca1g496";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zop-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zop-to-char";
           sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
           name = "zop-to-char";
         };
@@ -26405,7 +26804,7 @@
           sha256 = "0qwdbzfi8mddmchdd9ab9ms1ynlc8dx08i6g2mf3za1sbcivdqsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zotelo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zotelo";
           sha256 = "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z";
           name = "zotelo";
         };
@@ -26426,7 +26825,7 @@
           sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zygospore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zygospore";
           sha256 = "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z";
           name = "zygospore";
         };
@@ -26439,15 +26838,15 @@
     zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zzz-to-char";
-        version = "0.1.0";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "zzz-to-char";
-          rev = "82dc3382e58091ae32160a91e8c781b813faf856";
-          sha256 = "1hif9jrp4w7xvca0a4qm29scpkwhf5n61c4i5x8n5p7gbwjhh98q";
+          rev = "efbe99c9163602f23408abaea70ffe292632bf26";
+          sha256 = "0y0hhar3krkvbpb5y9k197mb0wfpz8cl6fmxazq8msjml7hkk339";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zzz-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zzz-to-char";
           sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
           name = "zzz-to-char";
         };
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index acc3a75cca101..7d02bd480ddcf 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -148,14 +148,14 @@ in
 
   android-studio = buildAndroidStudio rec {
     name = "android-studio-${version}";
-    version = "1.5.0.4";
-    build = "141.2422023";
+    version = "1.5.1.0";
+    build = "141.2456560";
     description = "Android development environment based on IntelliJ IDEA";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
             "/android-studio-ide-${build}-linux.zip";
-      sha256 = "1sjxs9cq7mdalxmzp6v2gwbg1w8p43c2cp5j4v212w66h5rqv11z";
+      sha256 = "0p6h21jd0xx3xzdrfv9530n1ssyc3xigr3fg33r8ain4k6n02vj6";
     };
   };
 
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index 72ecbbc59839c..9b87f13d623d6 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
+{ stdenv, fetchurl, buildEnv, zlib, glib, alsaLib, makeDesktopItem
 , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
-, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, libudev
+, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, libudev, libnotify
 }:
 
 let
@@ -8,51 +8,58 @@ let
       stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss
       fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
       xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
-      xorg.libXcomposite xorg.libXi xorg.libXfixes
-];
+      xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr
+      xorg.libXcursor
+  ];
+  desktopItem = makeDesktopItem {
+    name = "LightTable";
+    exec = "light";
+    comment = "LightTable";
+    desktopName = "LightTable";
+    genericName = "the next generation code editor";
+  };
 in
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation rec {
   name = "lighttable-${version}";
-  version = "0.7.2";
+  version = "0.8.1";
 
-  src = 
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        name = "LightTableLinux.tar.gz";
-        url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux.tar.gz";
-        sha256 = "1q5m50r319xn9drfv3cyfja87b7dfhni9d9gmz9733idq3l5fl9i";
-      }
-    else
+  src =
       fetchurl {
         name = "LightTableLinux64.tar.gz";
-        url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux64.tar.gz";
-        sha256 = "1jnn103v5qrplkb5ik9p8whfqclcq2r1qv666hp3jaiwb46vhf3c";
+        url = "https://github.com/LightTable/LightTable/releases/download/${version}/${name}-linux.tar.gz";
+        sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv";
       };
 
-  buildInputs = [ makeWrapper ];
   phases = [ "installPhase" ];
 
   installPhase = ''
-    tar xvf ${src}
-    mkdir -p $out/bin
-    mv LightTable $out/
+    tar xf ${src}
+    mkdir -p $out/{bin,share/LightTable}
+    mv ./${name}-linux/* $out/share/LightTable
 
     patchelf \
       --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
-      $out/LightTable/ltbin
+      --set-rpath ${libPath}:${libPath}/lib64:$out/share/LightTable \
+      $out/share/LightTable/LightTable
+
+    mv $out/share/LightTable/light $out/bin/light
 
-    ln -sf ${libudev.out}/lib/libudev.so.1 $out/LightTable/libudev.so.0
+    ln -sf ${libudev.out}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0
+    substituteInPlace $out/bin/light \
+        --replace "/usr/lib/x86_64-linux-gnu" "${libudev.out}/lib" \
+        --replace "/lib/x86_64-linux-gnu" "$out/share/LightTable" \
+        --replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable"
 
-    makeWrapper $out/LightTable/ltbin $out/bin/lighttable \
-      --prefix "LD_LIBRARY_PATH" : $out/LightTable
+    mkdir -p "$out"/share/applications
+    cp "${desktopItem}/share/applications/LightTable.desktop" "$out"/share/applications/
   '';
 
   meta = with stdenv.lib; {
     description = "the next generation code editor";
     homepage = http://www.lighttable.com/;
     license = licenses.gpl3;
+    maintainers = [ maintainers.matejc ];
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index 5a1d10a1468cb..507dc611fd4fc 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -6,7 +6,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 assert gksuSupport -> gksu != null;
 
 let
-  build = "3083";
+  build = "3103";
   libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango];
   redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
     ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
@@ -18,15 +18,15 @@ in let
     src =
       if stdenv.system == "i686-linux" then
         fetchurl {
-          name = "sublimetext-3.0.83.tar.bz2";
-          url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x32.tar.bz2";
-          sha256 = "0r9irk2gdwdx0dk7lgssr4krfvf3lf71pzaz5hyjc704zaxf5s49";
+          name = "sublimetext-${build}.tar.bz2";
+          url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2";
+          sha256 = "1qidnczndyhyp9rfzmpqah00lrx7z1a0fy7a13lzwqq3gslhwf1l";
         }
       else
         fetchurl {
-          name = "sublimetext-3.0.83.tar.bz2";
-          url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x64.tar.bz2";
-          sha256 = "1vhlrqz7xscmjnxpz60mdpvflanl26d7673ml7psd75n0zvcfra5";
+          name = "sublimetext-${build}.tar.bz2";
+          url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2";
+          sha256 = "1x8kb3prs6wa5s5rj0gfq96zx6k5q3s168yhfsa36x2szi6x6y4x";
         };
 
     dontStrip = true;
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index e2715b1499a55..2a80f5d42ad78 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -154,6 +154,7 @@ composableDerivation {
     multibyteSupport = config.vim.multibyte or false;
     cscopeSupport    = config.vim.cscope or true;
     netbeansSupport  = config.netbeans or true; # eg envim is using it
+    ximSupport       = config.vim.xim or false;
 
     # by default, compile with darwin support if we're compiling on darwin, but
     # allow this to be disabled by setting config.vim.darwin to false
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 1715e3785dacf..ef222d2e816fe 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -1,46 +1,35 @@
 { stdenv, fetchurl, libsoup, graphicsmagick, SDL, json_glib
 , GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
-, libgnome_keyring, gtk, ilmbase, intltool, lcms, lcms2
+, libgnome_keyring, gtk3, ilmbase, intltool, lcms, lcms2
 , lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
-, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
+, libpng, libpthreadstubs, librsvg, libtiff, libxcb
 , openexr, pixman, pkgconfig, sqlite, bash, libxslt, openjpeg
-, mesa }:
+, mesa, lua, pugixml, colord, colord-gtk, libxshmfence, libxkbcommon
+, epoxy, at_spi2_core, libwebp, libsecret, wrapGAppsHook, gnome3
+}:
 
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.6.9";
+  version = "2.0.0";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "0wri89ygjpv7npiz58mnydhgldywp6arqp9jq3v0g54a56fiwwhg";
+    sha256 = "1cbwvzqn3158cy7r499rdwipx7fpb30lrrvh6jy5a4xvpcjzbwnl";
   };
 
   buildInputs =
-    [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
+    [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk3
       ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
-      libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
+      libglade libgphoto2 libjpeg libpng libpthreadstubs
       librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt
-      libsoup graphicsmagick SDL json_glib openjpeg mesa
+      libsoup graphicsmagick SDL json_glib openjpeg mesa lua pugixml
+      colord colord-gtk libxshmfence libxkbcommon epoxy at_spi2_core
+      libwebp libsecret wrapGAppsHook gnome3.adwaita-icon-theme
     ];
 
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.dev}/include/gtk-2.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.out}/lib/gtk-2.0/include"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
-  '';
-
   cmakeFlags = [
-    "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc.dev}/include"
-    "-DPTHREAD_LIBRARY=${stdenv.glibc.out}/lib/libpthread.so"
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DBINARY_PACKAGE_BUILD=1"
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk.out}/lib/gtk-2.0/include"
     "-DBUILD_USERMANUAL=False"
   ];
 
diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix
index 9298c764d286f..5be5a8b161db4 100644
--- a/pkgs/applications/graphics/imv/default.nix
+++ b/pkgs/applications/graphics/imv/default.nix
@@ -1,19 +1,16 @@
-{ stdenv, fetchFromGitHub,
-  SDL2, freeimage
-}:
+{ stdenv, fetchgit, SDL2, SDL2_ttf, freeimage }:
 
 stdenv.mkDerivation rec {
   name = "imv-${version}";
-  version = "1.1.0";
+  version = "2.0.0";
 
-  src = fetchFromGitHub {
-    owner = "eXeC64";
-    repo  = "imv";
-    rev = "4d1a6d581b70b25d9533c5c788aab6900ebf82bb";
-    sha256 = "1c5r4pqqypir8ymicxyn2k7mhq8nl88b3x6giaafd77ssjn0vz9r";
+  src = fetchgit {
+    url = "https://github.com/eXeC64/imv.git";
+    rev = "bc90a0adcc5b22d2bf0158333eb6dfb34c402d48";
+    sha256 = "1bzx57d9mcxw9s72pdbdbwq9pns946jl6p2g881z43w68gimlpw7";
   };
 
-  buildInputs = [ SDL2 freeimage ];
+  buildInputs = [ SDL2 SDL2_ttf freeimage ];
 
   configurePhase = "substituteInPlace Makefile --replace /usr $out";
 
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 8f46e647252e0..e457ba29d975d 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -50,6 +50,9 @@ stdenv.mkDerivation {
     mkdir -p $out/etc/udev/rules.d/
     ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \
     cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
+    # the created 49-libsane references /bin/sh
+    substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \
+      --replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}"
 
     substituteInPlace $out/lib/libsane.la \
       --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg"
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 372c11b5bda5d..0dd4eab35f1eb 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -1,51 +1,67 @@
-{ stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3
+{ stdenv, fetchFromGitHub, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3
 , libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
-, imagemagick, intltool
+, imagemagick, intltool, autoreconfHook, which
 }:
 
 let
-  version = "1.0.1";
+  version = "1.0.2";
 
   ETL = stdenv.mkDerivation rec {
     name = "ETL-0.04.19";
 
-    src = fetchurl {
-       url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz";
-       sha256 = "1zmqv2fa5zxprza3wbhk5mxjk7491jqshxxai92s7fdiza0nhs91";
+    src = fetchFromGitHub {
+       repo   = "synfig";
+       owner  = "synfig";
+       rev    = version;
+       sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc";
     };
+
+    postUnpack = "sourceRoot=\${sourceRoot}/ETL/";
+
+    buildInputs = [ autoreconfHook ];
   };
 
   synfig = stdenv.mkDerivation rec {
     name = "synfig-${version}";
 
-    src = fetchurl {
-       url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz";
-       sha256 = "0l1f2xwmzds32g46fqwsq7j5qlnfps6944chbv14d3ynzgyyp1i3";
+    src = fetchFromGitHub {
+       repo   = "synfig";
+       owner  = "synfig";
+       rev    = version;
+       sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc";
     };
 
+    postUnpack = "sourceRoot=\${sourceRoot}/synfig-core/";
+
     configureFlags = [
       "--with-boost=${boost.dev}"
       "--with-boost-libdir=${boost.lib}/lib"
     ];
 
     buildInputs = [
-      ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libtool libxmlxx pango
-      pkgconfig
+      ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libxmlxx pango
+      pkgconfig autoreconfHook
     ];
   };
 in
 stdenv.mkDerivation rec {
   name = "synfigstudio-${version}";
 
-  src = fetchurl {
-    url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz";
-    sha256 = "0jfa946rfh0dbagp18zknlj9ffrd4h45xcy2dh2vlhn6jdm08yfi";
+  src = fetchFromGitHub {
+     repo   = "synfig";
+     owner  = "synfig";
+     rev    = version;
+     sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc";
   };
 
+  postUnpack = "sourceRoot=\${sourceRoot}/synfig-studio/";
+
+  preConfigure = "./bootstrap.sh";
+
   buildInputs = [
     ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool
-    libjack2 libsigcxx libtool libxmlxx makeWrapper mlt-qt5 pkgconfig
-    synfig
+    libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 pkgconfig
+    synfig autoreconfHook which
   ];
 
   postInstall = ''
diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix
index 6bb16a02402cf..d31e9234e0948 100644
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/pkgs/applications/misc/adobe-reader/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation {
   libPath = stdenv.lib.makeLibraryPath
     [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ];
 
+  passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";
+
   meta = {
     description = "Adobe Reader, a viewer for PDF documents";
     homepage = http://www.adobe.com/products/reader;
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 916173fa73bc0..03d203a9fa961 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.49.0";
+  version = "2.51.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0jc476pg07c0nwccprhwgjdlvvb2fdzza9xrjqzc0c42c5v7qzxa";
+    sha256 = "1rhpcxic4g2zyr5s3xn8dayyb45l9r8zyniaig8j7pl5kmsfjijn";
   };
 
   inherit python;
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
new file mode 100644
index 0000000000000..e24c99216ea20
--- /dev/null
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, fftw, ncurses, libpulseaudio }:
+
+stdenv.mkDerivation rec {
+  version = "2016-06-02";
+  name = "cli-visualizer-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/dpayne/cli-visualizer.git";
+    rev = "bc0104eb57e7a0b3821510bc8f93cf5d1154fa8e";
+    sha256 = "7b0c69a16b4854149522e2d0ec544412fb368cecba771d1e9481330ed86c8cb7";
+  };
+
+  buildInputs = [ fftw ncurses libpulseaudio ];
+
+  buildFlags = [ "ENABLE_PULSE=1" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp build/vis $out/bin/vis
+  '';
+
+  meta = {
+    homepage = "https://github.com/dpayne/cli-visualizer";
+    description = "CLI based audio visualizer";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix
index 7301ea704e858..6b22f3b27ee8c 100644
--- a/pkgs/applications/misc/ctodo/default.nix
+++ b/pkgs/applications/misc/ctodo/default.nix
@@ -1,14 +1,14 @@
 { stdenv, cmake, fetchurl, ncurses }:
 
 let
-  version = "1.1";
+  version = "1.2";
 in
 stdenv.mkDerivation {
   name = "ctodo-${version}";
 
   src = fetchurl {
-    url = "https://github.com/Acolarh/ctodo/archive/v1.1.tar.gz";
-    sha256 = "1sv5p1b08pp73qshakz4qy4pjglxz2pvx2cjfx52i3532hd3xcaf";
+    url = "https://github.com/Acolarh/ctodo/archive/v${version}.tar.gz";
+    sha256 = "0kjd84q8aw238z09yz9n1p732fh08vijaf8bk1xqlx544cgyfcjm";
   };
 
   buildInputs = [ stdenv cmake ncurses ];
diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index ac1852cd893a1..b0879599833b6 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libX11, libXinerama, libXft, zlib}:
+{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
 
 stdenv.mkDerivation rec {
   name = "dmenu-4.6";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libX11 libXinerama zlib libXft ];
 
+  inherit patches;
+
   postPatch = ''
     sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run
   '';
diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix
new file mode 100644
index 0000000000000..d55e22c5a3b82
--- /dev/null
+++ b/pkgs/applications/misc/dmenu/wayland.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl #, libX11, libXinerama, enableXft, libXft, zlib
+, swc, wld, wayland, libxkbcommon, pixman, fontconfig
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "dmenu-wayland-${version}";
+  version = "git-2014-11-02";
+  rev = "6e08b77428cc3c406ed2e90d4cae6c41df76341e";
+
+  src = fetchurl {
+    url = "https://github.com/michaelforney/dmenu/archive/${rev}.tar.gz";
+    sha256 = "d0f73e442baf44a93a3b9d41a72e9cfa14f54af6049c90549f516722e3f88019";
+  };
+
+  buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ];
+
+  postPatch = ''
+    sed -ri -e 's!\<(dmenu|dmenu_path)\>!'"$out/bin"'/&!g' dmenu_run
+  '';
+
+  preConfigure = [
+    ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@$(echo "$nativeBuildInputs" | grep -o '[^ ]*-swc-[^ ]*')/share/swc@g" config.mk''
+  ];
+
+  meta = {
+      description = "a generic, highly customizable, and efficient menu for the X Window System";
+      homepage = http://tools.suckless.org/dmenu;
+      license = stdenv.lib.licenses.mit;
+      maintainers = with stdenv.lib.maintainers; [ ];
+      platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix
new file mode 100644
index 0000000000000..f046ecc9bf2d5
--- /dev/null
+++ b/pkgs/applications/misc/electrum-dash/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }:
+
+buildPythonPackage rec {
+  name = "electrum-dash-${version}";
+  version = "2.4.1";
+
+  src = fetchurl {
+    url = "https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz";
+    sha256 = "02k7m7fyn0cvlgmwxr2gag7rf2knllkch1ma58shysp7zx9jb000";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    dns
+    ecdsa
+    pbkdf2
+    protobuf
+    pyasn1
+    pyasn1-modules
+    pycrypto
+    pyqt4
+    qrcode
+    requests
+    slowaes
+    tlslite
+    x11_hash
+    mnemonic
+
+    # plugins
+    trezor
+  ];
+
+  preInstall = ''
+    mkdir -p $out/share
+    sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py
+    pyrcc4 icons.qrc -o gui/qt/icons_rc.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Electrum DASH";
+    homepage = https://github.com/dashpay/electrum-dash;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index df997ad6e0b58..632ae689f31fa 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -22,6 +22,14 @@ buildPythonPackage rec {
     requests
     slowaes
     tlslite
+
+    # plugins
+    trezor
+    keepkey
+    # TODO plugins
+    # matplotlib
+    # btchip
+    # amodem
   ];
 
   preInstall = ''
@@ -40,6 +48,6 @@ buildPythonPackage rec {
     '';
     homepage = https://electrum.org;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ehmry joachifm ];
+    maintainers = with maintainers; [ ehmry joachifm np ];
   };
 }
diff --git a/pkgs/applications/misc/gollum/Gemfile b/pkgs/applications/misc/gollum/Gemfile
new file mode 100644
index 0000000000000..525f54838b750
--- /dev/null
+++ b/pkgs/applications/misc/gollum/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'gollum'
diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
new file mode 100644
index 0000000000000..074a0c6fa43b0
--- /dev/null
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -0,0 +1,55 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    charlock_holmes (0.7.3)
+    diff-lcs (1.2.5)
+    github-markup (1.3.3)
+    gitlab-grit (2.7.3)
+      charlock_holmes (~> 0.6)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3)
+    gollum (4.0.1)
+      gollum-lib (~> 4.0, >= 4.0.1)
+      kramdown (~> 1.8.0)
+      mustache (>= 0.99.5, < 1.0.0)
+      sinatra (~> 1.4, >= 1.4.4)
+      useragent (~> 0.14.0)
+    gollum-grit_adapter (1.0.0)
+      gitlab-grit (~> 2.7, >= 2.7.1)
+    gollum-lib (4.1.0)
+      github-markup (~> 1.3.3)
+      gollum-grit_adapter (~> 1.0)
+      nokogiri (~> 1.6.4)
+      rouge (~> 1.9)
+      sanitize (~> 2.1.0)
+      stringex (~> 2.5.1)
+    kramdown (1.8.0)
+    mime-types (1.25.1)
+    mini_portile2 (2.0.0)
+    mustache (0.99.8)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    posix-spawn (0.3.11)
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
+    rouge (1.10.1)
+    sanitize (2.1.0)
+      nokogiri (>= 1.4.4)
+    sinatra (1.4.7)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    stringex (2.5.2)
+    tilt (2.0.2)
+    useragent (0.14.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gollum
+
+BUNDLED WITH
+   1.10.6
diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
new file mode 100644
index 0000000000000..1c58aec02332e
--- /dev/null
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, lib, bundlerEnv, ruby_2_2, icu, zlib }:
+
+bundlerEnv rec {
+  name = "gollum-${version}";
+  version = "4.0.1";
+
+  ruby = ruby_2_2;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
+    description = "A simple, Git-powered wiki";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jgillich ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
new file mode 100644
index 0000000000000..f0c71fa455cfb
--- /dev/null
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -0,0 +1,170 @@
+{
+  useragent = {
+    version = "0.14.0";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "124r3mgkw1zjymsqq9r25zh1vwjrjgiji5fm620z53lpmmryj22j";
+    };
+  };
+  tilt = {
+    version = "2.0.2";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lkd40xfdqkp333vdfhrfjmi2y7k2hjs4azawfb62mrkfp7ivj84";
+    };
+  };
+  stringex = {
+    version = "2.5.2";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "150adm7rfh6r9b5ra6vk75mswf9m3wwyslcf8f235a08m29fxa17";
+    };
+  };
+  sinatra = {
+    version = "1.4.7";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp";
+    };
+  };
+  sanitize = {
+    version = "2.1.0";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+    };
+  };
+  rouge = {
+    version = "1.10.1";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
+    };
+  };
+  rack-protection = {
+    version = "1.5.3";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
+    };
+  };
+  rack = {
+    version = "1.6.4";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
+    };
+  };
+  posix-spawn = {
+    version = "0.3.11";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr";
+    };
+  };
+  nokogiri = {
+    version = "1.6.7.2";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv";
+    };
+  };
+  mustache = {
+    version = "0.99.8";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2";
+    };
+  };
+  mini_portile2 = {
+    version = "2.0.0";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l";
+    };
+  };
+  mime-types = {
+    version = "1.25.1";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
+    };
+  };
+  kramdown = {
+    version = "1.8.0";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ryqq055h5n10c1cfba6pxsssa907l2hkw29anp0d41ryh47ca2l";
+    };
+  };
+  gollum-lib = {
+    version = "4.1.0";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "01s8pgzhc3cgcmsy6hh79wrcbn5vbadniq2a7d4qw87kpq7mzfdm";
+    };
+  };
+  gollum-grit_adapter = {
+    version = "1.0.0";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7";
+    };
+  };
+  gollum = {
+    version = "4.0.1";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "02pgx083sns75zgnqx94p5h5bpr7cfiw5mys4ayb4k33hcjm6ydg";
+    };
+  };
+  gitlab-grit = {
+    version = "2.7.3";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b";
+    };
+  };
+  github-markup = {
+    version = "1.3.3";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq";
+    };
+  };
+  diff-lcs = {
+    version = "1.2.5";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
+    };
+  };
+  charlock_holmes = {
+    version = "0.7.3";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index bf2fd97f26ee1..e2290ac01e852 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, readline, ncurses }:
 
 let
-  version = "1.17";
+  version = "1.19";
 in
 stdenv.mkDerivation rec {
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";
-    sha256 = "0vjc4d8cl3sfbv9lywdpd2slffqyp3cpj52yp29g9lr2n3nfksk8";
+    sha256 = "0ix6550l9si29j8vz375vzjmp22i19ik5dq2nh7zsj2ra7ibaz5n";
   };
 
   buildInputs = [ readline ncurses ];
diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 6914120f2967d..8f16283d39119 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -8,19 +8,17 @@
 # plugin derivations in the Nix store and nowhere else.
 with builtins; buildDotnetPackage rec {
   baseName = "keepass";
-  version = "2.30";
+  version = "2.31";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
-    sha256 = "1r792cikgvzj4hrxiv7xd3gx2zmn16dbh4inj2zi6ny0gchkqg2a";
+    sha256 = "10bqxpq30gzfq2ip6dkmqlzzsh3bnfdb01jry5xhgxvlycq1lnsm";
   };
 
   sourceRoot = ".";
 
   buildInputs = [ unzip makeWrapper ];
 
-  patches = [ ./keepass.patch ];
-
   pluginLoadPathsPatch =
     let outputLc = toString (add 8 (length plugins));
         patchTemplate = readFile ./keepass-plugins.patch;
@@ -34,10 +32,21 @@ with builtins; buildDotnetPackage rec {
 
   passAsFile = [ "pluginLoadPathsPatch" ];
   postPatch = ''
-    patch --binary -p1 <$pluginLoadPathsPatchPath
+    sed -i 's/\r*$//' KeePass/Forms/MainForm.cs
+    patch -p1 <$pluginLoadPathsPatchPath
   '';
 
-  preConfigure = "rm -rvf Build/*";
+  preConfigure = ''
+    rm -rvf Build/*
+    find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
+    find . -name "*.csproj" -print -exec sed -i '
+      s#ToolsVersion="3.5"#ToolsVersion="4.0"#g
+      s#<TargetFrameworkVersion>.*</TargetFrameworkVersion>##g
+      s#<PropertyGroup>#<PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>#g
+      s#<SignAssembly>.*$#<SignAssembly>false</SignAssembly>#g
+      s#<PostBuildEvent>.*sgen.exe.*$##
+    ' {} \;
+  '';
 
   desktopItem = makeDesktopItem {
     name = "keepass";
diff --git a/pkgs/applications/misc/keepass/keepass.patch b/pkgs/applications/misc/keepass/keepass.patch
deleted file mode 100644
index 6ecf0bb074de7..0000000000000
--- a/pkgs/applications/misc/keepass/keepass.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Naur old/KeePass/KeePass.csproj new/KeePass/KeePass.csproj
---- old/KeePass/KeePass.csproj	2015-04-10 11:00:46.000000000 +0100
-+++ new/KeePass/KeePass.csproj	2015-05-27 16:35:52.196177593 +0100
-@@ -1,4 +1,4 @@
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">

-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">

-   <PropertyGroup>

-     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-@@ -10,7 +10,7 @@
-     <RootNamespace>KeePass</RootNamespace>

-     <AssemblyName>KeePass</AssemblyName>

-     <ApplicationIcon>KeePass.ico</ApplicationIcon>

--    <SignAssembly>true</SignAssembly>

-+    <SignAssembly>false</SignAssembly>

-     <AssemblyOriginatorKeyFile>KeePass.pfx</AssemblyOriginatorKeyFile>

-     <FileUpgradeFlags>

-     </FileUpgradeFlags>

-@@ -1316,6 +1316,5 @@
-   </Target>

-   -->

-   <PropertyGroup>

--    <PostBuildEvent>"$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_33430356D8D7D1B8 /compiler:/delaysign-</PostBuildEvent>

-   </PropertyGroup>

--</Project>
-\ No newline at end of file
-+</Project>

-diff -Naur old/KeePassLib/KeePassLib.csproj new/KeePassLib/KeePassLib.csproj
---- old/KeePassLib/KeePassLib.csproj	2014-05-08 15:00:24.000000000 +0100
-+++ new/KeePassLib/KeePassLib.csproj	2015-05-27 16:35:52.197177562 +0100
-@@ -1,4 +1,4 @@
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">

-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">

-   <PropertyGroup>

-     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-@@ -9,7 +9,7 @@
-     <AppDesignerFolder>Properties</AppDesignerFolder>

-     <RootNamespace>KeePassLib</RootNamespace>

-     <AssemblyName>KeePassLib</AssemblyName>

--    <SignAssembly>true</SignAssembly>

-+    <SignAssembly>false</SignAssembly>

-     <AssemblyOriginatorKeyFile>KeePassLib.pfx</AssemblyOriginatorKeyFile>

-     <FileUpgradeFlags>

-     </FileUpgradeFlags>

-diff -Naur old/KeePass.sln new/KeePass.sln
---- old/KeePass.sln	2009-08-31 19:47:28.000000000 +0100
-+++ new/KeePass.sln	2015-05-27 16:35:59.568953518 +0100
-@@ -1,11 +1,9 @@
--Microsoft Visual Studio Solution File, Format Version 10.00

-+Microsoft Visual Studio Solution File, Format Version 12.00

- # Visual Studio 2008

- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}"

- EndProject

- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePass", "KeePass\KeePass.csproj", "{10938016-DEE2-4A25-9A5A-8FD3444379CA}"

- EndProject

--Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLibSD", "KeePassLibSD\KeePassLibSD.csproj", "{DC15F71A-2117-4DEF-8C10-AA355B5E5979}"

--EndProject

- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrlUtil", "Translation\TrlUtil\TrlUtil.csproj", "{B7E890E7-BF50-4450-9A52-C105BD98651C}"

- EndProject

- Global

-@@ -44,18 +42,6 @@
- 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU

- 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Win32.ActiveCfg = Release|Any CPU

- 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|x64.ActiveCfg = Release|Any CPU

--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.Build.0 = Debug|Any CPU

--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU

--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Win32.ActiveCfg = Debug|Any CPU

--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|x64.ActiveCfg = Debug|Any CPU

--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.ActiveCfg = Release|Any CPU

--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.Build.0 = Release|Any CPU

--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU

--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.Build.0 = Release|Any CPU

--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Win32.ActiveCfg = Release|Any CPU

--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|x64.ActiveCfg = Release|Any CPU

- 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

- 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.Build.0 = Debug|Any CPU

- 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

-diff -Naur old/Translation/TrlUtil/TrlUtil.csproj new/Translation/TrlUtil/TrlUtil.csproj
---- old/Translation/TrlUtil/TrlUtil.csproj	2013-07-21 10:06:38.000000000 +0100
-+++ new/Translation/TrlUtil/TrlUtil.csproj	2015-05-27 16:35:52.197177562 +0100
-@@ -1,4 +1,4 @@
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">

-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">

-   <PropertyGroup>

-     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index aeccb874cb68c..b76d59c30e14c 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "keepassx2-${version}";
-  version = "2.0";
+  version = "2.0.2";
 
   src = fetchurl {
     url = "https://www.keepassx.org/releases/${version}/keepassx-${version}.tar.gz";
-    sha256 = "1ri2r1sldc62hbg74m4pmci0nrjwvv38rqhyzhyjin247an0zd0f";
+    sha256 = "1f1nlbd669rmpzr52d9dgfgclg4jcaq2jkrby3b8q1vjkksdqjr0";
   };
 
   buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ];
diff --git a/pkgs/applications/misc/keybase/default.nix b/pkgs/applications/misc/keybase/default.nix
index bead4e82571c3..e8cbce4cf8cee 100644
--- a/pkgs/applications/misc/keybase/default.nix
+++ b/pkgs/applications/misc/keybase/default.nix
@@ -11,11 +11,11 @@ let
 
 in nodePackages.buildNodePackage rec {
   name = "keybase-${version}";
-  version = "0.8.22";
+  version = "0.8.25";
 
   src = [(fetchurl {
     url = "https://github.com/keybase/node-client/archive/v${version}.tar.gz";
-    sha256 = "1dvwz2iqcybd687hp6zbw6lkpx27vp8ah6kk251147vxvwfjb422";
+    sha256 = "1zc357hwh26lsg8ngj7iwjdmywyzk6fz3wxmcqq1qyp2927i4jz3";
   })];
 
   deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
diff --git a/pkgs/applications/misc/keybase/package.nix b/pkgs/applications/misc/keybase/package.nix
index ee004a0ac6712..4a046ac06290e 100644
--- a/pkgs/applications/misc/keybase/package.nix
+++ b/pkgs/applications/misc/keybase/package.nix
@@ -41,16 +41,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ansi-regex"."^1.0.0" =
-    self.by-version."ansi-regex"."1.1.1";
-  by-version."ansi-regex"."1.1.1" = self.buildNodePackage {
-    name = "ansi-regex-1.1.1";
-    version = "1.1.1";
+  by-spec."ansi-regex"."^2.0.0" =
+    self.by-version."ansi-regex"."2.0.0";
+  by-version."ansi-regex"."2.0.0" = self.buildNodePackage {
+    name = "ansi-regex-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz";
-      name = "ansi-regex-1.1.1.tgz";
-      sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d";
+      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
+      name = "ansi-regex-2.0.0.tgz";
+      sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
     };
     deps = {
     };
@@ -60,18 +60,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ansi-regex"."^1.1.0" =
-    self.by-version."ansi-regex"."1.1.1";
-  by-spec."ansi-styles"."^2.0.1" =
-    self.by-version."ansi-styles"."2.0.1";
-  by-version."ansi-styles"."2.0.1" = self.buildNodePackage {
-    name = "ansi-styles-2.0.1";
-    version = "2.0.1";
+  by-spec."ansi-styles"."^2.1.0" =
+    self.by-version."ansi-styles"."2.1.0";
+  by-version."ansi-styles"."2.1.0" = self.buildNodePackage {
+    name = "ansi-styles-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz";
-      name = "ansi-styles-2.0.1.tgz";
-      sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3";
+      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz";
+      name = "ansi-styles-2.1.0.tgz";
+      sha1 = "990f747146927b559a932bf92959163d60c0d0e2";
     };
     deps = {
     };
@@ -103,16 +101,16 @@
     cpu = [ ];
   };
   "argparse" = self.by-version."argparse"."0.1.15";
-  by-spec."asn1"."0.1.11" =
-    self.by-version."asn1"."0.1.11";
-  by-version."asn1"."0.1.11" = self.buildNodePackage {
-    name = "asn1-0.1.11";
-    version = "0.1.11";
+  by-spec."asn1".">=0.2.3 <0.3.0" =
+    self.by-version."asn1"."0.2.3";
+  by-version."asn1"."0.2.3" = self.buildNodePackage {
+    name = "asn1-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
-      name = "asn1-0.1.11.tgz";
-      sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+      url = "http://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
+      name = "asn1-0.2.3.tgz";
+      sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
     };
     deps = {
     };
@@ -122,16 +120,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."assert-plus"."^0.1.5" =
-    self.by-version."assert-plus"."0.1.5";
-  by-version."assert-plus"."0.1.5" = self.buildNodePackage {
-    name = "assert-plus-0.1.5";
-    version = "0.1.5";
+  by-spec."assert-plus".">=0.2.0 <0.3.0" =
+    self.by-version."assert-plus"."0.2.0";
+  by-version."assert-plus"."0.2.0" = self.buildNodePackage {
+    name = "assert-plus-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
-      name = "assert-plus-0.1.5.tgz";
-      sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+      name = "assert-plus-0.2.0.tgz";
+      sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
     };
     deps = {
     };
@@ -141,6 +139,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."assert-plus"."^0.2.0" =
+    self.by-version."assert-plus"."0.2.0";
   by-spec."async"."0.2.x" =
     self.by-version."async"."0.2.10";
   by-version."async"."0.2.10" = self.buildNodePackage {
@@ -160,16 +160,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."async"."~0.9.0" =
-    self.by-version."async"."0.9.0";
-  by-version."async"."0.9.0" = self.buildNodePackage {
-    name = "async-0.9.0";
-    version = "0.9.0";
+  by-spec."async"."^1.4.0" =
+    self.by-version."async"."1.5.2";
+  by-version."async"."1.5.2" = self.buildNodePackage {
+    name = "async-1.5.2";
+    version = "1.5.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
-      name = "async-0.9.0.tgz";
-      sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7";
+      url = "http://registry.npmjs.org/async/-/async-1.5.2.tgz";
+      name = "async-1.5.2.tgz";
+      sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
     };
     deps = {
     };
@@ -179,18 +179,38 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."aws-sign2"."~0.5.0" =
-    self.by-version."aws-sign2"."0.5.0";
-  by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
-    name = "aws-sign2-0.5.0";
-    version = "0.5.0";
+  by-spec."aws-sign2"."~0.6.0" =
+    self.by-version."aws-sign2"."0.6.0";
+  by-version."aws-sign2"."0.6.0" = self.buildNodePackage {
+    name = "aws-sign2-0.6.0";
+    version = "0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
+      name = "aws-sign2-0.6.0.tgz";
+      sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."aws4"."^1.2.1" =
+    self.by-version."aws4"."1.2.1";
+  by-version."aws4"."1.2.1" = self.buildNodePackage {
+    name = "aws4-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
-      name = "aws-sign2-0.5.0.tgz";
-      sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+      url = "http://registry.npmjs.org/aws4/-/aws4-1.2.1.tgz";
+      name = "aws4-1.2.1.tgz";
+      sha1 = "52b5659a4d32583d405f65e1124ac436d07fe5ac";
     };
     deps = {
+      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
     };
     optionalDependencies = {
     };
@@ -210,7 +230,7 @@
       sha1 = "3f14123363badf4bed1acc8ed839ee99b27ad7e0";
     };
     deps = {
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "semver-4.3.6" = self.by-version."semver"."4.3.6";
     };
     optionalDependencies = {
     };
@@ -219,16 +239,16 @@
     cpu = [ ];
   };
   "badnode" = self.by-version."badnode"."1.0.1";
-  by-spec."balanced-match"."^0.2.0" =
-    self.by-version."balanced-match"."0.2.0";
-  by-version."balanced-match"."0.2.0" = self.buildNodePackage {
-    name = "balanced-match-0.2.0";
-    version = "0.2.0";
+  by-spec."balanced-match"."^0.3.0" =
+    self.by-version."balanced-match"."0.3.0";
+  by-version."balanced-match"."0.3.0" = self.buildNodePackage {
+    name = "balanced-match-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz";
-      name = "balanced-match-0.2.0.tgz";
-      sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674";
+      url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz";
+      name = "balanced-match-0.3.0.tgz";
+      sha1 = "a91cdd1ebef1a86659e70ff4def01625fc2d6756";
     };
     deps = {
     };
@@ -251,8 +271,8 @@
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "kbpgp-2.0.9" = self.by-version."kbpgp"."2.0.9";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "kbpgp-2.0.50" = self.by-version."kbpgp"."2.0.50";
       "pgp-utils-0.0.27" = self.by-version."pgp-utils"."0.0.27";
     };
     optionalDependencies = {
@@ -262,38 +282,19 @@
     cpu = [ ];
   };
   "bitcoyne" = self.by-version."bitcoyne"."1.0.1";
-  by-spec."bl"."~0.9.0" =
-    self.by-version."bl"."0.9.4";
-  by-version."bl"."0.9.4" = self.buildNodePackage {
-    name = "bl-0.9.4";
-    version = "0.9.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz";
-      name = "bl-0.9.4.tgz";
-      sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7";
-    };
-    deps = {
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bluebird"."^2.9.21" =
-    self.by-version."bluebird"."2.9.24";
-  by-version."bluebird"."2.9.24" = self.buildNodePackage {
-    name = "bluebird-2.9.24";
-    version = "2.9.24";
+  by-spec."bl"."~1.0.0" =
+    self.by-version."bl"."1.0.2";
+  by-version."bl"."1.0.2" = self.buildNodePackage {
+    name = "bl-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.24.tgz";
-      name = "bluebird-2.9.24.tgz";
-      sha1 = "14a2e75f0548323dc35aa440d92007ca154e967c";
+      url = "http://registry.npmjs.org/bl/-/bl-1.0.2.tgz";
+      name = "bl-1.0.2.tgz";
+      sha1 = "8c66490d825ba84d560de1f62196a29555b3a0c4";
     };
     deps = {
+      "readable-stream-2.0.5" = self.by-version."readable-stream"."2.0.5";
     };
     optionalDependencies = {
     };
@@ -324,18 +325,18 @@
     self.by-version."bn"."1.0.1";
   "bn" = self.by-version."bn"."1.0.1";
   by-spec."boom"."2.x.x" =
-    self.by-version."boom"."2.7.1";
-  by-version."boom"."2.7.1" = self.buildNodePackage {
-    name = "boom-2.7.1";
-    version = "2.7.1";
+    self.by-version."boom"."2.10.1";
+  by-version."boom"."2.10.1" = self.buildNodePackage {
+    name = "boom-2.10.1";
+    version = "2.10.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/boom/-/boom-2.7.1.tgz";
-      name = "boom-2.7.1.tgz";
-      sha1 = "fb165c348d337977c61d4363c21e9e1abf526705";
+      url = "http://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+      name = "boom-2.10.1.tgz";
+      sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
     };
     deps = {
-      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
     };
     optionalDependencies = {
     };
@@ -344,18 +345,18 @@
     cpu = [ ];
   };
   by-spec."brace-expansion"."^1.0.0" =
-    self.by-version."brace-expansion"."1.1.0";
-  by-version."brace-expansion"."1.1.0" = self.buildNodePackage {
-    name = "brace-expansion-1.1.0";
-    version = "1.1.0";
+    self.by-version."brace-expansion"."1.1.2";
+  by-version."brace-expansion"."1.1.2" = self.buildNodePackage {
+    name = "brace-expansion-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz";
-      name = "brace-expansion-1.1.0.tgz";
-      sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9";
+      url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz";
+      name = "brace-expansion-1.1.2.tgz";
+      sha1 = "f21445d0488b658e2771efd870eff51df29f04ef";
     };
     deps = {
-      "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0";
+      "balanced-match-0.3.0" = self.by-version."balanced-match"."0.3.0";
       "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1";
     };
     optionalDependencies = {
@@ -364,16 +365,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."caseless"."~0.9.0" =
-    self.by-version."caseless"."0.9.0";
-  by-version."caseless"."0.9.0" = self.buildNodePackage {
-    name = "caseless-0.9.0";
-    version = "0.9.0";
+  by-spec."bzip-deflate"."^1.0.0" =
+    self.by-version."bzip-deflate"."1.0.0";
+  by-version."bzip-deflate"."1.0.0" = self.buildNodePackage {
+    name = "bzip-deflate-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz";
-      name = "caseless-0.9.0.tgz";
-      sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88";
+      url = "http://registry.npmjs.org/bzip-deflate/-/bzip-deflate-1.0.0.tgz";
+      name = "bzip-deflate-1.0.0.tgz";
+      sha1 = "b02db007ef37bebcc29384a4b2c6f4f0f4c796c9";
     };
     deps = {
     };
@@ -383,23 +384,42 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chalk"."^1.0.0" =
-    self.by-version."chalk"."1.0.0";
-  by-version."chalk"."1.0.0" = self.buildNodePackage {
-    name = "chalk-1.0.0";
-    version = "1.0.0";
+  by-spec."caseless"."~0.11.0" =
+    self.by-version."caseless"."0.11.0";
+  by-version."caseless"."0.11.0" = self.buildNodePackage {
+    name = "caseless-0.11.0";
+    version = "0.11.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
-      name = "chalk-1.0.0.tgz";
-      sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc";
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
+      name = "caseless-0.11.0.tgz";
+      sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
     };
     deps = {
-      "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1";
-      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
-      "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3";
-      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
-      "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."chalk"."^1.1.1" =
+    self.by-version."chalk"."1.1.1";
+  by-version."chalk"."1.1.1" = self.buildNodePackage {
+    name = "chalk-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz";
+      name = "chalk-1.1.1.tgz";
+      sha1 = "509afb67066e7499f7eb3535c77445772ae2d019";
+    };
+    deps = {
+      "ansi-styles-2.1.0" = self.by-version."ansi-styles"."2.1.0";
+      "escape-string-regexp-1.0.4" = self.by-version."escape-string-regexp"."1.0.4";
+      "has-ansi-2.0.0" = self.by-version."has-ansi"."2.0.0";
+      "strip-ansi-3.0.0" = self.by-version."strip-ansi"."3.0.0";
+      "supports-color-2.0.0" = self.by-version."supports-color"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -443,7 +463,7 @@
       sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61";
     };
     deps = {
-      "glob-5.0.5" = self.by-version."glob"."5.0.5";
+      "glob-6.0.4" = self.by-version."glob"."6.0.4";
     };
     optionalDependencies = {
     };
@@ -488,7 +508,7 @@
       "argparse-0.1.15" = self.by-version."argparse"."0.1.15";
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-logger-0.0.6" = self.by-version."iced-logger"."0.0.6";
-      "glob-to-regexp-0.0.2" = self.by-version."glob-to-regexp"."0.0.2";
+      "glob-to-regexp-0.1.0" = self.by-version."glob-to-regexp"."0.1.0";
       "tablify-0.1.5" = self.by-version."tablify"."0.1.5";
     };
     optionalDependencies = {
@@ -521,15 +541,15 @@
   by-spec."colors"."0.6.x" =
     self.by-version."colors"."0.6.2";
   by-spec."colors".">=0.6.2" =
-    self.by-version."colors"."1.0.3";
-  by-version."colors"."1.0.3" = self.buildNodePackage {
-    name = "colors-1.0.3";
-    version = "1.0.3";
+    self.by-version."colors"."1.1.2";
+  by-version."colors"."1.1.2" = self.buildNodePackage {
+    name = "colors-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
-      name = "colors-1.0.3.tgz";
-      sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
+      url = "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
+      name = "colors-1.1.2.tgz";
+      sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
     };
     deps = {
     };
@@ -543,19 +563,16 @@
     self.by-version."colors"."0.6.2";
   by-spec."colors"."~1.0.3" =
     self.by-version."colors"."1.0.3";
-  by-spec."combined-stream"."~0.0.4" =
-    self.by-version."combined-stream"."0.0.7";
-  by-version."combined-stream"."0.0.7" = self.buildNodePackage {
-    name = "combined-stream-0.0.7";
-    version = "0.0.7";
+  by-version."colors"."1.0.3" = self.buildNodePackage {
+    name = "colors-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
-      name = "combined-stream-0.0.7.tgz";
-      sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
+      url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
+      name = "colors-1.0.3.tgz";
+      sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
     };
     deps = {
-      "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
     };
     optionalDependencies = {
     };
@@ -563,21 +580,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."combined-stream"."~0.0.5" =
-    self.by-version."combined-stream"."0.0.7";
-  by-spec."commander".">= 0.5.2" =
-    self.by-version."commander"."2.8.1";
-  by-version."commander"."2.8.1" = self.buildNodePackage {
-    name = "commander-2.8.1";
-    version = "2.8.1";
+  by-spec."combined-stream"."^1.0.5" =
+    self.by-version."combined-stream"."1.0.5";
+  by-version."combined-stream"."1.0.5" = self.buildNodePackage {
+    name = "combined-stream-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
-      name = "commander-2.8.1.tgz";
-      sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
+      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
+      name = "combined-stream-1.0.5.tgz";
+      sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
     };
     deps = {
-      "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
+      "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -585,20 +600,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."commander"."^2.7.1" =
-    self.by-version."commander"."2.8.1";
-  by-spec."commander"."~2.1.0" =
-    self.by-version."commander"."2.1.0";
-  by-version."commander"."2.1.0" = self.buildNodePackage {
-    name = "commander-2.1.0";
-    version = "2.1.0";
+  by-spec."combined-stream"."~1.0.5" =
+    self.by-version."combined-stream"."1.0.5";
+  by-spec."commander".">= 0.5.2" =
+    self.by-version."commander"."2.9.0";
+  by-version."commander"."2.9.0" = self.buildNodePackage {
+    name = "commander-2.9.0";
+    version = "2.9.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
-      name = "commander-2.1.0.tgz";
-      sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
+      url = "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
+      name = "commander-2.9.0.tgz";
+      sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
     };
     deps = {
+      "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -606,6 +622,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."commander"."^2.9.0" =
+    self.by-version."commander"."2.9.0";
   by-spec."concat-map"."0.0.1" =
     self.by-version."concat-map"."0.0.1";
   by-version."concat-map"."0.0.1" = self.buildNodePackage {
@@ -626,15 +644,15 @@
     cpu = [ ];
   };
   by-spec."core-util-is"."~1.0.0" =
-    self.by-version."core-util-is"."1.0.1";
-  by-version."core-util-is"."1.0.1" = self.buildNodePackage {
-    name = "core-util-is-1.0.1";
-    version = "1.0.1";
+    self.by-version."core-util-is"."1.0.2";
+  by-version."core-util-is"."1.0.2" = self.buildNodePackage {
+    name = "core-util-is-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
-      name = "core-util-is-1.0.1.tgz";
-      sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538";
+      url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+      name = "core-util-is-1.0.2.tgz";
+      sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
     };
     deps = {
     };
@@ -645,18 +663,18 @@
     cpu = [ ];
   };
   by-spec."cryptiles"."2.x.x" =
-    self.by-version."cryptiles"."2.0.4";
-  by-version."cryptiles"."2.0.4" = self.buildNodePackage {
-    name = "cryptiles-2.0.4";
-    version = "2.0.4";
+    self.by-version."cryptiles"."2.0.5";
+  by-version."cryptiles"."2.0.5" = self.buildNodePackage {
+    name = "cryptiles-2.0.5";
+    version = "2.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz";
-      name = "cryptiles-2.0.4.tgz";
-      sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285";
+      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+      name = "cryptiles-2.0.5.tgz";
+      sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
     };
     deps = {
-      "boom-2.7.1" = self.by-version."boom"."2.7.1";
+      "boom-2.10.1" = self.by-version."boom"."2.10.1";
     };
     optionalDependencies = {
     };
@@ -664,16 +682,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ctype"."0.5.3" =
-    self.by-version."ctype"."0.5.3";
-  by-version."ctype"."0.5.3" = self.buildNodePackage {
-    name = "ctype-0.5.3";
-    version = "0.5.3";
+  by-spec."cycle"."1.0.x" =
+    self.by-version."cycle"."1.0.3";
+  by-version."cycle"."1.0.3" = self.buildNodePackage {
+    name = "cycle-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
-      name = "ctype-0.5.3.tgz";
-      sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+      url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
+      name = "cycle-1.0.3.tgz";
+      sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
     };
     deps = {
     };
@@ -683,18 +701,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cycle"."1.0.x" =
-    self.by-version."cycle"."1.0.3";
-  by-version."cycle"."1.0.3" = self.buildNodePackage {
-    name = "cycle-1.0.3";
-    version = "1.0.3";
+  by-spec."dashdash".">=1.10.1 <2.0.0" =
+    self.by-version."dashdash"."1.12.2";
+  by-version."dashdash"."1.12.2" = self.buildNodePackage {
+    name = "dashdash-1.12.2";
+    version = "1.12.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
-      name = "cycle-1.0.3.tgz";
-      sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
+      url = "http://registry.npmjs.org/dashdash/-/dashdash-1.12.2.tgz";
+      name = "dashdash-1.12.2.tgz";
+      sha1 = "1c6f70588498d047b8cd5777b32ba85a5e25be36";
     };
     deps = {
+      "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
     };
     optionalDependencies = {
     };
@@ -723,15 +742,15 @@
   };
   "deep-equal" = self.by-version."deep-equal"."0.2.1";
   by-spec."deep-equal".">=0.2.1" =
-    self.by-version."deep-equal"."1.0.0";
-  by-version."deep-equal"."1.0.0" = self.buildNodePackage {
-    name = "deep-equal-1.0.0";
-    version = "1.0.0";
+    self.by-version."deep-equal"."1.0.1";
+  by-version."deep-equal"."1.0.1" = self.buildNodePackage {
+    name = "deep-equal-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz";
-      name = "deep-equal-1.0.0.tgz";
-      sha1 = "d4564f07d2f0ab3e46110bec16592abd7dc2e326";
+      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz";
+      name = "deep-equal-1.0.1.tgz";
+      sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
     };
     deps = {
     };
@@ -760,16 +779,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."delayed-stream"."0.0.5" =
-    self.by-version."delayed-stream"."0.0.5";
-  by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
-    name = "delayed-stream-0.0.5";
-    version = "0.0.5";
+  by-spec."delayed-stream"."~1.0.0" =
+    self.by-version."delayed-stream"."1.0.0";
+  by-version."delayed-stream"."1.0.0" = self.buildNodePackage {
+    name = "delayed-stream-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
-      name = "delayed-stream-0.0.5.tgz";
-      sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+      name = "delayed-stream-1.0.0.tgz";
+      sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
     };
     deps = {
     };
@@ -791,11 +810,11 @@
       sha1 = "c47b5823d79563d6fc3abd49f3de48986e5522ee";
     };
     deps = {
-      "commander-2.8.1" = self.by-version."commander"."2.8.1";
-      "marked-0.3.3" = self.by-version."marked"."0.3.3";
-      "fs-extra-0.18.2" = self.by-version."fs-extra"."0.18.2";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
+      "marked-0.3.5" = self.by-version."marked"."0.3.5";
+      "fs-extra-0.26.5" = self.by-version."fs-extra"."0.26.5";
       "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
-      "highlight.js-8.5.0" = self.by-version."highlight.js"."8.5.0";
+      "highlight.js-9.1.0" = self.by-version."highlight.js"."9.1.0";
     };
     optionalDependencies = {
     };
@@ -882,6 +901,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ecc-jsbn".">=0.0.1 <1.0.0" =
+    self.by-version."ecc-jsbn"."0.1.1";
+  by-version."ecc-jsbn"."0.1.1" = self.buildNodePackage {
+    name = "ecc-jsbn-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
+      name = "ecc-jsbn-0.1.1.tgz";
+      sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
+    };
+    deps = {
+      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."entities"."0.x" =
     self.by-version."entities"."0.5.0";
   by-version."entities"."0.5.0" = self.buildNodePackage {
@@ -902,15 +941,53 @@
     cpu = [ ];
   };
   by-spec."escape-string-regexp"."^1.0.2" =
-    self.by-version."escape-string-regexp"."1.0.3";
-  by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage {
-    name = "escape-string-regexp-1.0.3";
-    version = "1.0.3";
+    self.by-version."escape-string-regexp"."1.0.4";
+  by-version."escape-string-regexp"."1.0.4" = self.buildNodePackage {
+    name = "escape-string-regexp-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz";
+      name = "escape-string-regexp-1.0.4.tgz";
+      sha1 = "b85e679b46f72d03fbbe8a3bf7259d535c21b62f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."extend"."~3.0.0" =
+    self.by-version."extend"."3.0.0";
+  by-version."extend"."3.0.0" = self.buildNodePackage {
+    name = "extend-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz";
-      name = "escape-string-regexp-1.0.3.tgz";
-      sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5";
+      url = "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
+      name = "extend-3.0.0.tgz";
+      sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."extsprintf"."1.0.2" =
+    self.by-version."extsprintf"."1.0.2";
+  by-version."extsprintf"."1.0.2" = self.buildNodePackage {
+    name = "extsprintf-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
+      name = "extsprintf-1.0.2.tgz";
+      sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
     };
     deps = {
     };
@@ -941,7 +1018,7 @@
   };
   by-spec."eyes"."~0.1.8" =
     self.by-version."eyes"."0.1.8";
-  by-spec."forever-agent"."~0.6.0" =
+  by-spec."forever-agent"."~0.6.1" =
     self.by-version."forever-agent"."0.6.1";
   by-version."forever-agent"."0.6.1" = self.buildNodePackage {
     name = "forever-agent-0.6.1";
@@ -960,21 +1037,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."form-data"."~0.2.0" =
-    self.by-version."form-data"."0.2.0";
-  by-version."form-data"."0.2.0" = self.buildNodePackage {
-    name = "form-data-0.2.0";
-    version = "0.2.0";
+  by-spec."form-data"."~1.0.0-rc3" =
+    self.by-version."form-data"."1.0.0-rc3";
+  by-version."form-data"."1.0.0-rc3" = self.buildNodePackage {
+    name = "form-data-1.0.0-rc3";
+    version = "1.0.0-rc3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
-      name = "form-data-0.2.0.tgz";
-      sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466";
+      url = "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz";
+      name = "form-data-1.0.0-rc3.tgz";
+      sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "mime-types-2.1.9" = self.by-version."mime-types"."2.1.9";
     };
     optionalDependencies = {
     };
@@ -994,8 +1071,8 @@
       sha1 = "54bfc5fbdf0c7c1b7691f20ffb31ef955c185db2";
     };
     deps = {
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "purepack-1.0.1" = self.by-version."purepack"."1.0.1";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "purepack-1.0.4" = self.by-version."purepack"."1.0.4";
     };
     optionalDependencies = {
     };
@@ -1005,20 +1082,22 @@
   };
   "framed-msgpack-rpc" = self.by-version."framed-msgpack-rpc"."1.1.4";
   by-spec."fs-extra".">= 0.6.0" =
-    self.by-version."fs-extra"."0.18.2";
-  by-version."fs-extra"."0.18.2" = self.buildNodePackage {
-    name = "fs-extra-0.18.2";
-    version = "0.18.2";
+    self.by-version."fs-extra"."0.26.5";
+  by-version."fs-extra"."0.26.5" = self.buildNodePackage {
+    name = "fs-extra-0.26.5";
+    version = "0.26.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.18.2.tgz";
-      name = "fs-extra-0.18.2.tgz";
-      sha1 = "af05ca702b0b6dfa7de803a1f7ab479ec5c21525";
+      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.26.5.tgz";
+      name = "fs-extra-0.26.5.tgz";
+      sha1 = "53ac74667ca083fd2dc1712c813039ca32d69a7f";
     };
     deps = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "jsonfile-2.2.3" = self.by-version."jsonfile"."2.2.3";
+      "klaw-1.1.3" = self.by-version."klaw"."1.1.3";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+      "rimraf-2.5.1" = self.by-version."rimraf"."2.5.1";
     };
     optionalDependencies = {
     };
@@ -1046,15 +1125,15 @@
     cpu = [ ];
   };
   by-spec."generate-object-property"."^1.1.0" =
-    self.by-version."generate-object-property"."1.1.1";
-  by-version."generate-object-property"."1.1.1" = self.buildNodePackage {
-    name = "generate-object-property-1.1.1";
-    version = "1.1.1";
+    self.by-version."generate-object-property"."1.2.0";
+  by-version."generate-object-property"."1.2.0" = self.buildNodePackage {
+    name = "generate-object-property-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.tgz";
-      name = "generate-object-property-1.1.1.tgz";
-      sha1 = "8fda6b4cb69b34a189a6cebee7c4c268af47cc93";
+      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
+      name = "generate-object-property-1.2.0.tgz";
+      sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
     };
     deps = {
       "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
@@ -1065,41 +1144,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."get-stdin"."^4.0.1" =
-    self.by-version."get-stdin"."4.0.1";
-  by-version."get-stdin"."4.0.1" = self.buildNodePackage {
-    name = "get-stdin-4.0.1";
-    version = "4.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
-      name = "get-stdin-4.0.1.tgz";
-      sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."glob".">= 3.1.4" =
-    self.by-version."glob"."5.0.5";
-  by-version."glob"."5.0.5" = self.buildNodePackage {
-    name = "glob-5.0.5";
-    version = "5.0.5";
+    self.by-version."glob"."6.0.4";
+  by-version."glob"."6.0.4" = self.buildNodePackage {
+    name = "glob-6.0.4";
+    version = "6.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-5.0.5.tgz";
-      name = "glob-5.0.5.tgz";
-      sha1 = "784431e4e29a900ae0d47fba6aa1c7f16a8e7df7";
+      url = "http://registry.npmjs.org/glob/-/glob-6.0.4.tgz";
+      name = "glob-6.0.4.tgz";
+      sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22";
     };
     deps = {
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
       "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
     };
     optionalDependencies = {
@@ -1108,39 +1168,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."glob"."^4.4.2" =
-    self.by-version."glob"."4.5.3";
-  by-version."glob"."4.5.3" = self.buildNodePackage {
-    name = "glob-4.5.3";
-    version = "4.5.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
-      name = "glob-4.5.3.tgz";
-      sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
-    };
-    deps = {
-      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."glob"."^6.0.1" =
+    self.by-version."glob"."6.0.4";
   by-spec."glob-to-regexp".">=0.0.1" =
-    self.by-version."glob-to-regexp"."0.0.2";
-  by-version."glob-to-regexp"."0.0.2" = self.buildNodePackage {
-    name = "glob-to-regexp-0.0.2";
-    version = "0.0.2";
+    self.by-version."glob-to-regexp"."0.1.0";
+  by-version."glob-to-regexp"."0.1.0" = self.buildNodePackage {
+    name = "glob-to-regexp-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.0.2.tgz";
-      name = "glob-to-regexp-0.0.2.tgz";
-      sha1 = "82cb3c797594b47890f180f015c1773601374b91";
+      url = "http://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.1.0.tgz";
+      name = "glob-to-regexp-0.1.0.tgz";
+      sha1 = "e0369d426578fd456d47dc23b09de05c1da9ea5d";
     };
     deps = {
     };
@@ -1151,21 +1190,21 @@
     cpu = [ ];
   };
   by-spec."gpg-wrapper".">=1.0.0" =
-    self.by-version."gpg-wrapper"."1.0.4";
-  by-version."gpg-wrapper"."1.0.4" = self.buildNodePackage {
-    name = "gpg-wrapper-1.0.4";
-    version = "1.0.4";
+    self.by-version."gpg-wrapper"."1.0.5";
+  by-version."gpg-wrapper"."1.0.5" = self.buildNodePackage {
+    name = "gpg-wrapper-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gpg-wrapper/-/gpg-wrapper-1.0.4.tgz";
-      name = "gpg-wrapper-1.0.4.tgz";
-      sha1 = "0f26586bb9408e5c47201a45661bac1093e0d0ff";
+      url = "http://registry.npmjs.org/gpg-wrapper/-/gpg-wrapper-1.0.5.tgz";
+      name = "gpg-wrapper-1.0.5.tgz";
+      sha1 = "e3b9197c5e2dc7b0273cf59601430c18f17b3e51";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
       "iced-spawn-1.0.0" = self.by-version."iced-spawn"."1.0.0";
-      "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
+      "iced-utils-0.1.23" = self.by-version."iced-utils"."0.1.23";
       "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
       "spotty-1.0.0" = self.by-version."spotty"."1.0.0";
     };
@@ -1175,19 +1214,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."gpg-wrapper".">=1.0.4" =
-    self.by-version."gpg-wrapper"."1.0.4";
-  "gpg-wrapper" = self.by-version."gpg-wrapper"."1.0.4";
-  by-spec."graceful-fs"."^3.0.5" =
-    self.by-version."graceful-fs"."3.0.6";
-  by-version."graceful-fs"."3.0.6" = self.buildNodePackage {
-    name = "graceful-fs-3.0.6";
-    version = "3.0.6";
+  by-spec."gpg-wrapper".">=1.0.5" =
+    self.by-version."gpg-wrapper"."1.0.5";
+  "gpg-wrapper" = self.by-version."gpg-wrapper"."1.0.5";
+  by-spec."graceful-fs"."^4.1.2" =
+    self.by-version."graceful-fs"."4.1.3";
+  by-version."graceful-fs"."4.1.3" = self.buildNodePackage {
+    name = "graceful-fs-4.1.3";
+    version = "4.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz";
-      name = "graceful-fs-3.0.6.tgz";
-      sha1 = "dce3a18351cb94cdc82e688b2e3dd2842d1b09bb";
+      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz";
+      name = "graceful-fs-4.1.3.tgz";
+      sha1 = "92033ce11113c41e2628d61fdfa40bc10dc0155c";
     };
     deps = {
     };
@@ -1216,22 +1255,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."har-validator"."^1.4.0" =
-    self.by-version."har-validator"."1.6.1";
-  by-version."har-validator"."1.6.1" = self.buildNodePackage {
-    name = "har-validator-1.6.1";
-    version = "1.6.1";
+  by-spec."har-validator"."~2.0.6" =
+    self.by-version."har-validator"."2.0.6";
+  by-version."har-validator"."2.0.6" = self.buildNodePackage {
+    name = "har-validator-2.0.6";
+    version = "2.0.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/har-validator/-/har-validator-1.6.1.tgz";
-      name = "har-validator-1.6.1.tgz";
-      sha1 = "baef452cde645eff7d26562e8e749d7fd000b7fd";
+      url = "http://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
+      name = "har-validator-2.0.6.tgz";
+      sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
     };
     deps = {
-      "bluebird-2.9.24" = self.by-version."bluebird"."2.9.24";
-      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
-      "commander-2.8.1" = self.by-version."commander"."2.8.1";
-      "is-my-json-valid-2.10.1" = self.by-version."is-my-json-valid"."2.10.1";
+      "chalk-1.1.1" = self.by-version."chalk"."1.1.1";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
+      "is-my-json-valid-2.12.4" = self.by-version."is-my-json-valid"."2.12.4";
+      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -1239,20 +1278,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."has-ansi"."^1.0.3" =
-    self.by-version."has-ansi"."1.0.3";
-  by-version."has-ansi"."1.0.3" = self.buildNodePackage {
-    name = "has-ansi-1.0.3";
-    version = "1.0.3";
-    bin = true;
+  by-spec."has-ansi"."^2.0.0" =
+    self.by-version."has-ansi"."2.0.0";
+  by-version."has-ansi"."2.0.0" = self.buildNodePackage {
+    name = "has-ansi-2.0.0";
+    version = "2.0.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz";
-      name = "has-ansi-1.0.3.tgz";
-      sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538";
+      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+      name = "has-ansi-2.0.0.tgz";
+      sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
     };
     deps = {
-      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
-      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -1260,21 +1298,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."hawk"."~2.3.0" =
-    self.by-version."hawk"."2.3.1";
-  by-version."hawk"."2.3.1" = self.buildNodePackage {
-    name = "hawk-2.3.1";
-    version = "2.3.1";
+  by-spec."hawk"."~3.1.0" =
+    self.by-version."hawk"."3.1.3";
+  by-version."hawk"."3.1.3" = self.buildNodePackage {
+    name = "hawk-3.1.3";
+    version = "3.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz";
-      name = "hawk-2.3.1.tgz";
-      sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f";
+      url = "http://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+      name = "hawk-3.1.3.tgz";
+      sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
     };
     deps = {
-      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
-      "boom-2.7.1" = self.by-version."boom"."2.7.1";
-      "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4";
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
+      "boom-2.10.1" = self.by-version."boom"."2.10.1";
+      "cryptiles-2.0.5" = self.by-version."cryptiles"."2.0.5";
       "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
     };
     optionalDependencies = {
@@ -1284,15 +1322,15 @@
     cpu = [ ];
   };
   by-spec."highlight.js".">= 8.0.x" =
-    self.by-version."highlight.js"."8.5.0";
-  by-version."highlight.js"."8.5.0" = self.buildNodePackage {
-    name = "highlight.js-8.5.0";
-    version = "8.5.0";
+    self.by-version."highlight.js"."9.1.0";
+  by-version."highlight.js"."9.1.0" = self.buildNodePackage {
+    name = "highlight.js-9.1.0";
+    version = "9.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.5.0.tgz";
-      name = "highlight.js-8.5.0.tgz";
-      sha1 = "6473d5099edb9f82fa50286b9178c8583ad7d652";
+      url = "http://registry.npmjs.org/highlight.js/-/highlight.js-9.1.0.tgz";
+      name = "highlight.js-9.1.0.tgz";
+      sha1 = "eb94c125f52bbd25dc893551b45c37c5093f1c5c";
     };
     deps = {
     };
@@ -1303,15 +1341,15 @@
     cpu = [ ];
   };
   by-spec."hoek"."2.x.x" =
-    self.by-version."hoek"."2.12.0";
-  by-version."hoek"."2.12.0" = self.buildNodePackage {
-    name = "hoek-2.12.0";
-    version = "2.12.0";
+    self.by-version."hoek"."2.16.3";
+  by-version."hoek"."2.16.3" = self.buildNodePackage {
+    name = "hoek-2.16.3";
+    version = "2.16.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-2.12.0.tgz";
-      name = "hoek-2.12.0.tgz";
-      sha1 = "5d1196e0bf20c5cec957e8927101164effdaf1c9";
+      url = "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
+      name = "hoek-2.16.3.tgz";
+      sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
     };
     deps = {
     };
@@ -1344,21 +1382,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."http-signature"."~0.10.0" =
-    self.by-version."http-signature"."0.10.1";
-  by-version."http-signature"."0.10.1" = self.buildNodePackage {
-    name = "http-signature-0.10.1";
-    version = "0.10.1";
+  by-spec."http-signature"."~1.1.0" =
+    self.by-version."http-signature"."1.1.1";
+  by-version."http-signature"."1.1.1" = self.buildNodePackage {
+    name = "http-signature-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
-      name = "http-signature-0.10.1.tgz";
-      sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
+      name = "http-signature-1.1.1.tgz";
+      sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
     };
     deps = {
-      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
-      "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
-      "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
+      "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
+      "jsprim-1.2.2" = self.by-version."jsprim"."1.2.2";
+      "sshpk-1.7.3" = self.by-version."sshpk"."1.7.3";
     };
     optionalDependencies = {
     };
@@ -1379,7 +1417,7 @@
     };
     deps = {
       "docco-0.6.3" = self.by-version."docco"."0.6.3";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
     };
     optionalDependencies = {
@@ -1424,8 +1462,8 @@
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "iced-utils-0.1.23" = self.by-version."iced-utils"."0.1.23";
     };
     optionalDependencies = {
     };
@@ -1492,7 +1530,7 @@
       sha1 = "0914a61a4d3dec69db8f871ef40f95417fa38986";
     };
     deps = {
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -1545,15 +1583,15 @@
   by-spec."iced-logger"."~0.0.1" =
     self.by-version."iced-logger"."0.0.6";
   by-spec."iced-runtime".">=0.0.1" =
-    self.by-version."iced-runtime"."1.0.2";
-  by-version."iced-runtime"."1.0.2" = self.buildNodePackage {
-    name = "iced-runtime-1.0.2";
-    version = "1.0.2";
+    self.by-version."iced-runtime"."1.0.3";
+  by-version."iced-runtime"."1.0.3" = self.buildNodePackage {
+    name = "iced-runtime-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.2.tgz";
-      name = "iced-runtime-1.0.2.tgz";
-      sha1 = "a949a7cf49451175d3f6168d84997da27c4e6b70";
+      url = "http://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.3.tgz";
+      name = "iced-runtime-1.0.3.tgz";
+      sha1 = "2d4f4fb999ab7aa5430b193c77a7fce4118319ce";
     };
     deps = {
     };
@@ -1563,15 +1601,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "iced-runtime" = self.by-version."iced-runtime"."1.0.2";
   by-spec."iced-runtime".">=0.0.1 <2.0.0-0" =
-    self.by-version."iced-runtime"."1.0.2";
+    self.by-version."iced-runtime"."1.0.3";
+  by-spec."iced-runtime".">=1.0.3" =
+    self.by-version."iced-runtime"."1.0.3";
+  "iced-runtime" = self.by-version."iced-runtime"."1.0.3";
   by-spec."iced-runtime"."^1.0.0" =
-    self.by-version."iced-runtime"."1.0.2";
+    self.by-version."iced-runtime"."1.0.3";
   by-spec."iced-runtime"."^1.0.1" =
-    self.by-version."iced-runtime"."1.0.2";
+    self.by-version."iced-runtime"."1.0.3";
   by-spec."iced-runtime"."^1.0.2" =
-    self.by-version."iced-runtime"."1.0.2";
+    self.by-version."iced-runtime"."1.0.3";
   by-spec."iced-spawn".">=0.0.3" =
     self.by-version."iced-spawn"."1.0.0";
   by-version."iced-spawn"."1.0.0" = self.buildNodePackage {
@@ -1584,8 +1624,8 @@
       sha1 = "dab91968cb46f9c05baadd126a5abb53c5d7d1df";
     };
     deps = {
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
     };
     optionalDependencies = {
     };
@@ -1599,21 +1639,21 @@
     self.by-version."iced-spawn"."1.0.0";
   "iced-spawn" = self.by-version."iced-spawn"."1.0.0";
   by-spec."iced-test".">=0.0.16" =
-    self.by-version."iced-test"."0.0.21";
-  by-version."iced-test"."0.0.21" = self.buildNodePackage {
-    name = "iced-test-0.0.21";
-    version = "0.0.21";
+    self.by-version."iced-test"."0.0.22";
+  by-version."iced-test"."0.0.22" = self.buildNodePackage {
+    name = "iced-test-0.0.22";
+    version = "0.0.22";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/iced-test/-/iced-test-0.0.21.tgz";
-      name = "iced-test-0.0.21.tgz";
-      sha1 = "8e7c347aa744eb4dddd786fcd430913be8bd83c7";
+      url = "http://registry.npmjs.org/iced-test/-/iced-test-0.0.22.tgz";
+      name = "iced-test-0.0.22.tgz";
+      sha1 = "61e7149f443fe5c87ff402cbc2214a42d558af2b";
     };
     deps = {
-      "colors-1.0.3" = self.by-version."colors"."1.0.3";
-      "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+      "colors-1.1.2" = self.by-version."colors"."1.1.2";
+      "deep-equal-1.0.1" = self.by-version."deep-equal"."1.0.1";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -1621,21 +1661,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "iced-test" = self.by-version."iced-test"."0.0.21";
-  by-spec."iced-utils"."0.1.20" =
-    self.by-version."iced-utils"."0.1.20";
-  by-version."iced-utils"."0.1.20" = self.buildNodePackage {
-    name = "iced-utils-0.1.20";
-    version = "0.1.20";
+  "iced-test" = self.by-version."iced-test"."0.0.22";
+  by-spec."iced-utils"."0.1.22" =
+    self.by-version."iced-utils"."0.1.22";
+  by-version."iced-utils"."0.1.22" = self.buildNodePackage {
+    name = "iced-utils-0.1.22";
+    version = "0.1.22";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.20.tgz";
-      name = "iced-utils-0.1.20.tgz";
-      sha1 = "923cbc3c080511cb6cc8e3ccde6609548d2db3e8";
+      url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.22.tgz";
+      name = "iced-utils-0.1.22.tgz";
+      sha1 = "931925d9d39655a392fd337cefb2e111f503bb15";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -1643,21 +1683,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "iced-utils" = self.by-version."iced-utils"."0.1.20";
+  "iced-utils" = self.by-version."iced-utils"."0.1.22";
   by-spec."iced-utils".">=0.1.11" =
-    self.by-version."iced-utils"."0.1.22";
-  by-version."iced-utils"."0.1.22" = self.buildNodePackage {
-    name = "iced-utils-0.1.22";
-    version = "0.1.22";
+    self.by-version."iced-utils"."0.1.23";
+  by-version."iced-utils"."0.1.23" = self.buildNodePackage {
+    name = "iced-utils-0.1.23";
+    version = "0.1.23";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.22.tgz";
-      name = "iced-utils-0.1.22.tgz";
-      sha1 = "931925d9d39655a392fd337cefb2e111f503bb15";
+      url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.23.tgz";
+      name = "iced-utils-0.1.23.tgz";
+      sha1 = "2b999eb6e34d84e10f449bca1f47ca3b556ea197";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -1666,11 +1706,13 @@
     cpu = [ ];
   };
   by-spec."iced-utils".">=0.1.16" =
-    self.by-version."iced-utils"."0.1.22";
+    self.by-version."iced-utils"."0.1.23";
   by-spec."iced-utils".">=0.1.18" =
-    self.by-version."iced-utils"."0.1.22";
+    self.by-version."iced-utils"."0.1.23";
   by-spec."iced-utils".">=0.1.22" =
-    self.by-version."iced-utils"."0.1.22";
+    self.by-version."iced-utils"."0.1.23";
+  by-spec."iced-utils"."^0.1.22" =
+    self.by-version."iced-utils"."0.1.23";
   by-spec."inflight"."^1.0.4" =
     self.by-version."inflight"."1.0.4";
   by-version."inflight"."1.0.4" = self.buildNodePackage {
@@ -1683,7 +1725,7 @@
       sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a";
     };
     deps = {
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
     };
     optionalDependencies = {
@@ -1714,15 +1756,15 @@
   by-spec."inherits"."~2.0.1" =
     self.by-version."inherits"."2.0.1";
   by-spec."ipv6"."~3.1.1" =
-    self.by-version."ipv6"."3.1.1";
-  by-version."ipv6"."3.1.1" = self.buildNodePackage {
-    name = "ipv6-3.1.1";
-    version = "3.1.1";
+    self.by-version."ipv6"."3.1.3";
+  by-version."ipv6"."3.1.3" = self.buildNodePackage {
+    name = "ipv6-3.1.3";
+    version = "3.1.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ipv6/-/ipv6-3.1.1.tgz";
-      name = "ipv6-3.1.1.tgz";
-      sha1 = "46da0e260af36fd9beb41297c987b7c21a2d9e1c";
+      url = "http://registry.npmjs.org/ipv6/-/ipv6-3.1.3.tgz";
+      name = "ipv6-3.1.3.tgz";
+      sha1 = "4d9064f9c2dafa0dd10b8b7d76ffca4aad31b3b9";
     };
     deps = {
       "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5";
@@ -1735,22 +1777,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-my-json-valid"."^2.10.0" =
-    self.by-version."is-my-json-valid"."2.10.1";
-  by-version."is-my-json-valid"."2.10.1" = self.buildNodePackage {
-    name = "is-my-json-valid-2.10.1";
-    version = "2.10.1";
+  by-spec."is-my-json-valid"."^2.12.4" =
+    self.by-version."is-my-json-valid"."2.12.4";
+  by-version."is-my-json-valid"."2.12.4" = self.buildNodePackage {
+    name = "is-my-json-valid-2.12.4";
+    version = "2.12.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.10.1.tgz";
-      name = "is-my-json-valid-2.10.1.tgz";
-      sha1 = "bf20ca7e71116302f8660ac812659f71e22ea2d0";
+      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz";
+      name = "is-my-json-valid-2.12.4.tgz";
+      sha1 = "d4ed2bc1d7f88daf8d0f763b3e3e39a69bd37880";
     };
     deps = {
       "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
-      "generate-object-property-1.1.1" = self.by-version."generate-object-property"."1.1.1";
-      "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0";
+      "jsonpointer-2.0.0" = self.by-version."jsonpointer"."2.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -1777,6 +1819,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."is-typedarray"."~1.0.0" =
+    self.by-version."is-typedarray"."1.0.0";
+  by-version."is-typedarray"."1.0.0" = self.buildNodePackage {
+    name = "is-typedarray-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
+      name = "is-typedarray-1.0.0.tgz";
+      sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."isarray"."0.0.1" =
     self.by-version."isarray"."0.0.1";
   by-version."isarray"."0.0.1" = self.buildNodePackage {
@@ -1815,20 +1876,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."isstream"."~0.1.1" =
+  by-spec."isstream"."~0.1.2" =
     self.by-version."isstream"."0.1.2";
-  by-spec."json-stringify-safe"."~5.0.0" =
-    self.by-version."json-stringify-safe"."5.0.0";
-  by-version."json-stringify-safe"."5.0.0" = self.buildNodePackage {
-    name = "json-stringify-safe-5.0.0";
-    version = "5.0.0";
+  by-spec."jodid25519".">=1.0.0 <2.0.0" =
+    self.by-version."jodid25519"."1.0.2";
+  by-version."jodid25519"."1.0.2" = self.buildNodePackage {
+    name = "jodid25519-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
-      name = "json-stringify-safe-5.0.0.tgz";
-      sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e";
+      url = "http://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz";
+      name = "jodid25519-1.0.2.tgz";
+      sha1 = "06d4912255093419477d425633606e0e90782967";
     };
     deps = {
+      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
     };
     optionalDependencies = {
     };
@@ -1836,16 +1898,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jsonfile"."^2.0.0" =
-    self.by-version."jsonfile"."2.0.0";
-  by-version."jsonfile"."2.0.0" = self.buildNodePackage {
-    name = "jsonfile-2.0.0";
-    version = "2.0.0";
+  by-spec."jsbn".">=0.1.0 <0.2.0" =
+    self.by-version."jsbn"."0.1.0";
+  by-version."jsbn"."0.1.0" = self.buildNodePackage {
+    name = "jsbn-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz";
-      name = "jsonfile-2.0.0.tgz";
-      sha1 = "c3944f350bd3c078b392e0aa1633b44662fcf06b";
+      url = "http://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz";
+      name = "jsbn-0.1.0.tgz";
+      sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
     };
     deps = {
     };
@@ -1855,16 +1917,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jsonpointer"."^1.1.0" =
-    self.by-version."jsonpointer"."1.1.0";
-  by-version."jsonpointer"."1.1.0" = self.buildNodePackage {
-    name = "jsonpointer-1.1.0";
-    version = "1.1.0";
+  by-spec."jsbn"."~0.1.0" =
+    self.by-version."jsbn"."0.1.0";
+  by-spec."json-schema"."0.2.2" =
+    self.by-version."json-schema"."0.2.2";
+  by-version."json-schema"."0.2.2" = self.buildNodePackage {
+    name = "json-schema-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz";
-      name = "jsonpointer-1.1.0.tgz";
-      sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc";
+      url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
+      name = "json-schema-0.2.2.tgz";
+      sha1 = "50354f19f603917c695f70b85afa77c3b0f23506";
     };
     deps = {
     };
@@ -1874,28 +1938,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."kbpgp".">=2.0.9" =
-    self.by-version."kbpgp"."2.0.9";
-  by-version."kbpgp"."2.0.9" = self.buildNodePackage {
-    name = "kbpgp-2.0.9";
-    version = "2.0.9";
+  by-spec."json-stringify-safe"."~5.0.1" =
+    self.by-version."json-stringify-safe"."5.0.1";
+  by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage {
+    name = "json-stringify-safe-5.0.1";
+    version = "5.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kbpgp/-/kbpgp-2.0.9.tgz";
-      name = "kbpgp-2.0.9.tgz";
-      sha1 = "b4f8686abde8689a1d4abb36e070af78632ceb59";
+      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+      name = "json-stringify-safe-5.0.1.tgz";
+      sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
     };
     deps = {
-      "bn-1.0.1" = self.by-version."bn"."1.0.1";
-      "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
-      "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "keybase-compressjs-1.0.1-c" = self.by-version."keybase-compressjs"."1.0.1-c";
-      "keybase-ecurve-1.0.0" = self.by-version."keybase-ecurve"."1.0.0";
-      "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
-      "purepack-1.0.1" = self.by-version."purepack"."1.0.1";
-      "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19";
-      "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2";
     };
     optionalDependencies = {
     };
@@ -1903,22 +1957,37 @@
     os = [ ];
     cpu = [ ];
   };
-  "kbpgp" = self.by-version."kbpgp"."2.0.9";
-  by-spec."kbpgp"."^2.0.0" =
-    self.by-version."kbpgp"."2.0.9";
-  by-spec."keybase-compressjs"."^1.0.1-c" =
-    self.by-version."keybase-compressjs"."1.0.1-c";
-  by-version."keybase-compressjs"."1.0.1-c" = self.buildNodePackage {
-    name = "keybase-compressjs-1.0.1-c";
-    version = "1.0.1-c";
+  by-spec."jsonfile"."^2.1.0" =
+    self.by-version."jsonfile"."2.2.3";
+  by-version."jsonfile"."2.2.3" = self.buildNodePackage {
+    name = "jsonfile-2.2.3";
+    version = "2.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.2.3.tgz";
+      name = "jsonfile-2.2.3.tgz";
+      sha1 = "e252b99a6af901d3ec41f332589c90509a7bc605";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsonpointer"."2.0.0" =
+    self.by-version."jsonpointer"."2.0.0";
+  by-version."jsonpointer"."2.0.0" = self.buildNodePackage {
+    name = "jsonpointer-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keybase-compressjs/-/keybase-compressjs-1.0.1-c.tgz";
-      name = "keybase-compressjs-1.0.1-c.tgz";
-      sha1 = "dc664a7f5d95584a534622a260297532f3ce9f9f";
+      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz";
+      name = "jsonpointer-2.0.0.tgz";
+      sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9";
     };
     deps = {
-      "commander-2.1.0" = self.by-version."commander"."2.1.0";
     };
     optionalDependencies = {
     };
@@ -1926,6 +1995,63 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."jsprim"."^1.2.2" =
+    self.by-version."jsprim"."1.2.2";
+  by-version."jsprim"."1.2.2" = self.buildNodePackage {
+    name = "jsprim-1.2.2";
+    version = "1.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz";
+      name = "jsprim-1.2.2.tgz";
+      sha1 = "f20c906ac92abd58e3b79ac8bc70a48832512da1";
+    };
+    deps = {
+      "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
+      "json-schema-0.2.2" = self.by-version."json-schema"."0.2.2";
+      "verror-1.3.6" = self.by-version."verror"."1.3.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."kbpgp".">=2.0.41" =
+    self.by-version."kbpgp"."2.0.50";
+  by-version."kbpgp"."2.0.50" = self.buildNodePackage {
+    name = "kbpgp-2.0.50";
+    version = "2.0.50";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/kbpgp/-/kbpgp-2.0.50.tgz";
+      name = "kbpgp-2.0.50.tgz";
+      sha1 = "b060d0e00f965001ea1dd59d64e597f8e060e10c";
+    };
+    deps = {
+      "bn-1.0.1" = self.by-version."bn"."1.0.1";
+      "bzip-deflate-1.0.0" = self.by-version."bzip-deflate"."1.0.0";
+      "deep-equal-1.0.1" = self.by-version."deep-equal"."1.0.1";
+      "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "keybase-ecurve-1.0.0" = self.by-version."keybase-ecurve"."1.0.0";
+      "keybase-nacl-1.0.1" = self.by-version."keybase-nacl"."1.0.1";
+      "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
+      "purepack-1.0.4" = self.by-version."purepack"."1.0.4";
+      "triplesec-3.0.25" = self.by-version."triplesec"."3.0.25";
+      "tweetnacl-0.13.3" = self.by-version."tweetnacl"."0.13.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."kbpgp".">=2.0.46" =
+    self.by-version."kbpgp"."2.0.50";
+  "kbpgp" = self.by-version."kbpgp"."2.0.50";
+  by-spec."kbpgp"."^2.0.0" =
+    self.by-version."kbpgp"."2.0.50";
   by-spec."keybase-ecurve"."^1.0.0" =
     self.by-version."keybase-ecurve"."1.0.0";
   by-version."keybase-ecurve"."1.0.0" = self.buildNodePackage {
@@ -1946,32 +2072,54 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."keybase-installer"."1.0.1" =
-    self.by-version."keybase-installer"."1.0.1";
-  by-version."keybase-installer"."1.0.1" = self.buildNodePackage {
-    name = "keybase-installer-1.0.1";
-    version = "1.0.1";
+  by-spec."keybase-installer"."1.0.2" =
+    self.by-version."keybase-installer"."1.0.2";
+  by-version."keybase-installer"."1.0.2" = self.buildNodePackage {
+    name = "keybase-installer-1.0.2";
+    version = "1.0.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keybase-installer/-/keybase-installer-1.0.1.tgz";
-      name = "keybase-installer-1.0.1.tgz";
-      sha1 = "31ca46388833665225e8113bdd79ded9b04e0862";
+      url = "http://registry.npmjs.org/keybase-installer/-/keybase-installer-1.0.2.tgz";
+      name = "keybase-installer-1.0.2.tgz";
+      sha1 = "19a68b29ef7981daf8531a8f6fcfaffc885f7e6b";
     };
     deps = {
       "badnode-1.0.1" = self.by-version."badnode"."1.0.1";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
-      "gpg-wrapper-1.0.4" = self.by-version."gpg-wrapper"."1.0.4";
+      "gpg-wrapper-1.0.5" = self.by-version."gpg-wrapper"."1.0.5";
       "iced-data-structures-0.0.5" = self.by-version."iced-data-structures"."0.0.5";
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-logger-0.0.6" = self.by-version."iced-logger"."0.0.6";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
       "iced-spawn-1.0.0" = self.by-version."iced-spawn"."1.0.0";
-      "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
+      "iced-utils-0.1.23" = self.by-version."iced-utils"."0.1.23";
       "keybase-path-0.0.15" = self.by-version."keybase-path"."0.0.15";
       "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
       "progress-1.1.3" = self.by-version."progress"."1.1.3";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "request-2.69.0" = self.by-version."request"."2.69.0";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "keybase-installer" = self.by-version."keybase-installer"."1.0.2";
+  by-spec."keybase-nacl"."^1.0.0" =
+    self.by-version."keybase-nacl"."1.0.1";
+  by-version."keybase-nacl"."1.0.1" = self.buildNodePackage {
+    name = "keybase-nacl-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keybase-nacl/-/keybase-nacl-1.0.1.tgz";
+      name = "keybase-nacl-1.0.1.tgz";
+      sha1 = "6047edb7baf241ac5c60cfc32e86512d69d652d3";
+    };
+    deps = {
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "tweetnacl-0.13.3" = self.by-version."tweetnacl"."0.13.3";
     };
     optionalDependencies = {
     };
@@ -1979,7 +2127,6 @@
     os = [ ];
     cpu = [ ];
   };
-  "keybase-installer" = self.by-version."keybase-installer"."1.0.1";
   by-spec."keybase-path"."0.0.16" =
     self.by-version."keybase-path"."0.0.16";
   by-version."keybase-path"."0.0.16" = self.buildNodePackage {
@@ -1992,7 +2139,7 @@
       sha1 = "3d60804aa48274b628d802a212f5e0dfcc13acaa";
     };
     deps = {
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -2013,7 +2160,7 @@
       sha1 = "94b95448fc4edf73e096366279bd28a469d5f72f";
     };
     deps = {
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -2021,23 +2168,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."keybase-proofs"."^2.0.13" =
-    self.by-version."keybase-proofs"."2.0.20";
-  by-version."keybase-proofs"."2.0.20" = self.buildNodePackage {
-    name = "keybase-proofs-2.0.20";
-    version = "2.0.20";
+  by-spec."keybase-proofs"."^2.0.23" =
+    self.by-version."keybase-proofs"."2.0.47";
+  by-version."keybase-proofs"."2.0.47" = self.buildNodePackage {
+    name = "keybase-proofs-2.0.47";
+    version = "2.0.47";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keybase-proofs/-/keybase-proofs-2.0.20.tgz";
-      name = "keybase-proofs-2.0.20.tgz";
-      sha1 = "bb8f76f51cd04ee3a2de8b7e786c717e718ec2c7";
+      url = "http://registry.npmjs.org/keybase-proofs/-/keybase-proofs-2.0.47.tgz";
+      name = "keybase-proofs-2.0.47.tgz";
+      sha1 = "27c4d9936b8740bc782038f9087d462a1e89b6e4";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "kbpgp-2.0.50" = self.by-version."kbpgp"."2.0.50";
       "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
-      "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19";
+      "triplesec-3.0.25" = self.by-version."triplesec"."3.0.25";
     };
     optionalDependencies = {
     };
@@ -2045,25 +2193,70 @@
     os = [ ];
     cpu = [ ];
   };
-  "keybase-proofs" = self.by-version."keybase-proofs"."2.0.20";
-  by-spec."libkeybase"."^1.0.2" =
-    self.by-version."libkeybase"."1.0.2";
-  by-version."libkeybase"."1.0.2" = self.buildNodePackage {
-    name = "libkeybase-1.0.2";
-    version = "1.0.2";
+  by-spec."keybase-proofs"."^2.0.46" =
+    self.by-version."keybase-proofs"."2.0.47";
+  "keybase-proofs" = self.by-version."keybase-proofs"."2.0.47";
+  by-spec."klaw"."^1.0.0" =
+    self.by-version."klaw"."1.1.3";
+  by-version."klaw"."1.1.3" = self.buildNodePackage {
+    name = "klaw-1.1.3";
+    version = "1.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/klaw/-/klaw-1.1.3.tgz";
+      name = "klaw-1.1.3.tgz";
+      sha1 = "7da33c6b42f9b3dc9cec00d17f13af017fcc2721";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."libkeybase".">=1.2.19" =
+    self.by-version."libkeybase"."1.2.24";
+  by-version."libkeybase"."1.2.24" = self.buildNodePackage {
+    name = "libkeybase-1.2.24";
+    version = "1.2.24";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/libkeybase/-/libkeybase-1.0.2.tgz";
-      name = "libkeybase-1.0.2.tgz";
-      sha1 = "742e4f5138faa8f912a70e126f0eda414bf8fc51";
+      url = "http://registry.npmjs.org/libkeybase/-/libkeybase-1.2.24.tgz";
+      name = "libkeybase-1.2.24.tgz";
+      sha1 = "01bd5900eebad304c6ee906dad552ecc211ec989";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1";
       "iced-logger-0.0.5" = self.by-version."iced-logger"."0.0.5";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "kbpgp-2.0.9" = self.by-version."kbpgp"."2.0.9";
-      "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "iced-utils-0.1.23" = self.by-version."iced-utils"."0.1.23";
+      "kbpgp-2.0.50" = self.by-version."kbpgp"."2.0.50";
+      "keybase-proofs-2.0.47" = self.by-version."keybase-proofs"."2.0.47";
+      "merkle-tree-0.0.14" = self.by-version."merkle-tree"."0.0.14";
+      "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
+      "triplesec-3.0.25" = self.by-version."triplesec"."3.0.25";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "libkeybase" = self.by-version."libkeybase"."1.2.24";
+  by-spec."lru-cache"."^2.6.5" =
+    self.by-version."lru-cache"."2.7.3";
+  by-version."lru-cache"."2.7.3" = self.buildNodePackage {
+    name = "lru-cache-2.7.3";
+    version = "2.7.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
+      name = "lru-cache-2.7.3.tgz";
+      sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
+    };
+    deps = {
     };
     optionalDependencies = {
     };
@@ -2071,17 +2264,16 @@
     os = [ ];
     cpu = [ ];
   };
-  "libkeybase" = self.by-version."libkeybase"."1.0.2";
   by-spec."marked".">= 0.2.7" =
-    self.by-version."marked"."0.3.3";
-  by-version."marked"."0.3.3" = self.buildNodePackage {
-    name = "marked-0.3.3";
-    version = "0.3.3";
+    self.by-version."marked"."0.3.5";
+  by-version."marked"."0.3.5" = self.buildNodePackage {
+    name = "marked-0.3.5";
+    version = "0.3.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/marked/-/marked-0.3.3.tgz";
-      name = "marked-0.3.3.tgz";
-      sha1 = "08bad9cac13736f6cceddc202344f1b0bf255390";
+      url = "http://registry.npmjs.org/marked/-/marked-0.3.5.tgz";
+      name = "marked-0.3.5.tgz";
+      sha1 = "4113a15ac5d7bca158a5aae07224587b9fa15b94";
     };
     deps = {
     };
@@ -2091,22 +2283,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."merkle-tree"."0.0.12" =
-    self.by-version."merkle-tree"."0.0.12";
-  by-version."merkle-tree"."0.0.12" = self.buildNodePackage {
-    name = "merkle-tree-0.0.12";
-    version = "0.0.12";
+  by-spec."merkle-tree"."0.0.14" =
+    self.by-version."merkle-tree"."0.0.14";
+  by-version."merkle-tree"."0.0.14" = self.buildNodePackage {
+    name = "merkle-tree-0.0.14";
+    version = "0.0.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/merkle-tree/-/merkle-tree-0.0.12.tgz";
-      name = "merkle-tree-0.0.12.tgz";
-      sha1 = "c8d6f0e9489b828c1d02942b24514311bac5e30f";
+      url = "http://registry.npmjs.org/merkle-tree/-/merkle-tree-0.0.14.tgz";
+      name = "merkle-tree-0.0.14.tgz";
+      sha1 = "584c3b05beaf7d482fbd4c6a868e8c35a581a7ef";
     };
     deps = {
       "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2";
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "iced-utils-0.1.23" = self.by-version."iced-utils"."0.1.23";
     };
     optionalDependencies = {
     };
@@ -2114,17 +2306,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "merkle-tree" = self.by-version."merkle-tree"."0.0.12";
-  by-spec."mime-db"."~1.8.0" =
-    self.by-version."mime-db"."1.8.0";
-  by-version."mime-db"."1.8.0" = self.buildNodePackage {
-    name = "mime-db-1.8.0";
-    version = "1.8.0";
+  "merkle-tree" = self.by-version."merkle-tree"."0.0.14";
+  by-spec."mime-db"."~1.21.0" =
+    self.by-version."mime-db"."1.21.0";
+  by-version."mime-db"."1.21.0" = self.buildNodePackage {
+    name = "mime-db-1.21.0";
+    version = "1.21.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz";
-      name = "mime-db-1.8.0.tgz";
-      sha1 = "82a9b385f22b0f5954dec4d445faba0722c4ad25";
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz";
+      name = "mime-db-1.21.0.tgz";
+      sha1 = "9b5239e3353cf6eb015a00d890261027c36d4bac";
     };
     deps = {
     };
@@ -2134,19 +2326,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime-types"."~2.0.1" =
-    self.by-version."mime-types"."2.0.10";
-  by-version."mime-types"."2.0.10" = self.buildNodePackage {
-    name = "mime-types-2.0.10";
-    version = "2.0.10";
+  by-spec."mime-types"."^2.1.3" =
+    self.by-version."mime-types"."2.1.9";
+  by-version."mime-types"."2.1.9" = self.buildNodePackage {
+    name = "mime-types-2.1.9";
+    version = "2.1.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz";
-      name = "mime-types-2.0.10.tgz";
-      sha1 = "eacd81bb73cab2a77447549a078d4f2018c67b4d";
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz";
+      name = "mime-types-2.1.9.tgz";
+      sha1 = "dfb396764b5fdf75be34b1f4104bc3687fb635f8";
     };
     deps = {
-      "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0";
+      "mime-db-1.21.0" = self.by-version."mime-db"."1.21.0";
     };
     optionalDependencies = {
     };
@@ -2154,21 +2346,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime-types"."~2.0.3" =
-    self.by-version."mime-types"."2.0.10";
-  by-spec."minimatch"."^2.0.1" =
-    self.by-version."minimatch"."2.0.4";
-  by-version."minimatch"."2.0.4" = self.buildNodePackage {
-    name = "minimatch-2.0.4";
-    version = "2.0.4";
+  by-spec."mime-types"."~2.1.7" =
+    self.by-version."mime-types"."2.1.9";
+  by-spec."minimatch"."2 || 3" =
+    self.by-version."minimatch"."3.0.0";
+  by-version."minimatch"."3.0.0" = self.buildNodePackage {
+    name = "minimatch-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz";
-      name = "minimatch-2.0.4.tgz";
-      sha1 = "83bea115803e7a097a78022427287edb762fafed";
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz";
+      name = "minimatch-3.0.0.tgz";
+      sha1 = "5236157a51e4f004c177fb3c527ff7dd78f0ef83";
     };
     deps = {
-      "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0";
+      "brace-expansion-1.1.2" = self.by-version."brace-expansion"."1.1.2";
     };
     optionalDependencies = {
     };
@@ -2177,15 +2369,15 @@
     cpu = [ ];
   };
   by-spec."minimist".">=0.0.8" =
-    self.by-version."minimist"."1.1.1";
-  by-version."minimist"."1.1.1" = self.buildNodePackage {
-    name = "minimist-1.1.1";
-    version = "1.1.1";
+    self.by-version."minimist"."1.2.0";
+  by-version."minimist"."1.2.0" = self.buildNodePackage {
+    name = "minimist-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz";
-      name = "minimist-1.1.1.tgz";
-      sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b";
+      url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+      name = "minimist-1.2.0.tgz";
+      sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
     };
     deps = {
     };
@@ -2248,7 +2440,7 @@
       sha1 = "67bfc6f7a86f26fbc37aac83fd46d88c61d109b5";
     };
     deps = {
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -2257,15 +2449,15 @@
     cpu = [ ];
   };
   by-spec."mute-stream"."~0.0.4" =
-    self.by-version."mute-stream"."0.0.4";
-  by-version."mute-stream"."0.0.4" = self.buildNodePackage {
-    name = "mute-stream-0.0.4";
-    version = "0.0.4";
+    self.by-version."mute-stream"."0.0.5";
+  by-version."mute-stream"."0.0.5" = self.buildNodePackage {
+    name = "mute-stream-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
-      name = "mute-stream-0.0.4.tgz";
-      sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e";
+      url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz";
+      name = "mute-stream-0.0.5.tgz";
+      sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0";
     };
     deps = {
     };
@@ -2294,16 +2486,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-uuid"."~1.4.0" =
-    self.by-version."node-uuid"."1.4.3";
-  by-version."node-uuid"."1.4.3" = self.buildNodePackage {
-    name = "node-uuid-1.4.3";
-    version = "1.4.3";
+  by-spec."node-uuid"."~1.4.7" =
+    self.by-version."node-uuid"."1.4.7";
+  by-version."node-uuid"."1.4.7" = self.buildNodePackage {
+    name = "node-uuid-1.4.7";
+    version = "1.4.7";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
-      name = "node-uuid-1.4.3.tgz";
-      sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
+      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
+      name = "node-uuid-1.4.7.tgz";
+      sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
     };
     deps = {
     };
@@ -2313,16 +2505,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."oauth-sign"."~0.6.0" =
-    self.by-version."oauth-sign"."0.6.0";
-  by-version."oauth-sign"."0.6.0" = self.buildNodePackage {
-    name = "oauth-sign-0.6.0";
-    version = "0.6.0";
+  by-spec."oauth-sign"."~0.8.0" =
+    self.by-version."oauth-sign"."0.8.1";
+  by-version."oauth-sign"."0.8.1" = self.buildNodePackage {
+    name = "oauth-sign-0.8.1";
+    version = "0.8.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz";
-      name = "oauth-sign-0.6.0.tgz";
-      sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3";
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz";
+      name = "oauth-sign-0.8.1.tgz";
+      sha1 = "182439bdb91378bf7460e75c64ea43e6448def06";
     };
     deps = {
     };
@@ -2333,15 +2525,15 @@
     cpu = [ ];
   };
   by-spec."once"."^1.3.0" =
-    self.by-version."once"."1.3.1";
-  by-version."once"."1.3.1" = self.buildNodePackage {
-    name = "once-1.3.1";
-    version = "1.3.1";
+    self.by-version."once"."1.3.3";
+  by-version."once"."1.3.3" = self.buildNodePackage {
+    name = "once-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz";
-      name = "once-1.3.1.tgz";
-      sha1 = "f3f3e4da5b7d27b5c732969ee3e67e729457b31f";
+      url = "http://registry.npmjs.org/once/-/once-1.3.3.tgz";
+      name = "once-1.3.3.tgz";
+      sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
     };
     deps = {
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
@@ -2364,7 +2556,7 @@
       sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
     };
     deps = {
-      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
     optionalDependencies = {
@@ -2406,7 +2598,7 @@
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -2427,7 +2619,7 @@
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -2442,16 +2634,74 @@
   "pgp-utils" = self.by-version."pgp-utils"."0.0.28";
   by-spec."pgp-utils".">=0.0.8" =
     self.by-version."pgp-utils"."0.0.28";
+  by-spec."pinkie"."^2.0.0" =
+    self.by-version."pinkie"."2.0.4";
+  by-version."pinkie"."2.0.4" = self.buildNodePackage {
+    name = "pinkie-2.0.4";
+    version = "2.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+      name = "pinkie-2.0.4.tgz";
+      sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pinkie-promise"."^2.0.0" =
+    self.by-version."pinkie-promise"."2.0.0";
+  by-version."pinkie-promise"."2.0.0" = self.buildNodePackage {
+    name = "pinkie-promise-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz";
+      name = "pinkie-promise-2.0.0.tgz";
+      sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259";
+    };
+    deps = {
+      "pinkie-2.0.4" = self.by-version."pinkie"."2.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."pkginfo"."0.3.x" =
-    self.by-version."pkginfo"."0.3.0";
-  by-version."pkginfo"."0.3.0" = self.buildNodePackage {
-    name = "pkginfo-0.3.0";
-    version = "0.3.0";
+    self.by-version."pkginfo"."0.3.1";
+  by-version."pkginfo"."0.3.1" = self.buildNodePackage {
+    name = "pkginfo-0.3.1";
+    version = "0.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz";
+      name = "pkginfo-0.3.1.tgz";
+      sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."process-nextick-args"."~1.0.6" =
+    self.by-version."process-nextick-args"."1.0.6";
+  by-version."process-nextick-args"."1.0.6" = self.buildNodePackage {
+    name = "process-nextick-args-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
-      name = "pkginfo-0.3.0.tgz";
-      sha1 = "726411401039fe9b009eea86614295d5f3a54276";
+      url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz";
+      name = "process-nextick-args-1.0.6.tgz";
+      sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05";
     };
     deps = {
     };
@@ -2500,16 +2750,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."punycode".">=0.2.0" =
-    self.by-version."punycode"."1.3.2";
-  by-version."punycode"."1.3.2" = self.buildNodePackage {
-    name = "punycode-1.3.2";
-    version = "1.3.2";
+  by-spec."purepack"."1.0.1" =
+    self.by-version."purepack"."1.0.1";
+  by-version."purepack"."1.0.1" = self.buildNodePackage {
+    name = "purepack-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
-      name = "punycode-1.3.2.tgz";
-      sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
+      url = "http://registry.npmjs.org/purepack/-/purepack-1.0.1.tgz";
+      name = "purepack-1.0.1.tgz";
+      sha1 = "9592f35bc22279a777885d3de04acc3555994f68";
     };
     deps = {
     };
@@ -2519,16 +2769,17 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."purepack"."1.0.1" =
-    self.by-version."purepack"."1.0.1";
-  by-version."purepack"."1.0.1" = self.buildNodePackage {
-    name = "purepack-1.0.1";
-    version = "1.0.1";
+  "purepack" = self.by-version."purepack"."1.0.1";
+  by-spec."purepack".">=1" =
+    self.by-version."purepack"."1.0.4";
+  by-version."purepack"."1.0.4" = self.buildNodePackage {
+    name = "purepack-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/purepack/-/purepack-1.0.1.tgz";
-      name = "purepack-1.0.1.tgz";
-      sha1 = "9592f35bc22279a777885d3de04acc3555994f68";
+      url = "http://registry.npmjs.org/purepack/-/purepack-1.0.4.tgz";
+      name = "purepack-1.0.4.tgz";
+      sha1 = "086282fd939285f58664ba9a9bba31cdb165ccd2";
     };
     deps = {
     };
@@ -2538,21 +2789,18 @@
     os = [ ];
     cpu = [ ];
   };
-  "purepack" = self.by-version."purepack"."1.0.1";
-  by-spec."purepack".">=1" =
-    self.by-version."purepack"."1.0.1";
-  by-spec."purepack".">=1.0.1" =
-    self.by-version."purepack"."1.0.1";
-  by-spec."qs"."~2.4.0" =
-    self.by-version."qs"."2.4.1";
-  by-version."qs"."2.4.1" = self.buildNodePackage {
-    name = "qs-2.4.1";
-    version = "2.4.1";
+  by-spec."purepack".">=1.0.4" =
+    self.by-version."purepack"."1.0.4";
+  by-spec."qs"."~6.0.2" =
+    self.by-version."qs"."6.0.2";
+  by-version."qs"."6.0.2" = self.buildNodePackage {
+    name = "qs-6.0.2";
+    version = "6.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-2.4.1.tgz";
-      name = "qs-2.4.1.tgz";
-      sha1 = "68cbaea971013426a80c1404fad6b1a6b1175245";
+      url = "http://registry.npmjs.org/qs/-/qs-6.0.2.tgz";
+      name = "qs-6.0.2.tgz";
+      sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
     };
     deps = {
     };
@@ -2574,7 +2822,7 @@
       sha256 = "927ce6e6e88c80c54b434261afb5717630568b6979afffc6828c4fc0335e22ec";
     };
     deps = {
-      "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
+      "mute-stream-0.0.5" = self.by-version."mute-stream"."0.0.5";
     };
     optionalDependencies = {
     };
@@ -2595,7 +2843,7 @@
       sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e";
     };
     deps = {
-      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -2606,22 +2854,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."readable-stream"."~1.0.26" =
-    self.by-version."readable-stream"."1.0.33";
-  by-version."readable-stream"."1.0.33" = self.buildNodePackage {
-    name = "readable-stream-1.0.33";
-    version = "1.0.33";
+  by-spec."readable-stream"."~2.0.5" =
+    self.by-version."readable-stream"."2.0.5";
+  by-version."readable-stream"."2.0.5" = self.buildNodePackage {
+    name = "readable-stream-2.0.5";
+    version = "2.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
-      name = "readable-stream-1.0.33.tgz";
-      sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz";
+      name = "readable-stream-2.0.5.tgz";
+      sha1 = "a2426f8dcd4551c77a33f96edf2886a23c829669";
     };
     deps = {
-      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "process-nextick-args-1.0.6" = self.by-version."process-nextick-args"."1.0.6";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "util-deprecate-1.0.2" = self.by-version."util-deprecate"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -2629,36 +2879,39 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."^2.34.0" =
-    self.by-version."request"."2.55.0";
-  by-version."request"."2.55.0" = self.buildNodePackage {
-    name = "request-2.55.0";
-    version = "2.55.0";
+  by-spec."request"."^2.58.0" =
+    self.by-version."request"."2.69.0";
+  by-version."request"."2.69.0" = self.buildNodePackage {
+    name = "request-2.69.0";
+    version = "2.69.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.55.0.tgz";
-      name = "request-2.55.0.tgz";
-      sha1 = "d75c1cdf679d76bb100f9bffe1fe551b5c24e93d";
+      url = "http://registry.npmjs.org/request/-/request-2.69.0.tgz";
+      name = "request-2.69.0.tgz";
+      sha1 = "cf91d2e000752b1217155c005241911991a2346a";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
+      "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
+      "aws4-1.2.1" = self.by-version."aws4"."1.2.1";
+      "bl-1.0.2" = self.by-version."bl"."1.0.2";
+      "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
       "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
-      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "qs-2.4.1" = self.by-version."qs"."2.4.1";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "tough-cookie-0.13.0" = self.by-version."tough-cookie"."0.13.0";
-      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
-      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
-      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "form-data-1.0.0-rc3" = self.by-version."form-data"."1.0.0-rc3";
+      "har-validator-2.0.6" = self.by-version."har-validator"."2.0.6";
+      "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
+      "http-signature-1.1.1" = self.by-version."http-signature"."1.1.1";
+      "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0";
       "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-      "har-validator-1.6.1" = self.by-version."har-validator"."1.6.1";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.1.9" = self.by-version."mime-types"."2.1.9";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "qs-6.0.2" = self.by-version."qs"."6.0.2";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
+      "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
     };
     optionalDependencies = {
     };
@@ -2666,22 +2919,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."^2.55.0" =
-    self.by-version."request"."2.55.0";
-  "request" = self.by-version."request"."2.55.0";
+  "request" = self.by-version."request"."2.69.0";
   by-spec."rimraf"."^2.2.8" =
-    self.by-version."rimraf"."2.3.2";
-  by-version."rimraf"."2.3.2" = self.buildNodePackage {
-    name = "rimraf-2.3.2";
-    version = "2.3.2";
+    self.by-version."rimraf"."2.5.1";
+  by-version."rimraf"."2.5.1" = self.buildNodePackage {
+    name = "rimraf-2.5.1";
+    version = "2.5.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz";
-      name = "rimraf-2.3.2.tgz";
-      sha1 = "7304bd9275c401b89103b106b3531c1ef0c02fe9";
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.5.1.tgz";
+      name = "rimraf-2.5.1.tgz";
+      sha1 = "52e1e946f3f9b9b0d5d8988ba3191aaf2a2dbd43";
     };
     deps = {
-      "glob-4.5.3" = self.by-version."glob"."4.5.3";
+      "glob-6.0.4" = self.by-version."glob"."6.0.4";
     };
     optionalDependencies = {
     };
@@ -2690,15 +2941,15 @@
     cpu = [ ];
   };
   by-spec."semver".">=1" =
-    self.by-version."semver"."4.3.3";
-  by-version."semver"."4.3.3" = self.buildNodePackage {
-    name = "semver-4.3.3";
-    version = "4.3.3";
+    self.by-version."semver"."5.1.0";
+  by-version."semver"."5.1.0" = self.buildNodePackage {
+    name = "semver-5.1.0";
+    version = "5.1.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-4.3.3.tgz";
-      name = "semver-4.3.3.tgz";
-      sha1 = "15466b61220bc371cd8f0e666a9f785329ea8228";
+      url = "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
+      name = "semver-5.1.0.tgz";
+      sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5";
     };
     deps = {
     };
@@ -2709,10 +2960,27 @@
     cpu = [ ];
   };
   by-spec."semver".">=2.2.1" =
-    self.by-version."semver"."4.3.3";
+    self.by-version."semver"."5.1.0";
   by-spec."semver"."^4.0.0" =
-    self.by-version."semver"."4.3.3";
-  "semver" = self.by-version."semver"."4.3.3";
+    self.by-version."semver"."4.3.6";
+  by-version."semver"."4.3.6" = self.buildNodePackage {
+    name = "semver-4.3.6";
+    version = "4.3.6";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
+      name = "semver-4.3.6.tgz";
+      sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "semver" = self.by-version."semver"."4.3.6";
   by-spec."sntp"."1.x.x" =
     self.by-version."sntp"."1.0.9";
   by-version."sntp"."1.0.9" = self.buildNodePackage {
@@ -2725,7 +2993,7 @@
       sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
     };
     deps = {
-      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
     };
     optionalDependencies = {
     };
@@ -2745,7 +3013,7 @@
       sha1 = "4205b5791f2df77cf07527222558fe4e46aca2f1";
     };
     deps = {
-      "ipv6-3.1.1" = self.by-version."ipv6"."3.1.1";
+      "ipv6-3.1.3" = self.by-version."ipv6"."3.1.3";
       "network-byte-order-0.2.0" = self.by-version."network-byte-order"."0.2.0";
     };
     optionalDependencies = {
@@ -2815,7 +3083,7 @@
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -2843,6 +3111,32 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."sshpk"."^1.7.0" =
+    self.by-version."sshpk"."1.7.3";
+  by-version."sshpk"."1.7.3" = self.buildNodePackage {
+    name = "sshpk-1.7.3";
+    version = "1.7.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.3.tgz";
+      name = "sshpk-1.7.3.tgz";
+      sha1 = "caa8ef95e30765d856698b7025f9f211ab65962f";
+    };
+    deps = {
+      "asn1-0.2.3" = self.by-version."asn1"."0.2.3";
+      "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
+      "dashdash-1.12.2" = self.by-version."dashdash"."1.12.2";
+    };
+    optionalDependencies = {
+      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
+      "tweetnacl-0.13.3" = self.by-version."tweetnacl"."0.13.3";
+      "jodid25519-1.0.2" = self.by-version."jodid25519"."1.0.2";
+      "ecc-jsbn-0.1.1" = self.by-version."ecc-jsbn"."0.1.1";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."stack-trace"."0.0.x" =
     self.by-version."stack-trace"."0.0.9";
   by-version."stack-trace"."0.0.9" = self.buildNodePackage {
@@ -2901,15 +3195,15 @@
     cpu = [ ];
   };
   by-spec."stringstream"."~0.0.4" =
-    self.by-version."stringstream"."0.0.4";
-  by-version."stringstream"."0.0.4" = self.buildNodePackage {
-    name = "stringstream-0.0.4";
-    version = "0.0.4";
+    self.by-version."stringstream"."0.0.5";
+  by-version."stringstream"."0.0.5" = self.buildNodePackage {
+    name = "stringstream-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
-      name = "stringstream-0.0.4.tgz";
-      sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92";
+      url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
+      name = "stringstream-0.0.5.tgz";
+      sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
     };
     deps = {
     };
@@ -2919,19 +3213,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."strip-ansi"."^2.0.1" =
-    self.by-version."strip-ansi"."2.0.1";
-  by-version."strip-ansi"."2.0.1" = self.buildNodePackage {
-    name = "strip-ansi-2.0.1";
-    version = "2.0.1";
-    bin = true;
+  by-spec."strip-ansi"."^3.0.0" =
+    self.by-version."strip-ansi"."3.0.0";
+  by-version."strip-ansi"."3.0.0" = self.buildNodePackage {
+    name = "strip-ansi-3.0.0";
+    version = "3.0.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
-      name = "strip-ansi-2.0.1.tgz";
-      sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
+      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz";
+      name = "strip-ansi-3.0.0.tgz";
+      sha1 = "7510b665567ca914ccb5d7e072763ac968be3724";
     };
     deps = {
-      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -2939,16 +3233,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."supports-color"."^1.3.0" =
-    self.by-version."supports-color"."1.3.1";
-  by-version."supports-color"."1.3.1" = self.buildNodePackage {
-    name = "supports-color-1.3.1";
-    version = "1.3.1";
-    bin = true;
+  by-spec."supports-color"."^2.0.0" =
+    self.by-version."supports-color"."2.0.0";
+  by-version."supports-color"."2.0.0" = self.buildNodePackage {
+    name = "supports-color-2.0.0";
+    version = "2.0.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz";
-      name = "supports-color-1.3.1.tgz";
-      sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d";
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+      name = "supports-color-2.0.0.tgz";
+      sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
     };
     deps = {
     };
@@ -3000,19 +3294,18 @@
     cpu = [ ];
   };
   "timeago" = self.by-version."timeago"."0.1.0";
-  by-spec."tough-cookie".">=0.12.0" =
-    self.by-version."tough-cookie"."0.13.0";
-  by-version."tough-cookie"."0.13.0" = self.buildNodePackage {
-    name = "tough-cookie-0.13.0";
-    version = "0.13.0";
+  by-spec."tough-cookie"."~2.2.0" =
+    self.by-version."tough-cookie"."2.2.1";
+  by-version."tough-cookie"."2.2.1" = self.buildNodePackage {
+    name = "tough-cookie-2.2.1";
+    version = "2.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.13.0.tgz";
-      name = "tough-cookie-0.13.0.tgz";
-      sha1 = "34531cfefeba2dc050fb8e9a3310f876cdcc24f4";
+      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz";
+      name = "tough-cookie-2.2.1.tgz";
+      sha1 = "3b0516b799e70e8164436a1446e7e5877fda118e";
     };
     deps = {
-      "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
     };
     optionalDependencies = {
     };
@@ -3021,20 +3314,20 @@
     cpu = [ ];
   };
   by-spec."triplesec".">=3.0.16" =
-    self.by-version."triplesec"."3.0.19";
-  by-version."triplesec"."3.0.19" = self.buildNodePackage {
-    name = "triplesec-3.0.19";
-    version = "3.0.19";
+    self.by-version."triplesec"."3.0.25";
+  by-version."triplesec"."3.0.25" = self.buildNodePackage {
+    name = "triplesec-3.0.25";
+    version = "3.0.25";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/triplesec/-/triplesec-3.0.19.tgz";
-      name = "triplesec-3.0.19.tgz";
-      sha1 = "1cf858ccfcc133a3e884ff7d37aedf3b306c32f9";
+      url = "http://registry.npmjs.org/triplesec/-/triplesec-3.0.25.tgz";
+      name = "triplesec-3.0.25.tgz";
+      sha1 = "c66833548646effbd031de01dde4ed0721aaad58";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
       "more-entropy-0.0.7" = self.by-version."more-entropy"."0.0.7";
       "progress-1.1.8" = self.by-version."progress"."1.1.8";
     };
@@ -3044,19 +3337,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "triplesec" = self.by-version."triplesec"."3.0.19";
+  "triplesec" = self.by-version."triplesec"."3.0.25";
   by-spec."triplesec".">=3.0.19" =
-    self.by-version."triplesec"."3.0.19";
-  by-spec."tunnel-agent"."~0.4.0" =
-    self.by-version."tunnel-agent"."0.4.0";
-  by-version."tunnel-agent"."0.4.0" = self.buildNodePackage {
-    name = "tunnel-agent-0.4.0";
-    version = "0.4.0";
+    self.by-version."triplesec"."3.0.25";
+  by-spec."triplesec"."^3.0.19" =
+    self.by-version."triplesec"."3.0.25";
+  by-spec."tunnel-agent"."~0.4.1" =
+    self.by-version."tunnel-agent"."0.4.2";
+  by-version."tunnel-agent"."0.4.2" = self.buildNodePackage {
+    name = "tunnel-agent-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
-      name = "tunnel-agent-0.4.0.tgz";
-      sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
+      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz";
+      name = "tunnel-agent-0.4.2.tgz";
+      sha1 = "1104e3f36ac87125c287270067d582d18133bfee";
     };
     deps = {
     };
@@ -3066,16 +3361,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tweetnacl"."^0.12.0" =
-    self.by-version."tweetnacl"."0.12.2";
-  by-version."tweetnacl"."0.12.2" = self.buildNodePackage {
-    name = "tweetnacl-0.12.2";
-    version = "0.12.2";
+  by-spec."tweetnacl".">=0.13.0 <1.0.0" =
+    self.by-version."tweetnacl"."0.13.3";
+  by-version."tweetnacl"."0.13.3" = self.buildNodePackage {
+    name = "tweetnacl-0.13.3";
+    version = "0.13.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz";
-      name = "tweetnacl-0.12.2.tgz";
-      sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb";
+      url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz";
+      name = "tweetnacl-0.13.3.tgz";
+      sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56";
     };
     deps = {
     };
@@ -3085,8 +3380,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tweetnacl"."^0.12.2" =
-    self.by-version."tweetnacl"."0.12.2";
+  by-spec."tweetnacl"."^0.13.1" =
+    self.by-version."tweetnacl"."0.13.3";
   by-spec."underscore".">= 1.0.0" =
     self.by-version."underscore"."1.8.3";
   by-version."underscore"."1.8.3" = self.buildNodePackage {
@@ -3146,6 +3441,45 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."util-deprecate"."~1.0.1" =
+    self.by-version."util-deprecate"."1.0.2";
+  by-version."util-deprecate"."1.0.2" = self.buildNodePackage {
+    name = "util-deprecate-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+      name = "util-deprecate-1.0.2.tgz";
+      sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."verror"."1.3.6" =
+    self.by-version."verror"."1.3.6";
+  by-version."verror"."1.3.6" = self.buildNodePackage {
+    name = "verror-1.3.6";
+    version = "1.3.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
+      name = "verror-1.3.6.tgz";
+      sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
+    };
+    deps = {
+      "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."winston"."0.8.x" =
     self.by-version."winston"."0.8.3";
   by-version."winston"."0.8.3" = self.buildNodePackage {
@@ -3163,7 +3497,7 @@
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
       "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+      "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
     optionalDependencies = {
@@ -3173,15 +3507,15 @@
     cpu = [ ];
   };
   by-spec."wordwrap"."~0.0.2" =
-    self.by-version."wordwrap"."0.0.2";
-  by-version."wordwrap"."0.0.2" = self.buildNodePackage {
-    name = "wordwrap-0.0.2";
-    version = "0.0.2";
+    self.by-version."wordwrap"."0.0.3";
+  by-version."wordwrap"."0.0.3" = self.buildNodePackage {
+    name = "wordwrap-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
-      name = "wordwrap-0.0.2.tgz";
-      sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+      name = "wordwrap-0.0.3.tgz";
+      sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
     };
     deps = {
     };
@@ -3211,15 +3545,15 @@
     cpu = [ ];
   };
   by-spec."xtend"."^4.0.0" =
-    self.by-version."xtend"."4.0.0";
-  by-version."xtend"."4.0.0" = self.buildNodePackage {
-    name = "xtend-4.0.0";
-    version = "4.0.0";
+    self.by-version."xtend"."4.0.1";
+  by-version."xtend"."4.0.1" = self.buildNodePackage {
+    name = "xtend-4.0.1";
+    version = "4.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
-      name = "xtend-4.0.0.tgz";
-      sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f";
+      url = "http://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
+      name = "xtend-4.0.1.tgz";
+      sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
     };
     deps = {
     };
diff --git a/pkgs/applications/misc/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix
index aa184cbe1a487..963be70c0c268 100644
--- a/pkgs/applications/misc/kgocode/default.nix
+++ b/pkgs/applications/misc/kgocode/default.nix
@@ -1,9 +1,9 @@
-{ fetchgit, stdenv, cmake, kdelibs } :
+{ fetchgit, stdenv, cmake, kdelibs, automoc4 } :
 
 stdenv.mkDerivation rec {
   name = "kgocode-0.0.1";
 
-  buildInputs = [ cmake kdelibs ];
+  buildInputs = [ cmake kdelibs automoc4 ];
 
   src = fetchgit {
     url = https://bitbucket.org/lucashnegri/kgocode.git;
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index ac566c9609be6..0c88314ed02e4 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.6.3";
+  version = "0.8.1";
   name = "khard-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
-    sha256 = "1dn1v4ycgqbq8vknz1dy710asq8cizxmzaynn69xknwkpgda7fm9";
+    sha256 = "13axfrs96isirx0c483545xdmjwwfq1k7yy92xpk7l184v71rgi1";
   };
 
   propagatedBuildInputs = with pythonPackages; [
@@ -18,6 +18,7 @@ pythonPackages.buildPythonPackage rec {
 
   buildInputs = with pythonPackages; [
     pkgs.vdirsyncer
+    pyyaml
   ];
 
   meta = {
diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index a7617ec835878..1a89bda888ee4 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.1";
+  version = "1.0.4";
   name = "mdp-${version}";
 
   src = fetchurl {
     url = "https://github.com/visit1985/mdp/archive/${version}.tar.gz";
-    sha256 = "0vmr0ymq06r50yags9nv6fk4f890b82a7bvxg697vrgs04i2x4dy";
+    sha256 = "1wvys3sb0ki7zz5b0y4bl9x6jdj7h88lxsf8vap95k1sj2ymanlm";
   };
 
   makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix
index 12e3e696777dd..24a0a8c69675c 100644
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/pkgs/applications/misc/pdfmod/default.nix
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    substituteInPlace configure --replace gmcs mcs
     substituteInPlace lib/poppler-sharp/poppler-sharp/poppler-sharp.dll.config \
       --replace libpoppler-glib.so.4 libpoppler-glib.so
   '';
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 940aa8eb4bf4f..08e7f834d6bb1 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, git, gnupg, makeWrapper, pass, qtbase, qttools }:
+{ stdenv, fetchurl, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools }:
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
-  version = "1.0.6";
+  version = "1.1.0";
 
   src = fetchurl {
     url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
-    sha256 = "ccad9a06e3efa23278fa3e958185bf24fb3800874d8165be4ae6649706a2ab1c";
+    sha256 = "60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6";
   };
 
-  buildInputs = [ git gnupg makeWrapper pass qtbase qttools ];
+  buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools ];
 
   configurePhase = "qmake CONFIG+=release PREFIX=$out DESTDIR=$out";
 
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
     mv $out/qtpass $out/bin
   '';
 
-  postInstall = ''
-    wrapProgram $out/bin/qtpass \
-        --suffix PATH : ${git}/bin \
-        --suffix PATH : ${gnupg}/bin \
-        --suffix PATH : ${pass}/bin
+  postFixup = ''
+    wrapQtProgram $out/bin/qtpass \
+      --suffix PATH : ${git}/bin \
+      --suffix PATH : ${gnupg}/bin \
+      --suffix PATH : ${pass}/bin
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 3c13623af948e..19a0582a79ca6 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, buildPythonPackage, python, w3m, file }:
 
 buildPythonPackage rec {
-  name = "ranger-1.7.1";
+  name = "ranger-1.7.2";
 
   meta = {
     description = "File manager with minimalistic curses interface";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "http://ranger.nongnu.org/${name}.tar.gz";
-    sha256 = "11nznx2lqv884q9d2if63101prgnjlnan8pcwy550hji2qsn3c7q";
+    sha256 = "0yaviybviwdvfg2a0pf2kk28g10k245499xmbpqlai7fv91f7xll";
   };
 
   propagatedBuildInputs = [ python.modules.curses file ];
diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
new file mode 100644
index 0000000000000..cb18278d1ed4b
--- /dev/null
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2 }:
+
+let
+  version = "0.2.1";
+in
+stdenv.mkDerivation rec {
+
+  name = "sc-im-${version}";
+
+  src = fetchFromGitHub {
+    owner = "andmarti1424";
+    repo = "sc-im";
+    rev = "v${version}";
+    sha256 = "0v6b8xksvd12vmz198vik2ranyr5mhnp85hl9yxh9svibs7jxsbb";
+  };
+
+  buildInputs = [ yacc ncurses libxml2 ];
+
+  buildPhase = ''
+    cd src
+
+    sed "s,prefix=/usr,prefix=$out," Makefile
+    sed "s,-I/usr/include/libxml2,-I$libxml2," Makefile
+
+    make
+    export DESTDIR=$out
+  '';
+
+  installPhase = ''
+    make install prefix=
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/andmarti1424/sc-im";
+    description = "SC-IM - Spreadsheet Calculator Improvised - SC fork";
+    license = licenses.bsdOriginal;
+    maintainers = [ maintainers.matthiasbeyer ];
+    platforms = platforms.linux; # Cannot test others
+  };
+
+}
diff --git a/pkgs/applications/misc/scim/default.nix b/pkgs/applications/misc/scim/default.nix
deleted file mode 100644
index 0014784abd128..0000000000000
--- a/pkgs/applications/misc/scim/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, yacc, ncurses, libxml2 }:
-
-let
-  version = "0.1.9";
-in
-stdenv.mkDerivation rec {
-
-  name = "scim-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/andmarti1424/sc-im/archive/v${version}.tar.gz";
-    sha256 = "00rjz344acw0bxv78x1w9jz8snl9lb9qhr9z22phxinidnd3vaaz";
-  };
-
-  buildInputs = [ yacc ncurses libxml2 ];
-
-  buildPhase = ''
-    cd src
-
-    sed "s,prefix=/usr,prefix=$out," Makefile
-    sed "s,-I/usr/include/libxml2,-I$libxml2," Makefile
-
-    make
-    export DESTDIR=$out
-  '';
-
-  installPhase = ''
-    make install prefix=
-  '';
-
-  meta = {
-    homepage = "https://github.com/andmarti1424/scim";
-    description = "SCIM - Spreadsheet Calculator Improvised - SC fork";
-    license = {
-      fullName = "SCIM License";
-      url = "https://github.com/andmarti1424/scim/raw/master/LICENSE";
-    };
-    maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
-    platforms = with stdenv.lib.platforms; linux; # Cannot test others
-  };
-
-}
diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index db0798f64cff0..9a199c7ee4995 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -1,19 +1,14 @@
-{fetchurl, stdenv, makeWrapper, gtk3, python3Packages}:
-let
-  version = "0.9.2";
-in
-stdenv.mkDerivation {
+{fetchurl, stdenv, gtk3, python34Packages, gobjectIntrospection}:
+python34Packages.buildPythonPackage rec {
   name = "solaar-${version}";
+  version = "0.9.2";
+  namePrefix = "";
   src = fetchurl {
     sha256 = "0954grz2adggfzcj4df4mpr4d7qyl7w8rb4j2s0f9ymawl92i05j";
     url = "https://github.com/pwr/Solaar/archive/${version}.tar.gz";
   };
 
-  buildInputs = [gtk3 python3Packages.pygobject3 python3Packages.pyudev];
-  enableParallelBuilding = true;
-  installPhase = ''
-    mkdir -p "$out";
-  '';
+  propagatedBuildInputs = [python34Packages.pygobject3 python34Packages.pyudev gobjectIntrospection gtk3];
   postInstall = ''
     wrapProgram "$out/bin/solaar" \
       --prefix PYTHONPATH : "$PYTHONPATH" \
@@ -22,6 +17,8 @@ stdenv.mkDerivation {
       --prefix PYTHONPATH : "$PYTHONPATH" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
   '';
+
+  enableParallelBuilding = true;
   meta = with stdenv.lib; {
     description = "Linux devices manager for the Logitech Unifying Receiver";
     longDescription = ''
diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix
new file mode 100644
index 0000000000000..ed7e0cf7ca1d2
--- /dev/null
+++ b/pkgs/applications/misc/st/wayland.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, writeText
+, ncurses, wayland, wld, libxkbcommon, fontconfig, pixman
+, conf? null}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "st-wayland-${version}";
+  version = "git-2015-08-29";
+  rev = "61b47b76a09599c8093214e28c48938f5b424daa";
+
+  src = fetchurl {
+    url = "https://github.com/michaelforney/st/archive/${rev}.tar.gz";
+    sha256 = "7164da135f02405dba5ae3131dfd896e072df29ac6c0928f3b887beffb8a7d97";
+  };
+
+  configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
+  preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
+
+  buildInputs = [ pkgconfig ncurses wayland wld libxkbcommon fontconfig pixman ];
+
+  NIX_LDFLAGS = "-lfontconfig";
+
+  installPhase = ''
+    TERMINFO=$out/share/terminfo make install PREFIX=$out
+  '';
+
+  meta = {
+    homepage = http://st.suckless.org/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = with maintainers; [ ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index ac60d9285876e..16323bd225719 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -5,13 +5,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "synergy-${version}";
-  version = "1.7.4";
+  version = "1.7.5";
 
   src = fetchFromGitHub {
-    owner = "synergy";
+    owner = "symless";
     repo = "synergy";
     rev = "v${version}-stable";
-    sha256 = "0pxj0qpnsaffpaxik8vc5rjfinmx8ab3b2lssrxkfbs7isskvs33";
+    sha256 = "02zv8m7yagx80wi7m0ckglfqjqyrj6rd1gywxzqzl6841scmf87n";
   };
 
   postPatch = ''
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index dda976905610a..78d9086dd9612 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -16,7 +16,7 @@ let
   mkPluginInfo = { output ? "out", allowedVars ? [ output ]
                  , flags ? [], envVars ? {}
                  }: let
-    shSearch = ["'"] ++ map (var: "\$${var}") allowedVars;
+    shSearch = ["'"] ++ map (var: "@${var}@") allowedVars;
     shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars;
     # We need to triple-escape "val":
     #  * First because makeWrapper doesn't do any quoting of its arguments by
@@ -94,8 +94,8 @@ let
         output = "flash";
         allowedVars = [ "flash" "flashVersion" ];
         flags = [
-          "--ppapi-flash-path=$flash/lib/libpepflashplayer.so"
-          "--ppapi-flash-version=$flashVersion"
+          "--ppapi-flash-path=@flash@/lib/libpepflashplayer.so"
+          "--ppapi-flash-version=@flashVersion@"
         ];
       }}
 
@@ -107,7 +107,7 @@ let
       ${mkPluginInfo {
         output = "widevine";
         flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ];
-        envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib";
+        envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@widevine@/lib";
       }}
     '';
 
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index dc6f22434db9c..1a19210fd3dcd 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -7,15 +7,15 @@
     sha256bin64 = "1l5s504mmr4v5y67fsla9hyrk7dm155yc790ld87s1ya03h455gr";
   };
   beta = {
-    version = "48.0.2564.48";
-    sha256 = "1qasdz9rwdqa2if8y4kkk19fspgjpk3q782c8l1p5n2cm25lkfa9";
-    sha256bin32 = "0pgc3iy4s7whmckc14r0cvgmk7pqgidd2w0xv53bfq2k504b5ykw";
-    sha256bin64 = "1lx6l8s2wdgzldbm8licpf22l6z13mvq05xlbn8ybizhn159nykj";
+    version = "49.0.2623.28";
+    sha256 = "1cpgfcw6kgw70k14wa1m5qzj4rnvkzrw1am30d34516mbwlmmqc8";
+    sha256bin32 = "0nwhjav1x325h1drqknrjl5glivn4fdpahs1nlaqfk8kbjh1q113";
+    sha256bin64 = "0wj6j0v3rngsclzbb8rc8l90wdi98j2sb60r2ypfihaxq2gd138y";
   };
   stable = {
-    version = "47.0.2526.106";
-    sha256 = "1rjqkawj7l127cd9s1wxwn4v7dfbrlahml98sam3fg8a6drm0lv4";
-    sha256bin32 = "14svd5x8lzfyyigfirxx1q9pg2bsnnb0fdwa7vvh1awq3zzfd38n";
-    sha256bin64 = "121289vwaz391b32hp2lihlpaql76y44gdpqkl9a3md0j1zk1nd9";
+    version = "48.0.2564.97";
+    sha256 = "1nsjn8zlqljizy5dmg2rxwkw4k5j4yi15ywxi9ca3acv68dbhd3p";
+    sha256bin32 = "0gdd9krsfsixw5b03msm7nf7zl7xh4chzkh9srb19c1kzygl2j2l";
+    sha256bin64 = "1wmw17gdq1j6vxfdc8s94jc8z30pza8nipk4dh590xnb7faihr52";
   };
 }
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index bde8830145b7f..31ec6f313a8be 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_sources.rb > sources.nix
 
 {
-  version = "44.0";
+  version = "44.0.2";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha256 = "c0c65ced611dcc7b788aff7f0e32cd1823467c06dc99ced2e0aca0539ce545a2"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha256 = "87068d8072d0312af90524c7470c874d33e23c2b3e94be3fe9d934998330e898"; }
-    { locale = "af"; arch = "linux-i686"; sha256 = "7c8f08471fe561a345175c350c6414e72721baeb41a3ff47a429f5b79c33c82c"; }
-    { locale = "af"; arch = "linux-x86_64"; sha256 = "4768a53842d40e81a2e357ba58da56b0a81d2224878b6ab2ffad0bfc50c20ec1"; }
-    { locale = "an"; arch = "linux-i686"; sha256 = "cdb921661a6b20738f38ab2d0fb285aa81a323401f360f77b9ae6d9e8642210d"; }
-    { locale = "an"; arch = "linux-x86_64"; sha256 = "cff97655831940b84bfa5f73dfa3dc48de084ae6503e7a5824c3e57e373f0ff0"; }
-    { locale = "ar"; arch = "linux-i686"; sha256 = "9f6322577809b557f325168953170706af6d29a29b5347886f928b5f495799b8"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "d5a1a956d7f9afe5867e2dbeaea4ba2a94e743d291062d18232d20ace29d2c94"; }
-    { locale = "as"; arch = "linux-i686"; sha256 = "750c5cddd2d436993a4630f0ebf31e9d0ac679cc23a84298071a682e7a8a8de1"; }
-    { locale = "as"; arch = "linux-x86_64"; sha256 = "5b5a2376daef30eae3ff1a94213937381148ade79783546b1f38687c9fc4489e"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "99b5bc2c709a923a43debfe746c70c3613c206424c88d553f7593c200053a8b6"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "2fd75ff22d3b75f03c6a9ab005e369373f999ef4c38ea49438ab2adaa8e9a2c2"; }
-    { locale = "az"; arch = "linux-i686"; sha256 = "0781239c9c8f237d66ce0c8d9f39136e0eb71365f6ca8b695014648060c18c38"; }
-    { locale = "az"; arch = "linux-x86_64"; sha256 = "9fd6f6047ec3c4103c4aa761882053d4e00e018a1509fa1fbede1757394aa3fe"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "098e932b708ebc71a2aa7fe86ced4835dbc6725f8714904b25e7ebd1ca7b7d69"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "d9284a84e7e55ad6d73e7d599c5b6824774d7a9e6f7484064fd2985e5634d102"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "02879ea328d1536781f2f9765db51bcb9fa05d0a0b7ad426fd659156c293f347"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "70f55197d8ff67d52f090bd58dcc106fcc08492fe6989494eee3aa3cd1c3552a"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "227873ac53fdac5f27b569a5b6a1f3d45caa4e3c822610a5f294a3abdbc2c0fd"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "0a46de9bfc19fba878104ae2865a092fba7a9eea62a64a31c0decc9fc021b3af"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "2cc4d364852fc987e97f169de9039992d4ecb848125eae38c09bced34aae8653"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "6a722ed42f251e3433d46d9b56ca06f7bc1cf0854de782da10285db6ee4a1bfd"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "14b75dc8278a946d705210306b50a85795f70d83d0527d2c77a60b13662e89e3"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "73e62d2869fb450b4597ec3d65ae3c36ef78984462a158dbf565bbac539b1fa5"; }
-    { locale = "bs"; arch = "linux-i686"; sha256 = "01e02d4a0e140d962e27e4f1a4ec24837c0646e9373f3ce2eb8337437c274ecf"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha256 = "59fef5429b639a52ee113e855a18080870a2f905212dd0e4aefdd838d040133d"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "62f96267e91fb9a8df1c436adb78945f32eb14bccc57e706104ae0547b723682"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "0be231034e076e162b5568a5247da47ca2038011928f89c729fe9a7e139dd922"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "15c8a066fe101a5b9151c96611e2390008ac54a9a1909b9430ed6f440c856920"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "40400da9851782418a12b224b74c3b5c8c112912bb98dc8f368972cc898ea155"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "b9b8d3d4c5160eb1676f6c4531123ec28dc0ca6b51e7dcf20716611f93f1c975"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "6e00d5e5c7e50aa24468b802bd53377d8962b146fed8a8588dd5c8db4162da93"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "760c9d95fe6941847dfd53b254cd662a83f4c9f2d66f84a96b4dd1d3127adbb8"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "e168e7e7e11aabe54f773c960d4c9b9920e15e4ccadef9f728e2016f0240555f"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "e5c6372f3fd732fddfaa31ed3ddc81cf803386d7842e103fddd0685739ea63c7"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "73da0a0c66c18dddf5de7b7dda677cb9cef1e0b3c8cff5e22f48bf743ece8116"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "509b8233c403b629803fb0d67a29f2d6f649627d4b91c592121acd3e2ff62282"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "6089971aa6e19e2cbcb49724e2eea7922d9408936aa8e2d396b8f1966ea81eec"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "451f1a7caea7553fc18e440c2716e1954e7d7ba66f5fbe15cc6954224a36444e"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "d02f4b813cc16b4293f9441bdbdef56acd0a7a510d9edcce223d04270e65f2e4"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "663b7a6300fa46c4e62e7542135ab2632117496a5b0365276ec5ac94183a1d55"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "d50895a71408e74d8b5b1965be279011214c50eba56e0046f360f216326f1135"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "84a5fa00271f90356bbfedb1fdbcc033489d1759fef53c4dda92bd285633ae3d"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "49e55275df9e902bc234fa59b4b614a084d76dc2c256ce6218fa96663cabe2dd"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "dfe926680b0bc5852db920ba8b3e4febecf1ead33d9865568ac69e9494337072"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "83c8480482dd154519d26e43a3f79d32c82f149d81a1c6e8ef98e9511ecbf35a"; }
-    { locale = "eo"; arch = "linux-i686"; sha256 = "a27703068ff3be53e8944c750bde0316414f51ee4c10569018d121db7ec1b705"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha256 = "981462cf59716c17fc0630d0cf12b03e7cc96d72c2d8d33109c1db633895f18a"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "16b2efda57842f29c6f4432cd51296d5e9a709d30f2310e885c786fc68a96e65"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "7b6c8a2bbae8e72ec820df741b8f4a2e162c4b628db8e669a5e85dc190db6c51"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha256 = "ad18bc224500c834a159d91fa568461cbf131edd1b044ae8c97e887b2151e112"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "84c414c64bff02d8e82a4ca4c01e1b4dfae21991ee9a6850203ccbe15469cfe8"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "142db7f0bb92976345aace30d9ba53ab4ba98a47332c3f7ae7372d9d80300781"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "337de34606e018ec5b600d559d928e35c79fb28800c9b5ad28e2defe259f9b58"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha256 = "51cecc939011135842bb51c41cfda0fb4ae53c5180e49bd66a810c243b1d68be"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "cfe309df7412f68abf487c1f9065e6b9d4b4f384254576c8d1098878012e5b53"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "1540b0f0c1d867c87d1e109b4e9ad417be51306c324a03e07706d7e215f7ae4f"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "e7c0e4e61d17164a648ae51bcff92d99f76055a1a6a29dfec6ea12a0359f1285"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "c2c88bf65329b168fde8fe02613eb89069d85da8b2a3114ac647158b8a345055"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "9d10a2f8a0e889a6ebe99bc486cf56cc44535b6f67ce3667ac61e87430a24eea"; }
-    { locale = "fa"; arch = "linux-i686"; sha256 = "21ba5e79f5fbe3c3a8a8a71f8fe9a4280f8e47d4c58070443bbf53305c906175"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha256 = "99d8d2e81e2a8f495d5568d7a9cbbfbcdc8a0e1d67fa297adf8a021988948a80"; }
-    { locale = "ff"; arch = "linux-i686"; sha256 = "3e1812cd98e04fcf575783eafdef2c89739c51e6648f4cd7ba7bed44fbe5f960"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha256 = "cbe37600da8bfdabe683473dbb4f2ccc96beda89a9ca15810432a8fce65a591f"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "ecf982266072b4a15a06b939d4f0cc22c3653982404974baa51871af0e411ab5"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "345b7f038e454e6efd513e923ad2aa0a45d76d846539563bbfc79293ec84a6ec"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "e71b05083a122ef20b5d75481129fa2e3d1e2ac608cea2c5baf7b300a5fbe5df"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "1897112ce462b341abba4c2b1664fbf39b5072a11ea6fb61c66cbfb3336358f0"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "5557347f19ab6d7c90a34bf8a9729d39eb65a02a021040091cc1863e08fb72c9"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "c77b86d5512f8343674248b9b4d31165975f0eeea002313311339ae45d9effe3"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "7a68d7de10abf095fd9240807a6a553b60ba75f3d8edc56afcf5ad1832a05eaf"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "f935b317c5aadd60553f497ceae2cc663dec3729b2fc8e48e6a98d1eb91fe263"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "21bbca4e12b3fa230b879f190d279ba9314090454e0263b65e77dbf8f99dcbf3"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "027630690ecff7ad56f6e992ef243d2a734dac1a3e6365bb22c56a571f938fcb"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "6973787b5136491ef28bb2e10976d49c3717a866ec6fe357a995dbf3179a751c"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "0ca57d72bf11ddf74eb79904be607c479c01f31f11fc0ff567a9ad7beef8067d"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "6f422fdcf2fd514e132b33fa079631a6bd4b12deab17a3463b1f3f1ce3f2f535"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "19cc20d1bd838ebfb8518b8076800cc3255376e4928cf2f37be86258307f1104"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "f8eb56fea0e73c247fc767541bc97cc3556e4db75ad446e01b0978a5c0b11d3f"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "8ee0ae75d179bfec9e081777e9a34fdae72d8d55ade73983fdac433649b596ac"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "bb64fc5285bca12542669ef83bfc465bf593154f9bca2548510f525bde5a55f3"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "52bb0b68a5f282e65d077166a3a0716fe6c9368ab88f6d5e2a8669515bcc000a"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "f36e7b656e5898191801d6e04f3ebef9f9f7080c011dd695ddccfe12c3cb2f6b"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "9c553d5312363980364c6a9a6591fe5e0229668ff1de3a78943af18235098eee"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "e58662111147e836ac404cf7fc9d9e52ac141b204004c813c6b8d180a378af57"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "5aa7dcce6e48dfcb7b8b4f9f48b4bdd496bd606d901896fd37f2a2cd6b4a06bf"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "d352b7d67ebbd5e45f972a804cccbb769f6a79700506297c0808d2f9b0f5ca8d"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "0f7e5cf8306e1fa9b8ab56cdb39b5ca1fe2ff1a3f4ded38e5982bbd842438dde"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "bf057113e03190fbfc6947f24a0fb432f53991f02e56d2b5e8270002cd742d4d"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "aa0fdba0a703f06ab5a6b667448316f9de9729c20602fecaf872d14e43a0b822"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "eb8fc36302a63113e9891f8153aeffc1da4f990f1473d9d779f28df6658bada0"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "6f2262e13a649499a0783922a3f2d85a71727ef37629a529f084590828746bca"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "312f1af8601c24417672383063085f1c588d9301a09ddeef15b8c54e130547ff"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "ed3165767c2a14329869930d2b618a5a795d3c3d34e06cbae0d1694ccdfb0c97"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "7555b6f4aac9bcc270fcd5204d15a3cb7b84cdd845f66cea2fbb843315100107"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "b6c2799434bceda271a004769372dfe416584953be5950fe7125920e4e428737"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "e8606fc60aaf6ba91a2616dc991d268e8099eb8d5d3eb3c19fdeace93c6453a7"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "5da4d4c307d661868ff7076e2fc1d929e9d3b9816be25adeba02bd4f9a56f15b"; }
-    { locale = "kk"; arch = "linux-i686"; sha256 = "f77db4c679c687bd33ed125419666226989ef5da88c2a4c8a81aea0ece602e25"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha256 = "3af207c5e2b6bf089739056f2be6e585529c87d5f142e7100fee55728faaf785"; }
-    { locale = "km"; arch = "linux-i686"; sha256 = "d48c3f0952d354b9c6539d9e333a8e9c359006a25f1ca6a0895f7e3344504f70"; }
-    { locale = "km"; arch = "linux-x86_64"; sha256 = "5bc3f65a205a78b110293df5a94a9bde27a491d61b1f9e340a7fe983c1ee1b3f"; }
-    { locale = "kn"; arch = "linux-i686"; sha256 = "50efbbad9ea231a9281a00dc702d9c6103bfd09b712b45b6809d78a176714897"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha256 = "001f41e86fcf93fd6a714e5ee0450fe8424bbb3ff40cebad29cb233cb0667bca"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "11539b78bc650b19be2d25af10242a61ee043b47a15000f2e07e50df00875e2e"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "a4f0b466c5d544f0abecec8861e1d24132755fff54091a49370414ba27c9cc7f"; }
-    { locale = "lij"; arch = "linux-i686"; sha256 = "eede4d95ac6c7f55b312aaadce690016732bb143f3926c1d1533f64efd7306e8"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha256 = "6900bfd4af3146881cc045eed187b88a58ea0fe3e0ed6acbff034f68f43b5935"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "4cdf1ced9a687daa34235ae82aa439d69e517d5c31b8f61e12615f361440a54a"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "873f75d77adc9c142f64523c199799f7e9b0460ae0252c514fc1caa5ac5dcdb0"; }
-    { locale = "lv"; arch = "linux-i686"; sha256 = "65af6b876aeda23827c57d5886cc67665fe2c3fe93cfc2cc5b614400828b6eb7"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha256 = "1b2f6ef94bb5a1ea999af797e2aa8ff267b4a9945fd0e8afc6c9df12273ce60d"; }
-    { locale = "mai"; arch = "linux-i686"; sha256 = "65fec172ddfce096f367338c8b95b32fb2415655e900f8dc628b8ac660270e48"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha256 = "238a78c2bb240609fd0c777399d3307ef659b95cf4e88ae85700321030000eb7"; }
-    { locale = "mk"; arch = "linux-i686"; sha256 = "e591486c66c9b7175b1ab180e9646976a413338dca225eb50d7db457f95afe98"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha256 = "f8d04696d02b0af221b8642d4780d79a76be68c07096c7f9c5915a9db6d5f768"; }
-    { locale = "ml"; arch = "linux-i686"; sha256 = "19dd334052bd9c98ec9afe7b8e5141728b25d2278b7b946921b031aaedd01b2d"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha256 = "a307739cb6de6f80258c28797125f78fe7746d0edd3182e3716f312f1b0915f8"; }
-    { locale = "mr"; arch = "linux-i686"; sha256 = "c86343db611dbca1b8fac25ea1e9364b30fcd6c31d5c856f699bacf6e4128c3c"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha256 = "b25fd422e6b3b1535fbb8839d04a77dec22dfcc0abf14062f5465c0a5aa5c99c"; }
-    { locale = "ms"; arch = "linux-i686"; sha256 = "e437939df4de54d415224db8fbf6ce9e8ae21fc0402052a72612085c73faa493"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha256 = "5d9051de7a1bdc68018511d38e29658f00c0db113438a3ec84e68fa99b89f760"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "04d0bdd6235a9321d1a5467c48240cbdb790485b580c1b818b048817fae22f49"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "30afe02bd7090929841edc88eadcd745435f64189782d95477568b3b41cb107c"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "83b01feb621cb9c7c64edb125c19aa0765bc2d16b2c20551be12690f835539da"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "c5af070524b828313a5e819f4c446cdc7a72f6bffd62e734bb8752438e5d28ef"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "527c9c2dd61a318c5b6ca5e9b26ee9b81b71ae8d7c23cdab6efee1bb5caaa685"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "6f3d800c347a70c5ed7a8838365599c7401e4805037f5e980865794d395b416a"; }
-    { locale = "or"; arch = "linux-i686"; sha256 = "e5f9ba3ebe3d641b3dd948ec51dd25671327a35e5ee87b274079a8a3ce7a26b1"; }
-    { locale = "or"; arch = "linux-x86_64"; sha256 = "53fea5b84051fea6c247fe2baf9f9d3c87b3f78d4655fc8509068fd60ff3c942"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "dc8d60a3f94da475fea5c1c748c52072f69d4642ea2c3b305e92c56fb3b09324"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "c06eb60b39cef2564e248e3d9dd711b863e46cc6d45803002c641a1335927bdc"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "95cbcf68c03ed83590b6e257003282d710c8dd366fd75bd218880735731ed7d2"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "9f59a86501cbb9d8813fbf5812646e87d400f136f2cca5d791dd5ac0bc4964c9"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "690772121588229f34e9a9d5e6042c56a3fdb9fdcafea53f45a12997cd1d1e53"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "fce60e0a3787a2362bdab4d566766c22a4b4f777d1dde7552e195eefc8fe98b1"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "35a4981bc819fa7cba9e2f73ebb28eafd68b464eacc9da4e3e651882ae8b84bd"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "eb4f25e99cc681a6113f9de016a6993e46575caba84f5cba6195c88379e4e661"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "cef140f0b0c4da31235147871679d009f05aeec3e1b138e56bd6acabf79cb666"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "e6aba016e9909cc43a9ab285ed8cbfc15dadf2cf7bba9c78ba340512dd9bbcc5"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "d159bd682f8db01fea12e25bc0d4c24ef2ffffca07b3c5d64223ae75d6f77d23"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "e82f1ad5461e25c25a8c6db480a733e95b81578ec280e93a52b00b650211a0ac"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "fc2e1166c4d9614bcf9c8ccd01aa157bc229cccbdcd2854bbc52302465d24d75"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "c08fcc4457bad70ff5861168364306753df7f03d7817a52dda8c6aad74bde389"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "78f60d4ba047d323ec2a36e2f8a775d86bb2c00bb671009105f5fe368419366f"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "d9c84c673378721c0bc45e767176b879858ba0feacdeeca503e600567569ad33"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "1bbddd4c07cffc083997d3b43034438eccf8647bd9b078cbca86f63c50c588ae"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "f8278a40b25bd24a951855b633218c8d0884fec7468291d947890f2e98310acb"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "18e9f99de5847e996ab66202e8718d9844f26ffef771a236ae16ee68098853fa"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "bbc818432701696fd140e914943d076e4d11741180a04ea27f4be75ec3558d1c"; }
-    { locale = "son"; arch = "linux-i686"; sha256 = "e1d8c54d8b1149f98adb1b46c4973e01fa76bb132f0df9b0f090c4ead0ec4676"; }
-    { locale = "son"; arch = "linux-x86_64"; sha256 = "a57f3971825a40c8dfce2d987384292f1ad3ebe6a96ff762bc38e69c6ce2889f"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "b452ab04c4bae6079bbdc293bc6c41882dac30ec1b1483340e49d072ecf2ced4"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "b8aaff5e70e7690481a5c22fb2da97ce63de67246217fb106441173573aeb4d9"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "135f60c2012e63622d1a75cab6fd5f686fee71138b1f1f01e367fac0b3b583c8"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "ce464a8ec58fe19e037a26a1b94e346ad314eacbe94232f4b136e0fc7b3919ac"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "937bb415ca95996207c371d111a888f68a24d690db8c31b8c1df530b2b7b30a7"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0ee83de9b3bb77a6e3d1120194700b720d441ee116f9728823c5a78f59d28a10"; }
-    { locale = "ta"; arch = "linux-i686"; sha256 = "fb908dcbc4fa42c6472e4cb5bd9d8ae7c845bbf9965498091b32f7d1669ede24"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha256 = "5c8f1c1c09ff2eccf6becf9136f9da3517fabbb0192f157676962fd3bfd31bb8"; }
-    { locale = "te"; arch = "linux-i686"; sha256 = "5478af8e757d8282993afacd10fc78bc7a207fbdc50705d2d8a665aa98e5f910"; }
-    { locale = "te"; arch = "linux-x86_64"; sha256 = "719945b8d7a945e556137cc3bdc4a8d7ddf5693e4ac49a3884f912ec471da1f5"; }
-    { locale = "th"; arch = "linux-i686"; sha256 = "4f0dfccef932beec90f7de951bb2d454bedc192b376caf25c3ba89ecdb5de9df"; }
-    { locale = "th"; arch = "linux-x86_64"; sha256 = "e14a4cdff4cc89f85043efbf56a82211f1040bc5b369c2113866efb639969017"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "aa5bc43997a6669b1c8da7b04a12c7a16ce8b1fedae8b0bb1a317c83176e88c5"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "3a0a5883b4e4442985fa8e24a80d0849ac450a20d278858e1b3847974cc212f2"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "3ea926ea98fd3506cdcccc32266fd8910f7c6b563818d58fa9708872712daad9"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "c1d596a00831ed30446f8a6f9e7b455329a402939d5c7318616ad182e9564aa5"; }
-    { locale = "uz"; arch = "linux-i686"; sha256 = "d17a26657562ee017388c878867ff43a1d1d86f80c86a18fcf63268b477bd889"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha256 = "7115c30ae7c0528f54aa8629402ddcfc54687e3a439d7a96c18f15e903e283c8"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "37fe2af25d7068569770573e605f3d325e41169b3b0a82ca4ff007a0636b155b"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "5bb2b8a27065b9a71a06dbec136a1774e43fbe27a30a03092f718042d58ec26c"; }
-    { locale = "xh"; arch = "linux-i686"; sha256 = "fa44efebbc0f1174ad10f540668447ddf6bd26a2c918694dd11e63e4d6f36b9c"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha256 = "2c179d4613b0b7456d900f9b6c02a1041c39d4cf98a0ca0ea2ea97d1d7546199"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "e3c06fbffb4b2c135d31499d1a3490d23baedbed5125b46a4153ad9d60ea2fa8"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3402f491b016e791c9f40f8ac5df5f7017dd6dd71d872020a27eae3634e4fb52"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "c77d79a6b1602c9f8c6538be18c974b8557af3ad3898910e1bccfe0a54993207"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "651e4a28750ea9376636293b934cf646b0e6981825a9801fe8bf47785114e34d"; }
+    { locale = "ach"; arch = "linux-i686"; sha256 = "2d0ab9fba584576d67ccb600339efeb5ad7aac1629b2d7865e121825b1a5a6d5"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha256 = "188b9aab64ab1beda84dbe7b36d899210472a3e445dd827b64ca7083ae3c0b32"; }
+    { locale = "af"; arch = "linux-i686"; sha256 = "e6b5fb28e5ad03240f0e156c81db1df16bfaf99a946ffab9672c06d8561de9c3"; }
+    { locale = "af"; arch = "linux-x86_64"; sha256 = "c2856308c9e87bf82f621c5d4c96e9c5a70e5ebb86a8e4ba8ecb4d08c1ae98ec"; }
+    { locale = "an"; arch = "linux-i686"; sha256 = "f138b17a230e9b42b334d3900bebf23156fe1dec1f4ec75f9a3b94348523e241"; }
+    { locale = "an"; arch = "linux-x86_64"; sha256 = "82d24b07dc8d887837e8fbd610c2feb1ff4975917d8a19836ec0d0db56522de8"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "b530e58161331bff3222083298ddc5af0055c6b3337b58b1a4eb1d5d4e348d62"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "67c0e4ce7dfe54d0e4fedb168342ea86a82458e2d3ce6aca78b4497f4e813bfd"; }
+    { locale = "as"; arch = "linux-i686"; sha256 = "f17e991e97e85b981c3191a0becad6df457a29b7042d31a667fd227dadc24e80"; }
+    { locale = "as"; arch = "linux-x86_64"; sha256 = "2d955443b785a65d2f9f914232d521aeb9082b4dead8fedc89cfa29329ab8e2a"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "c9e2784047b58eddfd72c1e56964eea8ac098240436d029665bc940c7b8d8f8d"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "4bd5cc7c34f0a1fc1e2e899942c4ebec6bdab2fbd9e3d331ecc0c67a6f8c16e4"; }
+    { locale = "az"; arch = "linux-i686"; sha256 = "1789f6c5524314df239e4b4beb677adf48ce926a097128e053b352067d13016f"; }
+    { locale = "az"; arch = "linux-x86_64"; sha256 = "4881ccb7521512b4275faa2598efda6bbcc3d7838b6200e79c8fcae358d32c23"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "e9e31e92e0732188f6c4494023de260e5b64e97c56ff07857b290355c50e25f4"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "00ef0cea013cdb8606d8786bb5a21e502a6054ab57b2fad4d24161c47768f418"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "6428fa1d4f2bd0b703f207a1571e425f8076438954f955f60c0e8c1525743823"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "fc156d3d76582c95eb6a0a7ee88dbdbd6c99d46ca42b011e1d789b0552bb5885"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "d0b69158e5ce85eec29dc70c4942bfc76eaf2d8e3359c45de5783d39fe1ccaf0"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "928575b759e4ae89d3e5ee475ffa18c69e945846981102d540de01c9bd87582e"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "a92a902e4380ddda37b8e70922e91ee029d47f866adea53220dd76182c52b596"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "022b9ff7141cd89df35477d357df74556bc4a24639141d21111eccfbf8e2f98c"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "c398c00b98edcaa2618363637075ccf749a4d3567dfdae070b4b0cbe23832f56"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "60f471fdf1b71072751396049f12a198c73d11892ec69fc142f925a12c6515f4"; }
+    { locale = "bs"; arch = "linux-i686"; sha256 = "d9e3c1b5c94ad207071cea86295ef3f98d4bd9201e896f6b9d67a2e475ea2898"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha256 = "2ea3bb1c14a849b5039b633963687629839174ea886d3f8314f67eddafa2b16b"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "bf1c1c3aaa900d66c4684cf48623bb0c9e0313cd919ad0e67e8a2e3ca5987aa6"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "30c0217722c599ed8fc0e713e0b763a01dc0da37dc2f290a2a4d02cb2a86b6a3"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "5ebd809827cdc85da0e6c973855c60426ab98e2cb898c030acd403577d3bb78a"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "a1d55b7c54fd7eb89bcf5dbdadcaea0f5d2da7110a090c424c52a55ae23150f2"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "55df045619bbe01af6f33c6cd563d6097b9c9023ab9133fa7def0800cc9aec83"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "2ddb8bcd515aad4ddb029cf4e5c49e771aa1da14394924c4ec532c5125b7ca7b"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "b322bef3e95b24337f294b2786fc5a819d954adb43f98dee69674d41fd234b5c"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "3e5164351808ef2f8f4e9cea6bb1121c4d3394de56536d17869a56df3b783d3b"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "a404bf7c19dbc65adea8872b8bd080a17417bc0f1ffa3015513d86750b2903a9"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "3590e100bf84f2734d1b3c81508d8fa137fd100bdd1e764ae5da1f88602d5b9d"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "c4be1a5cc431f3aeb26694bfd0749da0dfc85c119f75b551e69083a384042833"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "36f451bb07af47aff7c930a2810ef628e3382f92560efbe396133735275f7075"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "736ee0dffe7c5dc0d5abc7755a83e29da718901252034ee503775fc3f11e31c1"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "1638e1fd69d1887bbfd2de95ffe7945f52934055f8e15eb919d9ccac930959e0"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "1f9c8404fd01c1cac530c0e2b1fb488a2b4f7a02d8c2f0e568e0db050dc66f18"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "4f7491b919ca7a0563cd3444bd4a1abf48a4448ccdd743c5b5eb58584e5b1e94"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "abe3e5d23cf557ee81e7064d6d1b2d3a8f6b6e1a5f80947fc7229f0b2b631380"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "a4b439e28274feb4bf5494ba180143e6b8617428a63d11fa2fd0e650dda41908"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "9de2931e926e0b0667f6916283a7ef019d1c067b29d6bd5b4b903fdf87ad9c17"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "6ada8b6a9a2b19f9515a1aaf63ad66cf35a1ab5491fc8ffc86a17fe1378ab553"; }
+    { locale = "eo"; arch = "linux-i686"; sha256 = "92db868c78ae49a8275d217327ca442ef6733b955ddc5b4940183c9a596da3de"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha256 = "2e8267fb43ba6b7636c98fe386c35ddb9032265565844dcbc90f3dba18a2bc05"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "6343bacb35c929c8f7c5cb554aa0e5f67100032c71bc24203b663409e45cbf40"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "0b5a07e745aab7d1e0bb8bcf0afe12ab71a88679024ef6e9edd53bab7518df7f"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha256 = "7288765c2222624e69b367ab83686c21a348330a8f26eff7c6ea8dca03a3aabf"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "543778259a5d7c4198c8125b72f9e66e9ae98b398bc3b07ac0e103f07ab7ef2c"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "c1aec91c45591eaa6df8b15ba13ea58d15ab2cce20361719ea2549896d26ea1f"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "ee3b11c04ca280ff77e3cedd3dc2040b7b1722384639c02507bedc927c7b558b"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha256 = "8adb9435f57da461150d8b283161760683e46b068eaade916119c2240f0a9c66"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "b624c4345794a22a7c63b4f6b7a1ed6f52472fa5cba4173f69f3c12ee3b4cbe1"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "efb6c6753e8a9d8174e8bd1ae7cbf3f75b479e5da3ebe07dbbbb4ac140e60eb9"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "c84bb0597fa14e8a7a2d086f24d71ad2f3c04b3fca794b76977d1a4cb1aea479"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "d116553c492ec41b811befb35393553b9174da3960034ce5106558befbf9728a"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "16c922f152d5e14c46277e23d30cfe0792c8e9828b8862df603aeff242c7ec96"; }
+    { locale = "fa"; arch = "linux-i686"; sha256 = "744ad5a8cb4473d502d1db50b6bf343e23525927b3a982677dd8a68aea111b3f"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha256 = "968fea07386b96215af400524062447245fa038766caf0b133c932db6f105077"; }
+    { locale = "ff"; arch = "linux-i686"; sha256 = "0fdf06aa42cbd4d031fdad74d8ac9d6056708fc783180d72c5806cc45c5b8eec"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha256 = "bfb65ec25192288b2f04f94bdcc9ce36a40a27c8a1f35f728f932c071b6756ce"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "334c121cbd9a1469996ebc5535d838e3fecfcc419861cc70d5cdeb0cd584d5f5"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "44883a9b819a24bef03c3322681e1b9f3fe61779e382a740900dfc16a5f7db06"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "cd196dff293aabc39156e82deb5163e139a4b0173de92a2ba72df49bb4b0afe5"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "77da207f48d7af908cb5e95767e61a2e6c04f1851e55430820ff8207da172361"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "39e8da569f2a6f67abac7782a938a906c810f8474fbb2c799dd26fb846c82707"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "44dbf644b3f96dd607e5c88eece8aaafd61ec42af9f7ba4c6ed06a272a45fa4a"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "783532acf3967f94232f42c9cd559e288db499c0ff74776543b59d71d281a74c"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "39509082dbeb935f481e95d6038943a17c5053f7001fbf71bdb0edea536adb9d"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "dd73e1bf159f3d437d69306c5daeb7a06c951d6c5841315363c354f9aa1570c5"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "a2fb4aa1ba4a50bdb308e8c12090158c5e040ae85617171786e93852d4f48de5"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "8ac3fd13e0f173aa1dfffd44c91511bd457c6a751daa978fbaae3f9901427cae"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "cf52827a18b400f8c3e426b00e2984bd5835014f3e97e9c1279f0b285ca5a5dc"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "1ef44836085733b52c338fdcaea78e7df5f78a0f0f470b9de3ac7b13e3ec4844"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "374280216142897536979fff6f876253caaf0eeb12a3d12d17b013e7ab3ba722"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "1dcca6ae796da1a1317a4f094f06369242cdf7c0f8ce3df7c9fabd22910996ab"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "e032513a673ba091207996b8a6a6b9da6ef05d5c080a93ed326fc4ac4ca6976a"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "2057287b406513a332d162f03f75ef7ff4c83834809163c8b870d9e5ab3f8cdf"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "8d19043416484c382fc9caec5dff4914fbc28feefd41a089591ef2b21f822a43"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "995a6dd027a5a6b2123c62b74f524db53940e2c8fa6c7254dc41dca236f7889b"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "4410e7d1cbce028de083b82ee68f442d27c2219544ec1be72ef2c274cb7c445a"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "0dcb0de11e35475cab33e11b08b88ff766915d7d98ceeb466a0fee90883ebaed"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "1695167eea386aec4fca23bb0bf4e5b83876a22f8c584f4e81886be229e9a43b"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "31026a26c9fa9b3777c2f9dd1d55da7e0204e4d98586f887b67588ccb86c3843"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "82d8fbe932765f100a116b6d572035297be2f027b4f0e0ba84ef88cb4b651000"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "864c112f13628bd9bc715a6a405dc92c3f8027b0e505722d819b84775fb27066"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "dddd71e651056c373225baab9bb190810f8ed6849abfa76587fcd05cc5060d89"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "3425906d6513d3e06286b9b3c62c30d702a47a3d7a31638a58f926e2fa4a254f"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "095d970add8bf54fc2fb2581532013f4792f648b58fa12d49a6a859f26a0e579"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "f3687eb0e7ce24e14621345543abdf2b92435466ededc98a4ec4a117c4593c3c"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "dbac8774c64e6c978a3eb900cf61d85a210d0c39c28df4a21e4295ba5febd0ea"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "62091c6f5214f4717462d9e2f6bacd7f30417b7e714de3fdec6fc2f703970eb7"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "480b9ffd4326a9a2e2002510027a15d4fdaf8ba1ea023ee6e55b2aa78b119a6c"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "ef143bf31fa67cab3ccafc0083d81ffa8997e3365312b12312623755eb24f48d"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "f74808de8fb999dceb067b3fda64e891c37bde7190e9eff68f1693f5b5feae0d"; }
+    { locale = "kk"; arch = "linux-i686"; sha256 = "a532d49011b632aa83f6b881b39c74bcb66fab0237e3e4f8682445aa0a053d4c"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha256 = "7f32ee329e8281e89472b092248a26e1d38089bdc9830d2d1d0b1af8230ca20b"; }
+    { locale = "km"; arch = "linux-i686"; sha256 = "34ecf596b0870aca2db30513ef5d6522d86caf70fce38b23a7bff08c55551b69"; }
+    { locale = "km"; arch = "linux-x86_64"; sha256 = "6e7efd621e941674038887d1e8d90c36d0ac06a095386caa01d228494228be14"; }
+    { locale = "kn"; arch = "linux-i686"; sha256 = "062ebd6b27ef9094e65e60ad64be30470ed58eb2d92f247a87a781b97e0654d9"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha256 = "e88428b1cd2e1919336dda303d8795bd02e4967ba8c6d2830205f68fa4c528d0"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "6c43a7f86f908cccc7ca3a7ed45f95ea84b69e4a21ff1e1d58136ea19bf7bd2c"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "9db2bfd818d82ee0c9bc35b6fd651ad8fe80f8d73d51326fde25fc4c2aaa295c"; }
+    { locale = "lij"; arch = "linux-i686"; sha256 = "be87fc2a6863f33f9ff9ad2990e1e6425a65002f2ee411a254dde80cbd5a31c4"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha256 = "9cfb239df8195cfa355bc8ddaf63accd865de21086c5bc3180b2ad9886445f3e"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "11e18e6baac8f31c62a301e8ee51056c707ca47332fbeb6f3492e8eaffa25c57"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "3bb4dca607abc4e08300dfa61667d2f2b06661f47cf0029d078e14fa4686d4b8"; }
+    { locale = "lv"; arch = "linux-i686"; sha256 = "bc484992f230229ab4ab6d47fab9664f43341ad1202010f5dea91d2d78200c85"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha256 = "42bdc60ad7edf2ed3e82f765abfc3815f98095adc2988f8d809a8834eada63ef"; }
+    { locale = "mai"; arch = "linux-i686"; sha256 = "628f0685185f91e695af5ce9a536d9263305cfd747683ef33dccd0c90f3e1bfb"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha256 = "688c33b159b4fcd23fb4c6d3a7f845d03929b4a8b02eaa2ebb93682b396c73a2"; }
+    { locale = "mk"; arch = "linux-i686"; sha256 = "a59b2a8ee82513ef78f3509afc4dba75ec3128f0f42c657bbbfbad117b981b36"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha256 = "3058ff9ac581a65ee0713fe3707f8b98eace0f833b8e7b901fa397538e9503f0"; }
+    { locale = "ml"; arch = "linux-i686"; sha256 = "43c80f530ad3eaf7c138e16b23b9eb32afc1f774374fe213f580cf68e4d0e245"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha256 = "43f061317f9eb5a174cd13539bb3972535b552113d38c05d9888e7a37346ef22"; }
+    { locale = "mr"; arch = "linux-i686"; sha256 = "30c0ee68eadffcc95271f1e7c1c1b0151ee21ca3744fad61a723a9a6bfb751b0"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha256 = "d9dd27af41ca021f323499be556d208f69b706aff079c8d7392c7f19092705d8"; }
+    { locale = "ms"; arch = "linux-i686"; sha256 = "adb5e1968c66378ff9b59dc57c00a2c953ad1f54f67e1bc40abc499bcf79653f"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha256 = "3e4b43a88b3aa2887673e1962fa4ccbd895640113e683c849a3c9733677e1fe1"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "f4be0cff21abdc80fba10db2bf781fecfb4e503c70cb95a8b083c5f7123f8dc8"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "e9b191268a6694805a5ba86559e798c9a4e29eae39a7f64dab92a925fb31611d"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "581c73084993be0bf1ab23bb468674d062fb98e99573d823e977a263b4cfaa91"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "3fd8929341ae048187379b7648ec8e008ace53e4a5f0af1421ecabcb5ad3bf61"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "b2104d5895a727903f6a273888989887542ad9e61c998cc651bb24d64efc6cfd"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "1bf582e66da985cbb01c22f865fc291196c55b14d2f84516f68f184ea842a664"; }
+    { locale = "or"; arch = "linux-i686"; sha256 = "1ffbc776fb3ae030e6dedea009b71873bff57f9294e63331404b53e1ba36499c"; }
+    { locale = "or"; arch = "linux-x86_64"; sha256 = "b988f433a238b2cb3766042d911a1f002a5f91a47dbed5b937f70cb59ed060d2"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "6ba4941b5bef7b860194114c2704662a42f9f3007a0b634662e42f38c0aa601a"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "0d9920d4b358cfdcf8cdf4b2d2e07ceb191709eee9dbae4c59f9dbfcfffbf0f5"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "e080fb35bf49f9eb2fc39a435a188164eedf2ea7a24f8e950d62567620a91954"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "cc37624f0c1e82d2de2048129f58e85fe8a518ee4b0ebdbee0a5205517602cf9"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "d19bf65889c686cbb284e697e8ba1315b6ec004b57096725fb576898ef105346"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "0d00d2d0bbc6045117c4df93045f70ebe0468e004504a06dfc508bfca6c6df1f"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "5225afadf2ea62792376dfda1d2b3533d986f1ee3a281781a5be294b8883ac8b"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "0c1d841ba80e32d51d41c99b551e68c6b591e97af4ccee4d7c7d6ef03f8707ea"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "2cc9200a132c967a7158f5422dad8f4b2d90dfc7e46ada305daebabc44806de8"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "0dff628773d4f2e24b767501b9c768586a27e82c0e8b259ef1cc676985ad0125"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "500142fe612fe6144a14ebaad486da04050940a755e205297473c1be6b9dc428"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "f3a57abec8553c8b9d8db9fb5600cd7b6e1189ebf0225df96608eaf2863e41b3"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "1266ed09db881af90794bef049cdfee777d7179026de8c0de2931275f3f288e9"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "0f1b44177633149aaa31574ba3cf343971bd4e11ac6b4bb92a5875b6a30a42af"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "e027afd86b00379c12e014b8d0d11a05811c598f53490edf7070e7acccbf0d79"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "518c19c5351a2c1bd05afe63e9d8c2a0be3a9cedccf7aa1d84d1af9de7ecf7fd"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "e3dcda7406d00166a601b77fbdf0b84181ba5372f760eb08d5476fe9d219caef"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "019c03ecd24f394b0ff76aff5cd9f0db017ffd3b8dd65388c4f5ee3188e77a6c"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "a88391cc29643277f9d8c58a205ac959af825326b61c16361d4def6f7da31235"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "fcf45e13a0bc543988495a83e5e96400707564d2ed4fcd0579219c999ee71e83"; }
+    { locale = "son"; arch = "linux-i686"; sha256 = "a75e273e01df51ffbe2c8666545f1e6f4d00af373d7aac08978947d7afc1e5f4"; }
+    { locale = "son"; arch = "linux-x86_64"; sha256 = "9f28df29d980e6c7467e99b2b81740cb078ce8e6896fe4e2a6b1473770e6bef5"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "2243773d7d38608e17233e1d98e4fc1ca19f40f27a3e87557ad7fbd958c080ba"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "c18faf9d8971c43db18fcc66329a85018a04e8cf4819c4843d826bc86414cadb"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "0cd5e6a3910923aed9a88fafd95bc11263de7359c38685e209212339bb2f50dc"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "1ec48c65323b15332932060ec5193908d89715736bd0abd88472dc05e639a62a"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "6718eb3e71a3d4f5487b80bbd784fd61422345f94d3271f6de6f6feab9e2f6da"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "5b356a6334d424b5e47ea4b1c32403a858ff5dc8727bbc0b2f72e6a29c9b625f"; }
+    { locale = "ta"; arch = "linux-i686"; sha256 = "fdb4e36497a61af9badb848a067eff4e4dada7dfffefbfe6bb7266ad89a8707a"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha256 = "de5f0b871425412f9f261eff5b1abb3ddbd40f588647fd8e174e2d6c5ba17b90"; }
+    { locale = "te"; arch = "linux-i686"; sha256 = "0cc82774a46580c9e2f890848f705b1dc4effac197a902f9d244f0b6f6258650"; }
+    { locale = "te"; arch = "linux-x86_64"; sha256 = "65ceda67a572053dd4d9e15b9bd47c91364651736417414d4ca4a0a7ded9775a"; }
+    { locale = "th"; arch = "linux-i686"; sha256 = "1c0084ed26218713c4606ab073bf09de888051e9dcc49652a87fb58209a8c614"; }
+    { locale = "th"; arch = "linux-x86_64"; sha256 = "5a70e29d282961e27350d26cf164472fe51247db1d7d1228dca693423c32d0a6"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "f7fa2029a36eda63544beebb6534fc2f8432c87d7a8d08d4c8927275e659b686"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "1e3744f5908164e163818522fa902bd57edb62837b2b399983ea5a4ed487cda8"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "0f465eda0f7e87eef88bc17b3e6868ad90a270e6993d327fecca532637442df4"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "6530af36cfab509fff37519b435c7939110c000dbdd94000fe964283a14b1622"; }
+    { locale = "uz"; arch = "linux-i686"; sha256 = "7ee5997bcb4915c3907cee90e350e3bc2b67965975faecffa738a728cf2e12e3"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha256 = "d7b34e36bcb423977a2a7667504c096730ca684c9f2e861b17e8f0174f5bb0d0"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "e9497a8eed98ec34b31e3b1ec7086a4d219121f0edf21fd8f6a01599afa41f12"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "b94fbaee83014b88490bf19cc37dbda87fb9260ed5879be3b688a2abbe709a87"; }
+    { locale = "xh"; arch = "linux-i686"; sha256 = "d5a86db6b9f3bb5162a86f976cbbc01f542a924c05729eb54a2c24dabc711065"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha256 = "d765b2d324e89119fee522ad8972031c8727841c2fa2700d010be7d23633bbbc"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "fb3bbc44952207f42112c291dccb82f02fbd23bba7b54b06a1047809d2bb18d2"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "255d19959cb0e0efbcb2eeceb39b43bbb567ab2474af4da6675574a0110781e1"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "cfc90ac621dc57d7eb922c564aa3a7d5ad7f2aacc95196606d34cba7b7e30d1a"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "ff119be821acb8f99a485a60de506123c76a7a3a13ac678576248f97ff1ab882"; }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 566247fc0d432..834c6ed339cd2 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -133,14 +133,14 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "43.0.4";
-    sha256 = "0xjs4j26h8fyy8izrcc482vfvgg4gqzap5kh17jfv7flhn9akkvn";
+    version = "44.0.2";
+    sha256 = "17id7ala1slb2mjqkikryqjadcsmdzqmkxrrnb5m1316m50qichb";
   };
 
   firefox-esr-unwrapped = common {
     pname = "firefox-esr";
-    version = "38.5.2esr";
-    sha256 = "0xqirpiys2pgzk9hs4s93svknc0sss8ry60zar7n9jj74cgz590m";
+    version = "38.6.1esr";
+    sha256 = "1zyhzczhknplxfmk2r7cczavbsml8ckyimibj2sphwdc300ls5wi";
   };
 
 }
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 8c805b0bf5fe1..91486b608b2c6 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -4,7 +4,7 @@
 , gnash, flashplayer, hal-flash
 , MPlayerPlugin, gecko_mediaplayer, gst_all, xorg, libpulseaudio, libcanberra
 , supportsJDK, jrePlugin, icedtea_web
-, trezor-bridge, bluejeans, djview4
+, trezor-bridge, bluejeans, djview4, adobe-reader
 , google_talk_plugin, fribid, gnome3/*.gnome_shell*/
 }:
 
@@ -41,6 +41,7 @@ let
       ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell
       ++ lib.optional (cfg.enableTrezor or false) trezor-bridge
       ++ lib.optional (cfg.enableBluejeans or false) bluejeans
+      ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
      );
   libs = [ gst_all.gstreamer gst_all.gst-plugins-base ]
          ++ lib.optionals (cfg.enableQuakeLive or false)
diff --git a/pkgs/applications/networking/browsers/links/default.nix b/pkgs/applications/networking/browsers/links/default.nix
deleted file mode 100644
index 8e78a0bd89cba..0000000000000
--- a/pkgs/applications/networking/browsers/links/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "links-1.00pre15";
-  src = fetchurl {
-    url = http://artax.karlin.mff.cuni.cz/~mikulas/links/download/links-1.00pre15.tar.gz;
-    sha256 = "0yzgzc6jm9vhv7rgbj5s9zwxn9fnf4nyap9l6dzgpwsn7m18vprv";
-  };
-}
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 518a4d667dda8..4ea6e619b1752 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.11";
+  version = "2.12";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "0gqjdz1brdcx02mcwchi6bxy1i1ljbw5zpc6b321skrrsqkzkxw7";
+    sha256 = "0knq15yrp60s4jh92aacw8yfc2pcv3bqsw7dba7h5s6ivq8ihhcq";
   };
 
   buildInputs =
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 4311b352ab963..8f34376444575 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marathon-${version}";
-  version = "0.8.1";
+  version = "0.14.1";
 
   src = fetchurl {
     url = "https://downloads.mesosphere.io/marathon/v${version}/marathon-${version}.tgz";
-    sha256 = "1g2z2c8p47rryyappwv0k3najb6bypvwgg7z9z8prvph2x6rafp6";
+    sha256 = "0vdl7jf7yhb985dj3v46qnqjv1zwfkyizlsyf9c5dq7khvxrp1l4";
   };
 
   buildInputs = [ makeWrapper jdk mesos ];
@@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
 
     makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \
       --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \
-      --prefix "MESOS_NATIVE_JAVA_LIBRARY" : "$MESOS_NATIVE_JAVA_LIBRARY"
+      --set "MESOS_NATIVE_JAVA_LIBRARY" "$MESOS_NATIVE_JAVA_LIBRARY"
     '';
 
   meta = with stdenv.lib; {
     homepage = https://mesosphere.github.io/marathon;
     description = "Cluster-wide init and control system for services in cgroups or Docker containers";
     license = licenses.asl20;
-    maintainers = with maintainers; [ rushmorem ];
+    maintainers = with maintainers; [ rushmorem kamilchm ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
index 7773fcaf0c473..5fc770624c210 100644
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/pkgs/applications/networking/davmail/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "davmail-4.7.0";
+  name = "davmail-4.7.1";
   src = fetchurl {
-    url = "mirror://sourceforge/davmail/4.7.0/davmail-linux-x86_64-4.7.0-2408.tgz";
-    sha256 = "1kasnqnvw8icm32m5vbvkpx5im1w4sifiaafb08rw4a1zn8asxv1";
+    url = "mirror://sourceforge/davmail/4.7.1/davmail-linux-x86_64-4.7.1-2416.tgz";
+    sha256 = "c3bf1a3a94f35586a3a8d2d28cdaf8c9514a8cf904a51fd74961e93909c9d2a4";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
deleted file mode 100644
index d29ec7ab8d3b1..0000000000000
--- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-args @ { fetchurl, stdenv, pkgconfig, perl, perlXMLParser, libxml2, openssl, nss, nspr
-, gtkspell, aspell, gettext, ncurses, avahi, dbus, dbus_glib, python
-, libtool, automake, autoconf, gstreamer
-, gtk, glib
-, libXScrnSaver, scrnsaverproto, libX11, xproto, kbproto, ... }: with args;
-/*
-  arguments: all buildInputs
-  optional: purple2Source: purple-2 source - place to copy libpurple from
-    (to use a fresher pidgin build)
-*/
-let
-  externalPurple2 = (lib.attrByPath ["purple2Source"] null args) != null;
-in
-rec {
-  src = fetchurl {
-    url = mirror://sourceforge/funpidgin/carrier-2.5.0.tar.bz2;
-    sha256 = "0m80s7hnvz5vc2dy3xiy1zfb6incmb7p28zahzxdif2vz44riz28";
-  };
-
-  buildInputs = [gtkspell aspell
-    gstreamer startupnotification
-    libxml2 openssl nss nspr
-    libXScrnSaver ncurses scrnsaverproto
-    libX11 xproto kbproto GConf avahi
-    dbus dbus_glib glib python
-    autoconf libtool automake];
-
-  propagatedBuildInputs = [
-    pkgconfig gtk perl perlXMLParser gettext
-  ];
-
-  configureFlags="--with-nspr-includes=${nspr.dev}/include/nspr"
-    + " --with-nspr-libs=${nspr.out}/lib --with-nss-includes=${nss.dev}/include/nss"
-    + " --with-nss-libs=${nss.out}/lib --with-ncurses-headers=${ncurses.dev}/include"
-    + " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl";
-
-  preBuild = fullDepEntry (''
-    export echo=echo
-  '') [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]
-    ++ (lib.optional externalPurple2 "postInstall")
-  ;
-
-  name = "carrier-2.5.0";
-  meta = {
-    description = "PidginIM GUI fork with user-friendly development model";
-    homepage = http://funpidgin.sf.net;
-  };
-} // (if externalPurple2 then {
-  postInstall = fullDepEntry (''
-      mkdir -p $out/lib/purple-2
-      cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
-    '') ["minInit" "defEnsureDir"]; }
-  else {})
-
-
diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index ef6ce6076d949..abe9b78904f0a 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mcabber-${version}";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchurl {
     url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
-    sha256 = "0ckh2l5fbnykzbvdrqjwd1ppalaifb79nnizh8kra2sy76xbqxjl";
+    sha256 = "14rd17rs26knmwinfv63w2xzlkj5ygvhicx95h0mai4lpji4b6jp";
   };
 
   buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
index 7b80ec85661a8..c6801105a84a4 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     description = "Plugin for Pidgin 2.x which implements OTR Messaging";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainters = with maintainers; [ abbradar ];
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
index e03b61b61824b..e4c0697605d60 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainters = with maintainers; [ arobyn ];
+    maintainers = with maintainers; [ arobyn ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
index 149f62bb98161..8022d32a081af 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
     description = "Plugin pack for Pidgin 2.x";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainters = with maintainers; [ bdimcheff ];
+    maintainers = with maintainers; [ bdimcheff ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 7eedd997c1b4d..0dc00d2f3000c 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -30,23 +30,22 @@ in
 stdenv.mkDerivation rec {
   name = "teamspeak-client-${version}";
 
-  version = "3.0.18.1";
+  version = "3.0.18.2";
 
   src = fetchurl {
     urls = [
       "http://dl.4players.de/ts/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
       "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
-      "http://files.teamspeak-services.com/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
     ];
     sha256 = if stdenv.is64bit
-                then "1bc9m2niagqmijmzlki8jmp48vhns041xdjlji9fyqay6l5mx5fw"
-                else "156dirxjys7pbximw19qs7j52my36p4kp98df3kgrsiiv8mz6v68";
+                then "1r0l0jlng1fz0cyvnfa4hqwlszfraj5kcs2lg9qnqvp03x8sqn6h"
+                else "1pgpsv1r216l76fx0grlqmldd9gha3sj84gnm44km8y98b3hj525";
   };
 
   # grab the plugin sdk for the desktop icon
   pluginsdk = fetchurl {
-    url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.0.16.zip";
-    sha256 = "1qpqpj3r21wff3ly9ail4l6b57pcqycsh2hca926j14sdlvpv7kl";
+    url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.0.18.1.zip";
+    sha256 = "108y52mfg44cnnhhipnmrr0cxh7ram5c2hnchxjkwvf5766vbaq4";
   };
 
   buildInputs = [ makeWrapper less which unzip ];
diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index 26a7eb49279ba..507094f7c055f 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "Telegram client forked from sigram";
     homepage = "http://aseman.co/en/products/cutegram/";
     license = licenses.gpl3;
-    maintainer = [ maintainers.profpatsch ];
+    maintainers = [ maintainers.profpatsch ];
   };
 
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
index 3149ac3279af3..8166514bb3ac5 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "A fork of libqtelegram by Aseman, using qmake";
     homepage = src.meta.homepage;
     license = stdenv.lib.licenses.gpl3;
-    maintainer = [ maintainers.profpatsch ];
+    maintainers = [ maintainers.profpatsch ];
   };
 
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
index b51f8435ce13d..6bf550d4766bf 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Telegram API tools for QtQml and Qml";
     homepage = src.meta.homepage;
     license = stdenv.lib.licenses.gpl3;
-    maintainer = [ maintainers.profpatsch ];
+    maintainers = [ maintainers.profpatsch ];
   };
 
 }
diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix
index 4841aa8070e0a..6bbe9c6c1401e 100644
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
+{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
 
-let
-  rev = "640e98c74b";
-in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "irssi-otr-20131007-${rev}";
-  
-  src = fetchurl {
-    url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}";
-    name = "${name}.tar.gz";
-    sha256 = "0d08ianzhy20w0ld8xx7hgrp9psg54l37619pcdpqyrnlzkkdalz";
+  name = "irssi-otr-${version}";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "cryptodotis";
+    repo = "irssi-otr";
+    rev = "4ad3b7b6c85be0154ab3694fe9831796db20c4fe";
+    sha256 = "1hm1whx1wzlx4fh4xf2y68rx9x6whi8bsbrhd6hqjhskg5msssrg";
   };
 
   patchPhase = ''
@@ -22,7 +21,7 @@ stdenv.mkDerivation rec {
   preConfigure = "sh ./bootstrap";
 
   buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ];
-  
+
   meta = {
     homepage = https://github.com/cryptodotis/irssi-otr;
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 5b3eb2326c5a7..86bf0b2e14b80 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -30,10 +30,9 @@
 
 with stdenv.lib;
 
-let version = "3.13.1"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "claws-mail-${version}";
+  version = "3.13.2";
 
   meta = {
     description = "The user-friendly, lightweight, and fast email client";
@@ -45,7 +44,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
-    sha256 = "049av7r0xhjjjm1p93l2ns3xisvn125v3ncqar23cqjzgcichg5d";
+    sha256 = "1l8ankx0qpq1ix1an8viphcf11ksh53jsrm1xjmq8cjbh5910wva";
   };
 
   patches = [ ./mime.patch ];
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 8948ca22ee933..cd6f504465f46 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -6,14 +6,14 @@
 }:
 
 let pname = "liferea";
-    version = "1.10.17";
+    version = "1.10.18";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "0svgl50w3hai31n5sm42sl0cd86c32cka0xzfy4r8gi0lyjdjxyx";
+    sha256 = "0wpinar2cxyzq2j7ff7lznc08f0n6qjdm9aavsarbgdpaf2s1xvq";
   };
 
   buildInputs = with gst_all_1; [
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
+  patches = [ ./liferea-fix-notification-header-location.patch ];
+
   preFixup = ''
     for f in "$out"/bin/*; do
       wrapProgram "$f" \
diff --git a/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch b/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch
new file mode 100644
index 0000000000000..3cd322460b08f
--- /dev/null
+++ b/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch
@@ -0,0 +1,12 @@
+diff -Naur a/src/notification/libnotify.c b/src/notification/libnotify.c
+--- a/src/notification/libnotify.c	2016-01-28 19:33:19.000000000 +0100
++++ b/src/notification/libnotify.c	2016-02-01 19:20:39.167580131 +0100
+@@ -40,7 +40,7 @@
+ #include "ui/feed_list_view.h"
+ #include "ui/ui_tray.h"
+ 
+-#include "notification/notification.h"
++#include "../notification.h"
+ 
+ static gboolean supports_actions = FALSE;
+ static gboolean supports_append  = FALSE;
diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix
new file mode 100644
index 0000000000000..05333f67ecfab
--- /dev/null
+++ b/pkgs/applications/networking/nntp-proxy/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "nntp-proxy-${version}";
+  version = "2014-01-06";
+
+  src = fetchFromGitHub {
+    owner = "nieluj";
+    repo = "nntp-proxy";
+    rev = "0358e7ad6c4676f90ac5074320b16e1461b0011a";
+    sha256 = "0jwxh71am83fbnq9mn06jl06rq8qybm506js79xmmc3xbk5pqvy4";
+  };
+
+  buildInputs = [ libconfig pkgconfig libevent openssl ];
+
+  installFlags = "INSTALL_DIR=\${out}/bin/";
+
+  preInstall = ''
+    mkdir -p $out/bin
+    substituteInPlace Makefile \
+      --replace /usr/bin/install $(type -P install)
+  '';
+
+  meta = {
+    description = "Simple NNTP proxy with SSL support";
+    homepage = https://github.com/nieluj/nntp-proxy;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.fadenb ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 2523c4459ece3..056d28eb3cd8d 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -24,22 +24,22 @@
 
 stdenv.mkDerivation rec {
   name = "citrix-receiver-${version}";
-  version = "13.2.1";
-  homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-1321.html;
+  version = "13.3.0";
+  homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
 
   prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
 
   src = requireFile rec {
-    name = "${prefixWithBitness}-${version}.328635.tar.gz";
+    name = "${prefixWithBitness}-${version}.344519.tar.gz";
     sha256 =
       if stdenv.is64bit
-      then "3a11d663b1a11cc4ebb3e3595405d520ec279e1330462645c53edd5cc79d9ca0"
-      else "0yjw8q8mh4adns2i04m4p273vb4ifakixal7yi3hnbg43b36wfaw";
+      then "11l0s4f1si43qlxai053ps4nks7v4bahipsmcdpnrdzq0vps17ls"
+      else "0sbgkb9a3ss2n08lal7qk8pmxyqbvkm7jj7l995ddjaa6jbkr3fz";
     message = ''
       In order to use Citrix Receiver, you need to comply with the Citrix EULA and download
       the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
 
-      ${homepage}#ctx-dl-eula
+      ${homepage}
 
       Once you have downloaded the file, please use the following command and re-run the
       installation:
diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix
index fad7ef90ceb57..956391b71f864 100644
--- a/pkgs/applications/networking/remote/ssvnc/default.nix
+++ b/pkgs/applications/networking/remote/ssvnc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, imake, zlib, jdk, libX11, libXt, libXmu
-, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk }:
+, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk, perl }:
 
 stdenv.mkDerivation rec {
   name = "ssvnc-${version}";
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/lib/ssvnc/util/ssvnc.tcl
+    sed -i -e 's|/usr/bin/perl|${perl}/bin/perl|' $out/lib/ssvnc/util/ss_vncviewer
   '';
 
   meta = {
diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix
index df6eabbcff0b1..3c2348bfa8b7c 100644
--- a/pkgs/applications/office/gnucash/2.6.nix
+++ b/pkgs/applications/office/gnucash/2.6.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, libxml2, libxslt, perl, perlPackages, gconf, guile
 , intltool, glib, gtk, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
 , webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file
-, gettext, swig, slibGuile, enchant, bzip2, isocodes
+, gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers
 }:
 
 /*
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
     perl perlPackages.FinanceQuote perlPackages.DateManip
     # guile
     guile slibGuile
+    # database backends
+    libdbi libdbiDrivers
     # build
     makeWrapper
   ];
@@ -41,8 +43,14 @@ stdenv.mkDerivation rec {
   patchShebangs ./src
   '';
 
-  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking";
-
+  configureFlags = [
+    "CFLAGS=-O3"
+    "CXXFLAGS=-O3"
+    "--enable-dbi"
+    "--with-dbi-dbd-dir=${libdbiDrivers}/lib/dbd/"
+    "--enable-ofx"
+    "--enable-aqbanking"
+  ];
 
   postInstall = ''
     # Auto-updaters don't make sense in Nix.
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 7b4b20e897f44..d9505c17e8def 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -12,14 +12,14 @@ let
     then "i386"
     else "amd64";
 
-  shortVersion = "1.15.2-stable";
+  shortVersion = "1.15.3-stable";
 
   version = "${shortVersion}_${arch}";
 
   url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
   sha256 = if stdenv.system == arch32
-    then "64e72b5749ea54f75cb0400732af68d1044037c6233a6bc0ba7a560acd3503cb"
-    else "cd13e39ad665b243fa5ca04c30cdc4c7da3ddaa259ea1af8fd1ff60f85f4eb25";
+    then "7d0737eb28cb4238fafdd6cf973ad899dd6a7622bc1a5c44f32a9c1790eaf6af"
+    else "0hvvyvbkbz8hg8s532rrrcv7jf07zh4axjzk18bvr6p9cgcdirl8";
 
   deps = [
     gcc.cc
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index 97534b0ddd36c..98b71b7f5007e 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -2,22 +2,22 @@
 # nettools needed for hostname
 
 let
-  dirname = "Isabelle2014";
+  dirname = "Isabelle2015";
   theories = ["HOL" "FOL" "ZF"];
 in
 
 stdenv.mkDerivation {
-  name = "isabelle-2014";
+  name = "isabelle-2015";
   inherit dirname theories;
 
   src = if stdenv.isDarwin
     then fetchurl {
-      url = http://isabelle.in.tum.de/website-Isabelle2014/dist/Isabelle2014_macos.tar.gz;
-      sha256 = "1aa3vz2nnkkyd4mlsqbs69jqfxlll5h0k5fj9m1j9wqiddqwvwcf";
+      url = http://isabelle.in.tum.de/dist/Isabelle2015.dmg;
+      sha256 = "1vhm10qc1rn3wy9r12clrl33p64h3q1aj41mcnxkbnsyg2bx03im";
     }
     else fetchurl {
-      url = http://isabelle.in.tum.de/website-Isabelle2014/dist/Isabelle2014_linux.tar.gz;
-      sha256 = "0z81pwwllavka4r57fx6yi9kbpbb9xbanp8dsjix49qpyj2a72jy";
+      url = http://isabelle.in.tum.de/dist/Isabelle2015_linux.tar.gz;
+      sha256 = "13kqm458d8mw7il1zg5bdb1nfbb869p331d75xzlm2v9xgjxx862";
     };
 
   buildInputs = [ perl polyml ]
@@ -32,12 +32,13 @@ stdenv.mkDerivation {
       --replace /usr/bin/env $ENV
     substituteInPlace lib/Tools/install \
       --replace /usr/bin/env $ENV
+    sed -i 's|isabelle_java java|${java}/bin/java|g' lib/Tools/java
     substituteInPlace etc/settings \
       --subst-var-by ML_HOME "${polyml}/bin" \
       --subst-var-by PROOFGENERAL_HOME "${proofgeneral}/share/emacs/site-lisp/ProofGeneral"
     substituteInPlace contrib/jdk/etc/settings \
       --replace ISABELLE_JDK_HOME= '#ISABELLE_JDK_HOME='
-    substituteInPlace contrib/polyml-5.5.2-1/etc/settings \
+    substituteInPlace contrib/polyml-*/etc/settings \
       --replace 'ML_HOME="$POLYML_HOME/$ML_PLATFORM"' \
                 "ML_HOME=\"${polyml}/bin\""
   '';
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index f3c0a7917cf30..f3cd8ab692717 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -1,90 +1,48 @@
-x@{builderDefsPackage
-  , yap, tcsh, perl, patchelf, pkgsi686Linux
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    ["pkgsi686Linux"];
+{ stdenv, fetchurl, yap, tcsh, perl, patchelf }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="TPTP";
-    version="6.1.0";
-    name="${baseName}-${version}";
-    urls=
-    [
-    "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"
-    "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz"
+stdenv.mkDerivation rec {
+  name = "TPTP-${version}";
+  version = "6.3.0";
+
+  src = fetchurl {
+    url = [
+      "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"
+      "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz"
     ];
-    hash="054p0kx9qh619ixslxpb4qcwvcqr4kan154b3a87b546b78k7kv4";
-  };
-in
-rec {
-  src = a.fetchurl {
-    urls = sourceInfo.urls;
-    sha256 = sourceInfo.hash;
+    sha256 = "17wl80mnm91jp3npdjzfbb8ds45f2gni250jlfw0d91i1476wcl3";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ tcsh yap perl patchelf ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["goTarget" "doUnpack" "fixPlace" "setVars" "installScripts" 
-    "patchBinaries" "makeLinks"];
+  installPhase = ''
+    sharedir=$out/share/tptp
 
-  goTarget = a.fullDepEntry ''
-    mkdir -p "$out"/share/
-    cd "$out"/share/
-  '' ["defEnsureDir" "minInit"];
+    mkdir -p $sharedir
+    cp -r ./ $sharedir
 
-  fixPlace = a.fullDepEntry ''
-    cd ..
-    mv TPTP-* tptp
-    cd tptp
-  '' ["minInit" "doUnpack"];
-
-  setVars = a.noDepEntry ''
-    export TPTP="$PWD"
-  '';
+    export TPTP=$sharedir
 
-  installScripts = a.fullDepEntry ''
-    tcsh "$out/share/tptp/Scripts/tptp2T_install" -default
+    tcsh $sharedir/Scripts/tptp2T_install -default
 
-    sed -e 's@^ */bin/@@' -i TPTP2X/*
+    substituteInPlace $sharedir/TPTP2X/tptp2X_install --replace /bin/mv mv
+    tcsh $sharedir/TPTP2X/tptp2X_install -default
 
-    tcsh "$out/share/tptp/TPTP2X/tptp2X_install" -default
-  '' ["addInputs"];
+    patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $sharedir/Scripts/tptp4X
 
-  makeLinks = a.fullDepEntry ''
-    mkdir -p "$out/bin"
-    ln -s "../share/tptp/TPTP2X/tptp2X" "$out/bin"
-    ln -s "../share/tptp/Scripts/tptp2T" "$out/bin"
-    ln -s "../share/tptp/Scripts/tptp4X" "$out/bin"
-  '' ["defEnsureDir" "minInit"];
+    mkdir -p $out/bin
+    ln -s $sharedir/TPTP2X/tptp2X $out/bin
+    ln -s $sharedir/Scripts/tptp2T $out/bin
+    ln -s $sharedir/Scripts/tptp4X $out/bin
+  '';
 
-  patchBinaries = a.fullDepEntry ''
-    patchelf --set-interpreter "${pkgsi686Linux.glibc.out}"/lib/ld-linux.so.* \
-      "Scripts/tptp4X"
-  '' ["addInputs"];
-      
-  meta = {
+  meta = with stdenv.lib; {
     description = "Thousands of problems for theorem provers and tools";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    # A GiB of data. Installation is unpacking and editing a few files.
+    maintainers = with maintainers; [ raskin gebner ];
+    # 6.3 GiB of data. Installation is unpacking and editing a few files.
     # No sense in letting Hydra build it.
     # Also, it is unclear what is covered by "verbatim" - we will edit configs
     hydraPlatforms = [];
-    license = "verbatim-redistribution";
+    platforms = platforms.all;
+    license = licenses.unfreeRedistributable;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://tptp.org/";
-    };
-  };
-}) x
-
+}
diff --git a/pkgs/applications/science/math/content/default.nix b/pkgs/applications/science/math/content/default.nix
deleted file mode 100644
index 48e20d427d15b..0000000000000
--- a/pkgs/applications/science/math/content/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-a @ { mesa, lesstif, libX11, libXaw, xproto, libXt, libSM, libICE, libXmu, libXext, libXcursor, ... } :
-let
-  fetchurl = a.fetchurl;
-
-  version = "1.5";
-  buildInputs = with a; [
-    mesa lesstif libX11 libXaw xproto libXt libSM libICE
-      libXmu libXext libXcursor
-  ];
-in
-rec {
-  srcNcbiStdH = fetchurl {
-    url = "http://www.math.uu.nl/people/kuznet/CONTENT/src/unix/ncbistd.h";
-    sha256 = "1zi3l53b0a7d3620rhxvh1jn7pz3ihl1mxl9qqw86xkmhm4q7xf3";
-  };
-
-  srcVibrant = fetchurl {
-    url = "http://www.math.uu.nl/people/kuznet/CONTENT/src/unix/vibrant.tar.gz";
-    sha256 = "1s0vsa0np3sm7jh3ps3f1sf4j64v0kw4hqasllpxx5hdgxwd8y25";
-  };
-
-  srcContent = fetchurl {
-    url = "http://www.math.uu.nl/people/kuznet/CONTENT/src/unix/content_${version}.tar.gz";
-    sha256 = "0y0dzr1d3jgbd53729jk6s2wpb5hv54xwbdird4r0s15bznpm6fs";
-  };
-
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["unpackTarballs"
-    "setPlatform" "extraVars"
-    "buildVibrant" "buildContent"
-    "install"];
-
-  unpackTarballs = a.fullDepEntry (''
-    mkdir content
-    cd content
-    mkdir vibrant
-    tar -xvf ${srcVibrant} -C vibrant
-    tar -xvf ${srcContent} -C .
-    sed -e s/SGI=/SGI=no/ -i content/makefile_v
-  '') ["minInit"];
-
-  platformTLAContent = if a.stdenv.isLinux then "LIN" else
-    throw "Three-letter code for the platform is not known";
-
-  platformTLAVibrant = if a.stdenv.isLinux then "lnx" else
-    throw "Three-letter code for the platform is not known";
-
-  setPlatform = a.fullDepEntry (''
-    sed -e 's/${platformTLAContent}=no/${platformTLAContent}=/' -i content/makefile_v
-  '') ["minInit" "unpackTarballs"];
-
-  extraVars = a.noDepEntry ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lXcursor"
-  '';
-
-  buildVibrant = a.fullDepEntry (''
-    cd vibrant/build
-    
-    export LCL=${platformTLAVibrant}
-    make copy
-    for i in *.c; do gcc $i -c -DWIN_MOTIF -I. -I../include; done
-    sh ../make/viball.${platformTLAVibrant}
-
-    cd ../..
-  '') ["addInputs" "unpackTarballs"];
-
-  buildContent = a.fullDepEntry (''
-    cd content 
-
-    export PATH=$PATH:$PWD/victor:$PWD/yuri
-    make -f makefile_v unix
-    
-    cd ..
-  '') ["addInputs" "buildVibrant" "setPlatform"];
-
-  install = a.fullDepEntry (''
-    mkdir -p $out/share/${name}/build-snapshot $out/bin $out/lib $out/share/${name}/doc
-    find . -name '*.o' -exec cp '{}' $out/lib ';'
-    find . -name '*.so' -exec cp '{}' $out/lib ';'
-    find . -name '*.txt' -exec cp '{}' $out/share/${name}/doc ';'
-    find . -name '*.hlp' -exec cp '{}' $out/share/${name}/doc ';'
-    find . -perm -0100 -a ! -name '*.*' -exec cp '{}' $out/bin ';'
-    cp -r . $out/share/${name}/build-snapshot
-  '') ["buildContent" "defEnsureDir" "minInit"];
-      
-  name = "content-" + version;
-  meta = {
-    description = "A tool for analysis of dynamical systems";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = a.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 0e43972fab6a9..e9de202a8092f 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -11,9 +11,6 @@ stdenv.mkDerivation {
   patches = [ ./getcwd-chroot.patch ];
 
   preConfigure = ''
-    # Fix location of info and man directories.
-    configureFlags="--infodir=$out/share/info --mandir=$out/share/man"
-
     # Apply the Debian patches.
     for p in "debian/patches/"*; do
       echo "applying \`$p' ..."
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 0557b8a2c55e5..d692912932046 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich
-, guiSupport ? false, tk ? null, hg-crecord ? null, curses
+, guiSupport ? false, tk ? null, curses
 , ApplicationServices, cf-private }:
 
 let
@@ -37,13 +37,6 @@ stdenv.mkDerivation {
       WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\"
                 --set HG \"$out/bin/hg\"
                 --prefix PATH : \"${tk}/bin\" "
-    '') + (stdenv.lib.optionalString (hg-crecord != null)
-    ''
-      mkdir -p $out/etc/mercurial
-      cat >> $out/etc/mercurial/hgrc << EOF
-      [extensions]
-      crecord=${hg-crecord}/${python.sitePackages}/crecord
-      EOF
     '') +
     ''
       for i in $(cd $out/bin && ls); do
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
new file mode 100644
index 0000000000000..154d6442a2f2d
--- /dev/null
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -0,0 +1,44 @@
+{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, graphviz_2_0, makeWrapper}:
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "monotone-viz-${version}";
+
+  buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper];
+  src = fetchurl {
+    url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz";
+    sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";
+  };
+
+  prePatch="ln -s . a; ln -s . b";
+  patchFlags = ["-p0"];
+  patches = [
+    (fetchurl {
+      url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-dot.patch";
+      sha256 = "0risfy8iqmkr209hmnvpv57ywbd3rvchzzd0jy2lfyqrrrm6zknw";
+    })
+    (fetchurl {
+      url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-new-stdio.patch";
+      sha256 = "16bj0ppzqd45an154dr7sifjra7lv4m9anxfw3c56y763jq7fafa";
+    })
+    (fetchurl {
+      url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-typefix.patch";
+      sha256 = "1gfp82rc7pawb5x4hh2wf7xh1l1l54ib75930xgd1y437la4703r";
+    })
+  ];
+
+  preConfigure = ''
+    configureFlags="$configureFlags --with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"
+  '';
+
+  postInstall = ''
+    wrapProgram "$out/bin/monotone-viz" --prefix PATH : "${graphviz_2_0}/bin/"
+  '';
+
+  meta = {
+    inherit version;
+    description = ''Monotone ancestry visualiser'';
+    license = stdenv.lib.licenses.gpl2Plus ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/version-management/monotone-viz/mtn-head.nix b/pkgs/applications/version-management/monotone-viz/mtn-head.nix
deleted file mode 100644
index eb75b45128e3a..0000000000000
--- a/pkgs/applications/version-management/monotone-viz/mtn-head.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-args @ { graphviz, pkgconfig, autoconf, automake, libtool, glib, gtk, ... }: with args;
-rec {
-  srcDrv = fetchmtn {
-    name = "monotone-viz-mtn-checkout";
-    dbs = ["monotone.mtn-host.prjek.net"];
-    selector = "c3fdb3af1c7c89989c7da8062bb62203f2aaccf0";
-    branch = "net.venge.monotone-viz.new-stdio";
-    sha256 = "661c6a49d442b7e5a7ba455bb9a892e7e12b3968c2ddd69375e7bd0cd0b3ecb9";
-  };
-  src = srcDrv + "/";
-
-  buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib
-    pkgconfig autoconf automake libtool];
-  configureFlags = ["--with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doAutoconf" "doPatch" "doConfigure" "doMakeInstall"];
-
-  doAutoconf = fullDepEntry(''
-    aclocal -I .
-    autoconf -I .
-  '') ["minInit" "addInputs" "doUnpack"];
-
-  name = "monotone-viz-mtn-head";
-  meta = {
-    description = "Monotone commit tree visualizer";
-    maintainers = [args.lib.maintainers.raskin];
-  };
-  passthru = {
-    inherit srcDrv;
-  };
-}
-
diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix
index 68bef621bc28c..551a5795d11b3 100644
--- a/pkgs/applications/version-management/mr/default.nix
+++ b/pkgs/applications/version-management/mr/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  version = "1.20150503";
+  version = "1.20160123";
   name = "mr-${version}";
 
   src = fetchurl {
     url = "https://github.com/joeyh/myrepos/archive/${version}.tar.gz";
-    sha256 = "12cf8kmn13446rszmah5wws5p2k2gjp6y4505sy1r14qnahf4qbf";
+    sha256 = "1723cg5haplz2w9dwdzp6ds1ip33cx3awmj4wnb0h4yq171v5lqk";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index 778ae995f3de0..420031a810193 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   name = "smartgithg-${version}";
-  version = "7_0_2";
+  version = "7_1_0";
 
   src = fetchurl {
-    url = "http://www.syntevo.com/downloads/smartgit/smartgit-generic-${version}.tar.gz";
-    sha256 = "1jpi424aqy6niq31j750rgbspwii013c8kbi965i4jzjpba1pagi";
+    url = "http://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz";
+    sha256 = "0nlv2ipmv3z1j4642gfsrpsgc2y4mxngiz6mz3nidrbrkz0ylsvy";
   };
 
   buildInputs = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     install_freedesktop_items = ./install_freedesktop_items.sh;
     runtime_paths = lib.makeSearchPath "bin" [
       jre
-      git mercurial subversion
+      #git mercurial subversion # the paths are requested in configuration
       which
     ];
     runtime_lib_paths = lib.makeLibraryPath [
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index 5164ed6a9b44e..ebc0906fc6bb3 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,6 +1,9 @@
-args @ { makeWrapper, python, ... }: with args;
-let version = if args ? version then args.version else "0.9.35"; in
-rec {
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "tailor-${version}";
+  version = "0.9.35";
+
   src = fetchurl {
     urls = [
       "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz"
@@ -9,13 +12,6 @@ rec {
     sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh";
   };
 
-  buildInputs = [python makeWrapper];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
-
-  name = "tailor-" + version;
   meta = {
     description = "Version control tools integration tool";
   };
diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix
deleted file mode 100644
index be8cc83c30088..0000000000000
--- a/pkgs/applications/version-management/viewmtn/0.10.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-args @ { monotone, cheetahTemplate, highlight, ctags, makeWrapper, graphviz, which, python, ... }: with args;
-rec {
-  src = fetchurl {
-    url = http://viewmtn.1erlei.de/downloads/viewmtn-0.10.tgz;
-    sha256 = "1c6y708xaf6pds1r6l00q7vpgfagfbnf95kqj168vw3xr3l8a4yx";
-  };
-
-  buildInputs = [python flup highlight monotone 
-    cheetahTemplate makeWrapper graphviz which];
-  configureFlags = [];
-  makeFlags = ["PREFIX=$out"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doInstall" 
-    (doPatchShebangs "$out/bin")
-    (makeManyWrappers "$out/bin/*" 
-      (pythonWrapperArguments + preservePathWrapperArguments)) 
-  ];
-      
-  doInstall = fullDepEntry (''
-    for i in dot mtn highlight; do 
-        sed -e "s@/usr/bin/$i@$(which $i)@" -i config.py.example
-    done
-    sed -e "s@'templates/'@'$out/share/viewmtn/templates/'@" -i config.py.example
-
-    fullOut=$(toPythonPath $out)
-    
-    mkdir -p $fullOut
-    mkdir -p $out/bin
-    mkdir -p $out/share/viewmtn
-    
-    cp -r * $fullOut
-    cp $fullOut/viewmtn.py $out/bin
-    
-    ln -s $fullOut/{AUTHORS,ChangeLog,INSTALL,LICENSE,README,TODO,config.py.example} $out/share/viewmtn
-    ln -s $fullOut/templates $out/share/viewmtn/
-    ln -s $fullOut/static $out/share/viewmtn/
-  '') ["minInit" "defEnsureDir" "addInputs" "doUnpack"];
-
-  name = "viewmtn-0.10";
-  meta = {
-    description = "Monotone web interface";
-  };
-}
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 2c2a26cc972c2..93a52578db3a1 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -18,13 +18,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "0.12.1";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "0n5bpjgdk3gi0xghfhphiyh5r1q1yksaz34as306i051y01shzl6";
+    sha256 = "00dx8lksj10n0qhyar41y5q0bdrz7jdjwmhj8bdyz7jfkijjr44i";
   };
 
   nativeBuildInputs = [ cmake
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 5566d1aafe5ab..ef2ac275c1f75 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   version = "2.2.1";
 
   src = fetchurl {
-    url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz";
+    url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
     sha256 = "1jqzrzrpw6932lbkf863xk8cfmn4z2ngbxz7w8ggmh4f6xz9sgal";
   };
 
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 54c9ed7b1ab2b..14d0fd566d85c 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -11,13 +11,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker";
     rev = "v${version}";
-    sha256 = "1mhi4y820h2wxz6hqmr95c7yvklyw578dd9c83jr463w7rq0rgr6";
+    sha256 = "0c3a504gjdh4mxvifi0wcppqhd786d1gxncf04dqlq3l5wisfbbw";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 43228b255a240..ca7400c9f4a47 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, squashfsTools,
+{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, trousers, squashfsTools,
   cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }:
 
 let
@@ -9,7 +9,7 @@ let
   stage1Flavours = [ "coreos" "fly" "host" ];
 
 in stdenv.mkDerivation rec {
-  version = "0.15.0";
+  version = "1.0.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
       rev = "v${version}";
       owner = "coreos";
       repo = "rkt";
-      sha256 = "1pw14r38p8sdkma37xx0yy3zx5yxqc12zj35anmlbmrgw4vdgavf";
+      sha256 = "1m76hzx550dh35jpb8m46ks04ac3dfy4rg054v035rpwgh50ac6h";
   };
 
   stage1BaseImage = fetchurl {
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    autoreconfHook go file git wget gnupg1 squashfsTools cpio acl systemd
+    autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd
     makeWrapper
   ];
 
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index b096375f20502..449ec9989fa6f 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "3.5.7";
+  version = "3.5.8";
 in with luaPackages;
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url    = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
-    sha256 = "ba7f92b0ab8b729c569b19b098b0a08339d8654e3c040d07ad02cf99641ceecf";
+    sha256 = "1iifcyphgibmh3cvsy8agjrl9zjl80scrg0bcgnwywmxaxncjc3w";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
index be2586c9e270b..b715b3a4cf31b 100644
--- a/pkgs/applications/window-managers/compton/git.nix
+++ b/pkgs/applications/window-managers/compton/git.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
       additional features, such as additional effects, and a fork at a
       well-defined and proper place.
     '';
-    maintainer = maintainers.ertes;
+    maintainers = maintainers.ertes;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 8cd7932a8d1b1..0833fde8c9e2f 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
 , xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl
 , xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
-, xorgserver, xvfb_run }:
+, xorgserver, xvfb_run, dmenu, i3status }:
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
@@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
+  postFixup = ''
+    substituteInPlace $out/etc/i3/config --replace dmenu_run ${dmenu}/bin/dmenu_run
+    substituteInPlace $out/etc/i3/config --replace "status_command i3status" "status_command ${i3status}/bin/i3status"
+    substituteInPlace $out/etc/i3/config.keycodes --replace dmenu_run ${dmenu}/bin/dmenu_run
+    substituteInPlace $out/etc/i3/config.keycodes --replace "status_command i3status" "status_command ${i3status}/bin/i3status"
+  '';
+
   # Tests have been failing (at least for some people in some cases)
   # and have been disabled until someone wants to fix them. Some
   # initial digging uncovers that the tests call out to `git`, which
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index 97b200e340e21..1693e7ed0fd40 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -1,18 +1,17 @@
-{ fetchurl, stdenv, confuse, yajl, alsaLib, wirelesstools
+{ fetchurl, stdenv, confuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig
   }:
 
 stdenv.mkDerivation rec {
-  name = "i3status-2.9";
+  name = "i3status-2.10";
 
   src = fetchurl {
     url = "http://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "1qwxbrga2fi5wf742hh9ajwa8b2kpzkjjnhjlz4wlpv21i80kss2";
+    sha256 = "1497dsvb32z9xljmxz95dnyvsbayn188ilm3l4ys8m5h25vd1xfs";
   };
 
-  buildInputs = [ confuse yajl alsaLib wirelesstools ];
+  buildInputs = [ confuse yajl alsaLib libpulseaudio libnl pkgconfig ];
 
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out}";
+  makeFlags = [ "all" "PREFIX=$(out)" ];
 
   meta = {
     description = "A tiling window manager";
diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix
new file mode 100644
index 0000000000000..e7cbd004087ec
--- /dev/null
+++ b/pkgs/applications/window-managers/orbment/default.nix
@@ -0,0 +1,57 @@
+{ lib, stdenv, fetchurl, makeWrapper, cmake, pkgconfig
+, wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng, libdrm, libX11
+}:
+
+stdenv.mkDerivation rec {
+  name = "orbment-${version}";
+  version = "git-2016-01-31";
+  repo = "https://github.com/Cloudef/orbment";
+  rev = "7f649fb76649f826dd29578a5ec41bb561b116eb";
+
+  chck_repo = "https://github.com/Cloudef/chck";
+  chck_rev = "fe5e2606b7242aa5d89af2ea9fd048821128d2bc";
+  inihck_repo = "https://github.com/Cloudef/inihck";
+  inihck_rev = "462cbd5fd67226714ac2bdfe4ceaec8e251b2d9c";
+
+  srcs = [
+   (fetchurl {
+     url = "${repo}/archive/${rev}.tar.gz";
+     sha256 = "5a426da0d5f4487911cfe9226865ed0cd1a7cdf253eec19d5eadc4b0d14a2ea0";
+   })
+   (fetchurl {
+     url = "${chck_repo}/archive/${chck_rev}.tar.gz";
+     sha256 = "ca316b544c48e837c32f08d613be42da10e0a3251e8e4488d1848b91ef92ab9e";
+   })
+   (fetchurl {
+     url = "${inihck_repo}/archive/${inihck_rev}.tar.gz";
+     sha256 = "d21f2ac25eafed285614f5f0ef7a1014d629ba382f4e64bc89fe2c3e98c2777f";
+   })
+  ];
+
+  sourceRoot = "orbment-${rev}";
+  postUnpack = ''
+    rm -rf orbment-${rev}/lib/chck orbment-${rev}/lib/inihck
+    ln -s ../../chck-${chck_rev} orbment-${rev}/lib/chck
+    ln -s ../../inihck-${inihck_rev} orbment-${rev}/lib/inihck
+  '';
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ makeWrapper wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11 libdrm ];
+  makeFlags = "PREFIX=$(out)";
+  installPhase = "PREFIX=$out make install";
+
+  LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libdrm dbus_libs ];
+  preFixup = ''
+    wrapProgram $out/bin/orbment \
+      --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";
+  '';
+
+  meta = {
+    description = "Modular Wayland compositor";
+    homepage    = repo;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
new file mode 100644
index 0000000000000..fa81971885a49
--- /dev/null
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -0,0 +1,40 @@
+{ lib, stdenv, fetchurl, makeWrapper, cmake, pkgconfig
+, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, asciidoc, libxslt, dbus_libs
+}:
+
+stdenv.mkDerivation rec {
+  name = "sway-${version}";
+  version = "git-2016-02-08";
+  repo = "https://github.com/SirCmpwn/sway";
+  rev = "16e904634c65128610537bed7fcb16ac3bb45165";
+
+  src = fetchurl {
+    url = "${repo}/archive/${rev}.tar.gz";
+    sha256 = "52d6c4b49fea69e2a2c1b44b858908b7736301bdb9ed483c294bc54bb40e872e";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ makeWrapper wayland wlc libxkbcommon pixman fontconfig pcre json_c asciidoc libxslt dbus_libs ];
+
+  patchPhase = ''
+    sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;
+  '';
+
+  makeFlags = "PREFIX=$(out)";
+  installPhase = "PREFIX=$out make install";
+
+  LD_LIBRARY_PATH = lib.makeLibraryPath [ wlc dbus_libs ];
+  preFixup = ''
+    wrapProgram $out/bin/sway \
+      --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";
+  '';
+
+  meta = {
+    description = "i3-compatible window manager for Wayland";
+    homepage    = "http://swaywm.org";
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/applications/window-managers/velox/default.nix b/pkgs/applications/window-managers/velox/default.nix
new file mode 100644
index 0000000000000..789f074aecdfd
--- /dev/null
+++ b/pkgs/applications/window-managers/velox/default.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig
+, swc, libxkbcommon
+, wld, wayland, pixman, fontconfig
+}:
+
+stdenv.mkDerivation rec {
+  name = "velox-${version}";
+  version = "git-2015-11-03";
+  repo = "https://github.com/michaelforney/velox";
+  rev = "53b41348df7e37886cab012609923255e4397419";
+
+  src = fetchurl {
+    url = "${repo}/archive/${rev}.tar.gz";
+    sha256 = "e49583efbbe62ea30f0084491ff757dff683f35eef6e9b68aa413e0b50c4bf20";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ swc libxkbcommon wld wayland pixman fontconfig ];
+
+  makeFlags = "PREFIX=$(out)";
+  installPhase = "PREFIX=$out make install";
+
+  meta = {
+    description = "velox window manager";
+    homepage    = "https://github.com/michaelforney/velox";
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index dc4ff03f9e783..efee43d852eae 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -32,7 +32,7 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
 
 */
 
-{ lib, makeWrapper, stdenv }: self:
+{ lib, lndir, makeWrapper, stdenv }: self:
 
 with lib; let inherit (self) emacs; in
 
@@ -47,11 +47,14 @@ in
 
 stdenv.mkDerivation {
   name = (appendToName "with-packages" emacs).name;
-  nativeBuildInputs = [ emacs makeWrapper ];
+  nativeBuildInputs = [ emacs lndir makeWrapper ];
   inherit emacs explicitRequires;
   phases = [ "installPhase" ];
   installPhase = ''
-    requires=""
+    mkdir -p $out/bin
+    mkdir -p $out/share/emacs/site-lisp
+
+    local requires
     for pkg in $explicitRequires; do
       findInputs $pkg requires propagated-user-env-packages
     done
@@ -59,52 +62,47 @@ stdenv.mkDerivation {
 
     siteStart="$out/share/emacs/site-lisp/site-start.el"
 
-    addEmacsPath() {
-      local list=$1
+    # Begin the new site-start.el by loading the original, which sets some
+    # NixOS-specific paths. Paths are searched in the reverse of the order
+    # they are specified in, so user and system profile paths are searched last.
+    cat >"$siteStart" <<EOF
+(load-file "$emacs/share/emacs/site-lisp/site-start.el")
+(add-to-list 'load-path "$out/share/emacs/site-lisp")
+EOF
+
+    linkPath() {
+      local pkg=$1
       local path=$2
       # Add the path to the search path list, but only if it exists
-      if [[ -d "$path" ]]; then
-        echo "(add-to-list '$list \"$path\")" >>"$siteStart"
+      if [[ -d "$pkg/$path" ]]; then
+        lndir -silent "$pkg/$path" "$out/$path"
       fi
     }
 
-    # Add a dependency's paths to site-start.el
-    addToEmacsPaths() {
-      addEmacsPath "exec-path" "$1/bin"
-      addEmacsPath "load-path" "$1/share/emacs/site-lisp"
-      addEmacsPath "package-directory-list" "$1/share/emacs/site-lisp/elpa"
+    # Add a package's paths to site-start.el
+    linkEmacsPackage() {
+      linkPath "$1" "bin"
+      linkPath "$1" "share/emacs/site-lisp"
     }
 
-    mkdir -p $out/share/emacs/site-lisp
-    # Begin the new site-start.el by loading the original, which sets some
-    # NixOS-specific paths. Paths are searched in the reverse of the order
-    # they are specified in, so user and system profile paths are searched last.
-    echo "(load-file \"$emacs/share/emacs/site-lisp/site-start.el\")" >"$siteStart"
-    echo "(require 'package)" >>"$siteStart"
-
-    # Set paths for the dependencies of the requested packages. These paths are
-    # searched before the profile paths, but after the explicitly-required paths.
-    for pkg in $requires; do
-      # The explicitly-required packages are also in the list, but we will add
-      # those paths last.
-      if ! ( echo "$explicitRequires" | grep "$pkg" >/dev/null ) ; then
-        addToEmacsPaths $pkg
-      fi
+    # First, link all the explicitly-required packages.
+    for pkg in $explicitRequires; do
+      linkEmacsPackage $pkg
     done
 
-    # Finally, add paths for all the explicitly-required packages. These paths
-    # will be searched first.
-    for pkg in $explicitRequires; do
-      addToEmacsPaths $pkg
+    # Next, link all the dependencies.
+    for pkg in $requires; do
+      linkEmacsPackage $pkg
     done
 
     # Byte-compiling improves start-up time only slightly, but costs nothing.
     emacs --batch -f batch-byte-compile "$siteStart"
 
-    mkdir -p $out/bin
     # Wrap emacs and friends so they find our site-start.el before the original.
     for prog in $emacs/bin/*; do # */
-      makeWrapper "$prog" $out/bin/$(basename "$prog") \
+      local progname=$(basename "$prog")
+      rm -f "$out/bin/$progname"
+      makeWrapper "$prog" "$out/bin/$progname" \
         --suffix EMACSLOADPATH ":" "$out/share/emacs/site-lisp:"
     done
 
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 6cf694dd2b144..2c5852c646e44 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -32,8 +32,8 @@ Options:
       --url url       Any url understand by 'git clone'.
       --rev ref       Any sha1 or references (such as refs/heads/master)
       --hash h        Expected hash.
-      --deepClone     Clone submodules recursively.
-      --no-deepClone  Do not clone submodules.
+      --deepClone     Clone the entire repository.
+      --no-deepClone  Make a shallow clone of just the required ref.
       --leave-dotGit  Keep the .git directories.
       --fetch-submodules Fetch submodules.
       --builder       Clone as fetchgit does, but url, rev, and out option are mandatory.
@@ -102,6 +102,23 @@ hash_from_ref(){
     git ls-remote origin | sed -n "\,\t$ref, { s,\(.*\)\t\(.*\),\1,; p; q}"
 }
 
+# Returns a name based on the url and reference
+#
+# This function needs to be in sync with nix's fetchgit implementation
+# of urlToName() to re-use the same nix store paths.
+url_to_name(){
+    local url=$1
+    local ref=$2
+    # basename removes the / and .git suffixes
+    local base=$(basename "$url" .git)
+
+    if [[ $ref =~ [a-z0-9]+ ]]; then
+        echo "$base-${ref:0:7}"
+    else
+        echo $base
+    fi
+}
+
 # Fetch everything and checkout the right sha1
 checkout_hash(){
     local hash="$1"
@@ -288,7 +305,7 @@ else
     # If the hash was given, a file with that hash may already be in the
     # store.
     if test -n "$expHash"; then
-        finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" git-export)
+        finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$(url_to_name "$url" "$rev")")
         if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
             finalPath=
         fi
@@ -302,7 +319,7 @@ else
         tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
         trap "rm -rf \"$tmpPath\"" EXIT
 
-        tmpFile="$tmpPath/git-export"
+        tmpFile="$tmpPath/$(url_to_name "$url" "$rev")"
         mkdir "$tmpFile"
 
         # Perform the checkout.
@@ -313,7 +330,7 @@ else
         if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
 
         # Add the downloaded file to the Nix store.
-        finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpFile)
+        finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpFile")
 
         if test -n "$expHash" -a "$expHash" != "$hash"; then
             echo "hash mismatch for URL \`$url'"
diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix
index 60803ddcb1f8a..7a25966e9fb52 100644
--- a/pkgs/build-support/fetchgitlocal/default.nix
+++ b/pkgs/build-support/fetchgitlocal/default.nix
@@ -34,7 +34,7 @@ let
 
       # dump tar of *current directory* at given revision
       git -C ${srcStr} archive --format=tar ${gitHash} \
-        | tar xvf - -C $out
+        | tar xf - -C $out
     '';
 
 in nixPath
diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix
index cad0c7a21f948..6ae844a62463b 100644
--- a/pkgs/build-support/kernel/modules-closure.nix
+++ b/pkgs/build-support/kernel/modules-closure.nix
@@ -9,7 +9,7 @@
 stdenv.mkDerivation {
   name = kernel.name + "-shrunk";
   builder = ./modules-closure.sh;
-  buildInputs = [nukeReferences];
-  inherit kernel rootModules kmod allowMissing;
+  buildInputs = [ nukeReferences kmod ];
+  inherit kernel rootModules allowMissing;
   allowedReferences = ["out"];
 }
diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh
index d0ac88f692479..71d507b1e2b13 100644
--- a/pkgs/build-support/kernel/modules-closure.sh
+++ b/pkgs/build-support/kernel/modules-closure.sh
@@ -2,8 +2,6 @@ source $stdenv/setup
 
 set -o pipefail
 
-PATH=$kmod/sbin:$PATH
-
 version=$(cd $kernel/lib/modules && ls -d *)
 
 echo "kernel version is $version"
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index fffdc85d2bce5..97554e4e19edf 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1770,22 +1770,22 @@ rec {
     };
 
     debian8i386 = {
-      name = "debian-8.2-jessie-i386";
-      fullName = "Debian 8.2 Jessie (i386)";
+      name = "debian-8.3-jessie-i386";
+      fullName = "Debian 8.3 Jessie (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz;
-        sha256 = "f7eda33a296d792d467b84ba608a33f00ff249cb9a385c005586925645d83778";
+        sha256 = "1240d404bd99afbeec042c08fdab049f0b5a984a393cac7c221553ab08f637f5";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian8x86_64 = {
-      name = "debian-8.2-jessie-amd64";
-      fullName = "Debian 8.2 Jessie (amd64)";
+      name = "debian-8.3-jessie-amd64";
+      fullName = "Debian 8.3 Jessie (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
-        sha256 = "ff1b82b4c767769e594fd482de4ef8f70bce8e9f01fa8ef2d6952def0b071ba0";
+        sha256 = "ec937c1b3bbfe4803f0fa43681b19d089eb6b355455ac7caa17ec8e9ff604e56";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix
index 189c066b13ebc..55420e2d344e9 100644
--- a/pkgs/data/fonts/arkpandora/default.nix
+++ b/pkgs/data/fonts/arkpandora/default.nix
@@ -1,6 +1,8 @@
-args : with args; 
-let version = lib.attrByPath ["version"] "2.04" args; in
-rec {
+{ stdenv, fetchurl }:
+stdenv.mkDerivation rec {
+  name = "arkpandora-${version}";
+  version = "2.04";
+
   src = fetchurl {
     urls = [
       "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz"
@@ -10,13 +12,11 @@ rec {
     sha256 = "16mfxwlgn6vs3xn00hha5dnmz6bhjiflq138y4zcq3yhk0y9bz51";
   };
 
-  buildInputs = [];
-  configureFlags = [];
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["doUnpack" "installFonts"];
-      
-  name = "arkpandora-" + version;
   meta = {
     description = "Font, metrically identical to Arial and Times New Roman";
   };
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index 9f14f945e3537..e4c655877c8be 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "Font files available from Google Font";
     license = with licenses; [ asl20 ofl ufl ];
     platforms = platforms.all;
-    maintainer = with maintainers; [ manveru ];
+    maintainers = with maintainers; [ manveru ];
   };
 }
diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix
index eb28521a2b8a9..b95b0f0beddf9 100644
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/pkgs/data/fonts/libertine/default.nix
@@ -1,4 +1,6 @@
-args @ { fetchurl, fontforge, lib, ... }: with args; rec {
+{ stdenv, fetchurl, fontforge }:
+
+stdenv.mkDerivation rec {
   name = "linux-libertine-5.3.0";
 
   src = fetchurl {
@@ -6,18 +8,37 @@ args @ { fetchurl, fontforge, lib, ... }: with args; rec {
     sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v";
   };
 
-  buildInputs = [ fontforge ];
+  setSourceRoot = "sourceRoot=`pwd`";
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["doUnpack" "generateFontsFromSFD" "installFonts"];
+  buildInputs = [ fontforge ];
 
-  extraFontForgeCommands = ''
-    ScaleToEm(1000);
+  buildPhase = ''
+    for i in *.sfd; do
+      fontforge -c \
+        'Open($1);
+        ScaleToEm(1000);
+        Reencode("unicode");
+        Generate($1:r + ".ttf");
+        Generate($1:r + ".otf");
+        Reencode("TeX-Base-Encoding");
+        Generate($1:r + ".afm");
+        Generate($1:r + ".pfm");
+        Generate($1:r + ".pfb");
+        Generate($1:r + ".map");
+        Generate($1:r + ".enc");
+        ' $i;
+    done
   '';
 
-  doUnpack = lib.fullDepEntry ''
-      tar xf ${src}
-    '' ["minInit"];
+  installPhase = ''
+    mkdir -p $out/share/fonts/{opentype,truetype,type1}/public
+    mkdir -p $out/share/texmf/fonts/{enc,map}
+    cp *.otf $out/share/fonts/opentype/public
+    cp *.ttf $out/share/fonts/truetype/public
+    cp *.pfb $out/share/fonts/type1/public
+    cp *.enc $out/share/texmf/fonts/enc
+    cp *.map $out/share/texmf/fonts/map
+  '';
 
   meta = {
     description = "Linux Libertine Fonts";
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index 63b4ad1ea04a8..2e576cf6dc8b6 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "powerline-fonts-2015-06-29";
+  name = "powerline-fonts-2015-12-11";
 
   src = fetchFromGitHub {
     owner = "powerline";
     repo = "fonts";
-    rev = "97dc451724fb24e1dd9892c988642b239b5dc67c";
-    sha256 = "1m0a8k916s74iv2k0kk36dz7d2hfb2zgf8m0b9hg71w4yd3bmj4w";
+    rev = "a44abd0e742ad6e7fd8d8bc4c3cad5155c9f3a92";
+    sha256 = "1pwz83yh28yd8aj6fbyfz8z3q3v67psszpd9mp4vv0ms9w8b5ajn";
   };
 
   buildPhase = "true";
@@ -38,6 +38,6 @@ stdenv.mkDerivation {
     '';
     license = with licenses; [ asl20 free ofl ];
     platforms = platforms.all;
-    maintainer = with maintainers; [ malyn ];
+    maintainers = with maintainers; [ malyn ];
   };
 }
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix
index df206fe13b5ae..9cbe951cf4aeb 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, liberation_ttf_from_source }:
 
 stdenv.mkDerivation rec {
   version = "2.00.1";
@@ -16,30 +16,5 @@ stdenv.mkDerivation rec {
     cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
   '';
 
-  meta = {
-    description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
-    longDescription = ''
-      The Liberation Fonts are intended to be replacements for the three most
-      commonly used fonts on Microsoft systems: Times New Roman, Arial, and
-      Courier New.
-
-      There are three sets: Sans (a substitute for Arial, Albany, Helvetica,
-      Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times
-      New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono
-      (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and
-      Bitstream Vera Sans Mono).
-
-      You are free to use these fonts on any system you would like.  You are
-      free to redistribute them under the GPL+exception license found in the
-      download.  Using these fonts does not subject your documents to the
-      GPL---it liberates them from any proprietary claim.
-    '';
-
-    # See `License.txt' for details.
-    license = stdenv.lib.licenses.gpl2Oss;
-    homepage = https://fedorahosted.org/liberation-fonts/;
-    maintainers = [
-      stdenv.lib.maintainers.raskin
-    ];
-  };
+  inherit (liberation_ttf_from_source) meta;
 }
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index cd5c503094129..80af5ab52d90d 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -18,30 +18,24 @@ stdenv.mkDerivation rec {
     cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
     longDescription = ''
       The Liberation Fonts are intended to be replacements for the three most
       commonly used fonts on Microsoft systems: Times New Roman, Arial, and
-      Courier New.
+      Courier New. Since 2012 they are based on croscore fonts.
 
       There are three sets: Sans (a substitute for Arial, Albany, Helvetica,
       Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times
       New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono
       (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and
       Bitstream Vera Sans Mono).
-
-      You are free to use these fonts on any system you would like.  You are
-      free to redistribute them under the GPL+exception license found in the
-      download.  Using these fonts does not subject your documents to the
-      GPL---it liberates them from any proprietary claim.
     '';
 
-    # See `License.txt' for details.
-    license = stdenv.lib.licenses.gpl2Oss;
+    license = licenses.ofl;
     homepage = https://fedorahosted.org/liberation-fonts/;
     maintainers = [
-      stdenv.lib.maintainers.raskin
+      maintainers.raskin
     ];
   };
 }
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index eab577888d113..2be23b0f35c73 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,26 +8,26 @@ let
 in
 stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
-  version = "2016-01-25";
+  version = "2016-02-08";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
-    "07h1ha7z9i877ph41fw4blcfb11ynv8k9snrrsgsjrvv2yqvsc37";
+    "00y8j0jxk60wscm6wiz3mmmj5xfvwqnmxjm2ar8ngkl8mxzl12gm";
   srcGeoIPv6 = fetchDB
     "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
-    "14wsc0w8ir5q1lq6d9bpr03qvrbi2i0g04gkfcwbnh63yqxc31m9";
+    "0l6wv246kzm63qqmqr9lzpbvbanfwfkvn9bj34jn2djp4rfrkjrf";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
-    "1nra64shc3bp1d6vk9rdv7wyd8jmkgsybqgr3imdg7fv837kwvnh";
+    "1095jar3vyax0gmj7wc0w28rpjmq2j1b6wk5yfaghyl87mad5q0f";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
-    "1fksbnmda2a05cpax41h9r7jhi8102q41kl5nij4ai42d6yqy73x";
+    "0fnlznn04lpkkd7sy9r9kdl3fcp8ix7msdrncwgz26dh537ml32z";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "1n7zlmnaxvjljyih9yi9hns530by21h42j2kcszbcyvn7rd9rnyw";
+    "0ib93p2fwayqsxwph98rkgln7xpjrwhzzc06sc74876jpaq3g8g5";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1id60almra7mq4v86p37sfph8jrbdnc5pzxvy55wiyrvf6ydvk56";
+    "1izlxqcvdag66sny5zjjwkmjhai0c9m77b96j117n0x0awrrk4h9";
 
   meta = with stdenv.lib; {
     description = "GeoLite Legacy IP geolocation databases";
diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix
index ddb53d728202f..9cfb89914b111 100644
--- a/pkgs/data/misc/media-player-info/default.nix
+++ b/pkgs/data/misc/media-player-info/default.nix
@@ -27,6 +27,6 @@ in
       description = "A repository of data files describing media player capabilities";
       homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/";
       license = licenses.bsd3;
-      maintainer = with maintainers; [ ttuegel ];
+      maintainers = with maintainers; [ ttuegel ];
     };
   }
diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index 123cb7a620899..3c74123d605eb 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "wireless-regdb-${version}";
-  version = "2015-12-14";
+  version = "2016-02-08";
 
   src = fetchgit {
-    sha256 = "1ldfcxn3mdb104czy78b7nj1clsbfp8fc6mshix98zq0bg4k7rsm";
+    sha256 = "0cqnkkcni27ya6apy2ba4im7xj4nrhbcgrahlarvrzbbjkp740m9";
     url = https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git;
     rev = "refs/tags/master-${version}";
   };
diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
index ff50bcd5e5cd9..de06c671e7258 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = with xorg;
-    [ pkgconfig glib gtk mesa pango pangox_compat libX11 libXmu ];
+    [ pkgconfig glib gtk mesa pango libX11 libXmu ];
+  propagatedBuildInputs = [ pangox_compat ];
 
   # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and
   # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays.
diff --git a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
deleted file mode 100644
index a2813e0581b35..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, itstool, libxml2, python3, python3Packages, pyatspi, at_spi2_core
-, dbus, intltool, libwnck3 }:
-
-stdenv.mkDerivation rec {
-  name = "accerciser-3.14.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/accerciser/3.14/${name}.tar.xz";
-    sha256 = "0x05gpajpcs01g7m34g6fxz8122cf9kx3k0lchwl34jy8xfr39gm";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi
-    python3Packages.pygobject3 python3Packages.ipython
-    at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme
-  ];
-
-  wrapPrefixVariables = [ "PYTHONPATH" ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Accerciser;
-    description = "Interactive Python accessibility explorer";
-    maintainers = gnome3.maintainers;
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
deleted file mode 100644
index 99ea481307e7b..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, glib
-, evolution_data_server, evolution, sqlite
-, makeWrapper, itstool, desktop_file_utils
-, clutter_gtk, libuuid, webkitgtk, zeitgeist
-, gnome3, librsvg, gdk_pixbuf, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "bijiben-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/bijiben/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0ndb7bv03rqxh4an44xd4cwxxp5z1wywk9xazmab01jsa0a0zx7r";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig glib intltool itstool libxml2
-                  clutter_gtk libuuid webkitgtk gnome3.tracker
-                  gnome3.gnome_online_accounts zeitgeist desktop_file_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  evolution_data_server evolution sqlite ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/bijiben" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Bijiben;
-    description = "Note editor designed to remain simple to use";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
deleted file mode 100644
index de61b73cf622f..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3
-, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst_2, udev, gst_all_1, itstool
-, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2, libgudev }:
-
-stdenv.mkDerivation rec {
-  name = "cheese-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/cheese/${gnome3.version}/${name}.tar.xz";
-    sha256 = "184hzwrjjn94ndivb54rrif4jnbr66p1j0nlqqi3nw6qsrm2yqj4";
-  };
-
-  buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool
-                  gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2
-                  gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop
-                  gst_all_1.gst-plugins-bad clutter_gtk clutter-gst_2
-                  libcanberra_gtk3 libgudev ];
-
-  enableParallelBuilding = true;
-
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Cheese;
-    description = "Take photos and videos with your webcam, with fun graphical effects";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
deleted file mode 100644
index 1aa9dd62d41e3..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
-, pkgconfig, gtk3, glib, libnotify, gtkspell3
-, makeWrapper, itstool, shared_mime_info, libical, db, gcr, sqlite
-, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
-, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }:
-
-let
-  majVer = gnome3.version;
-in stdenv.mkDerivation rec {
-  name = "evolution-${majVer}.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/evolution/${majVer}/${name}.tar.xz";
-    sha256 = "1mh769adz40r22x0jw5z4carkcbhx36qy2j8kl2djjbp1jf5vhnd";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  propagatedBuildInputs = [ gnome3.gtkhtml ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
-                  gnome3.evolution_data_server libsecret libical gcr
-                  webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
-                  libcanberra_gtk3 bogofilter gnome3.libgdata sqlite
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
-                  nss nspr libnotify procps highlight gnome3.libgweather
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
-                     "--disable-libcryptui" ];
-
-  NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Evolution;
-    description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
deleted file mode 100644
index 88ced2b2b0655..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
-, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "file-roller-${version}";
-
-  majVersion = gnome3.version;
-  version = "${majVersion}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz";
-    sha256 = "12c6lpvc3mi1q10nas64kfcjw2arv3z4955zdfgf4c5wy4dczqyh";
-  };
-
-  # TODO: support nautilus
-  # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
-
-  buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
-                  gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg
-                  makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/file-roller" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/FileRoller;
-    description = "Archive manager for the GNOME desktop environment";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
deleted file mode 100644
index c046dd7dc9bf9..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, intltool, fetchurl, enchant, isocodes
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libsoup, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "gedit-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gedit/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0bs0vf773l0k7f4zxqlyb8z772s5dcn7ww0073hs7z3hj0l3lzrc";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup
-                  gnome3.libpeas gnome3.gtksourceview libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/gedit" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Gedit;
-    description = "Official text editor of the GNOME desktop environment";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
deleted file mode 100644
index 3ead4de8bc485..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, intltool, fetchurl, python
-, pkgconfig, gtk3, glib
-, makeWrapper, itstool, libxml2, docbook_xsl
-, gnome3, librsvg, gdk_pixbuf, libxslt }:
-
-stdenv.mkDerivation rec {
-  name = "glade-3.16.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz";
-    sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python
-                  gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/glade" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Glade;
-    description = "User interface designer for GTK+ applications";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
deleted file mode 100644
index 2c670b00f8ab5..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
-, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
-, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
-, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
-, desktop_file_utils, mtools, cdrkit, libcdio, libgudev
-, libusb, libarchive, acl, xen, numactl
-}:
-
-# TODO: ovirt (optional)
-
-stdenv.mkDerivation rec {
-  name = "gnome-boxes-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-boxes/${gnome3.version}/${name}.tar.xz";
-    sha256 = "03a8x1bnbchsh2bs86gnwvddnwbf643wp5nrhyvg9j86d57axvs1";
-  };
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  buildInputs = [
-    makeWrapper pkgconfig intltool itstool libvirt-glib glib
-    gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
-    libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
-    gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
-    librsvg desktop_file_utils acl libgudev xen numactl
-  ];
-
-  preFixup = ''
-    for prog in "$out/bin/"*; do
-        wrapProgram "$prog" \
-            --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-            --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-            --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Simple GNOME 3 application to access remote or virtual systems";
-    homepage = https://wiki.gnome.org/action/show/Apps/Boxes;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
deleted file mode 100644
index 805c2482e9b59..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, evolution_data_server, sqlite, libxml2, libsoup
-, glib }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-calendar-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-calendar/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0vqwps86whf8jgq7q4hdrbnmlaxppgrfa3j7n6ddpqzkb3gf2c5m";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server
-    sqlite libxml2 libsoup glib gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Calendar;
-    description = "Simple and beautiful calendar application for GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix
deleted file mode 100644
index 0c18f926e6d17..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, gjs, gdk_pixbuf, librsvg }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-characters-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-characters/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1gs5k32lmjpi4scb2i7pfnbsy8pl0gb9w1aypyy83hy6ydinaqc4";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
-    librsvg gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Design/Apps/CharacterMap;
-    description = "Simple utility application to find and insert unusual characters";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
deleted file mode 100644
index 2308dd90434fb..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, intltool, fetchurl, libgweather, libnotify
-, pkgconfig, gtk3, glib, gsound
-, makeWrapper, itstool, libcanberra_gtk3, libtool
-, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-clocks-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-clocks/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1k7khghaq7y3j0r3kn9q7dwgi1875bfn4iy0sr1ls14m1p2bl10q";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
-                  gnome3.gsettings_desktop_schemas makeWrapper
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gnome_desktop gnome3.geocode_glib geoclue2
-                  libgweather libnotify libtool gsound
-                  wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Clocks;
-    description = "Clock application designed for GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
deleted file mode 100644
index fe6be2e8d4ecd..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, intltool, fetchurl, evince, gjs
-, pkgconfig, gtk3, glib
-, makeWrapper, itstool, libxslt, webkitgtk
-, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
-, gobjectIntrospection, json_glib, inkscape, poppler_utils
-, gmp, desktop_file_utils, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-documents-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-documents/${gnome3.version}/${name}.tar.xz";
-    sha256 = "154ssnyq4lwq2rsy3l5kqk8x1qjvn2j5gqm23i0aiw7qsbx5phrs";
-  };
-
-  doCheck = true;
-
-  configureFlags = [ "--enable-getting-started" ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
-                  docbook_xsl desktop_file_utils inkscape poppler_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper gmp
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg evince
-                  libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
-                  gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
-                  gnome3.gnome_desktop gnome3.libzapojit json_glib
-                  wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
-
-    gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi')
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Documents;
-    description = "Document manager application designed to work with GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix
deleted file mode 100644
index 7ab2ca89bc020..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-getting-started-docs-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.version}/${name}.tar.xz";
-    sha256 = "07wz35r6p9nvlshwcyjvhjnzbaw3bzadlhwz51c8nky7m7pdgmyy";
-  };
-
-  buildInputs = [ intltool itstool libxml2 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://live.gnome.org/DocumentationProject;
-    description = "Help a new user get started in GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.cc-by-sa-30;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
deleted file mode 100644
index dbef0526b806a..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libxml2, systemd }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-logs-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-logs/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0732jbvih5d678idvhlgqik9j9y594agwdx6gwap80459k1a6fg1";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    systemd gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Logs;
-    description = "A log viewer for the systemd journal";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix
deleted file mode 100644
index e7f6606b71e2d..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
-, gobjectIntrospection, gdk_pixbuf, librsvg
-, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-maps-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-maps/${gnome3.version}/${name}.tar.xz";
-    sha256 = "15kwy2fy9v4zzjaqcifv4jaqcx1227bcdxgd6916ghrdzgj93mx7";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook
-                  gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
-                  gnome3.geocode_glib libchamplain file libsoup
-                  gdk_pixbuf librsvg
-                  gnome3.gnome_online_accounts gnome3.defaultIconTheme ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Maps;
-    description = "A map application for GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
deleted file mode 100644
index 3a6de4bcf6f48..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker
-, python3, libxml2, python3Packages, libnotify, wrapGAppsHook
-, pkgconfig, gtk3, glib, cairo
-, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-music-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-music/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1pyj192kva0swad6w2kaj5shcwpgiflyda6zmsiaximsgzc4as8i";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg python3
-                  gnome3.grilo gnome3.grilo-plugins libxml2 python3Packages.pygobject3 libnotify
-                  python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  gnome3.gsettings_desktop_schemas makeWrapper tracker ];
-
-  wrapPrefixVariables = [ "PYTHONPATH" ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Music;
-    description = "Music player and management application for the GNOME desktop environment";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
deleted file mode 100644
index 4c152777f2cbd..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libgtop, intltool, itstool, libxml2, nmap, inetutils }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-nettool-3.8.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz";
-    sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  propagatedUserEnvPkgs = [ nmap inetutils ];
-
-  meta = with stdenv.lib; {
-    homepage = http://projects.gnome.org/gnome-network;
-    description = "A collection of networking tools";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
deleted file mode 100644
index a89cde7a111a3..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, exempi, libxml2
-, pkgconfig, gtk3, glib
-, makeWrapper, itstool, gegl, babl, lcms2
-, desktop_file_utils, gmp, libmediaart, wrapGAppsHook
-, gnome3, librsvg, gdk_pixbuf, libexif }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-photos-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-photos/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0jv3b5nd4sazyq2k132rdjizfg24sj6i63ls1m6x2qqqf8grxznj";
-  };
-
-  # doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata
-                  gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg exempi
-                  gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
-                  gnome3.gnome_online_accounts gnome3.gnome_desktop
-                  lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
-                  wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Photos;
-    description = "Photos is an application to access, organize and share your photos with GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
deleted file mode 100644
index 5fff782a2e8c6..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs
-, libgweather, intltool, itstool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-weather-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-weather/${gnome3.version}/${name}.tar.xz";
-    sha256 = "14dx5zj9200qpsb7byfrjkw3144s0q0nmaw5c6ni7vpa8kmvbrac";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook gjs intltool itstool
-    libgweather gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Weather;
-    description = "Access current weather conditions and forecasts";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix
deleted file mode 100644
index 093900dcb7ab5..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
-, gobjectIntrospection, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "nautilus-sendto-${version}";
-
-  version = "3.8.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
-    sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
-  };
-
-  buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ];
-
-  meta = with stdenv.lib; {
-    description = "Integrates Evolution and Pidgin into the Nautilus file manager";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix
deleted file mode 100644
index 21ba8db37d415..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
-, telepathy_glib, gjs, itstool, telepathy_idle
-, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "polari-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/polari/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0w7hc5i78kq4dkyzpdb9byk4rhqa569cmbg09nh3qxn8ninscdqx";
-  };
-
-  propagatedUserEnvPkgs = [ telepathy_idle ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook
-                  telepathy_glib gjs gdk_pixbuf librsvg ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Polari;
-    description = "IRC chat client designed to integrate with the GNOME desktop";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
deleted file mode 100644
index 3a28507fac17a..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, intltool, fetchurl, vala
-, pkgconfig, gtk3, glib
-, makeWrapper, itstool, gnupg, libsoup
-, gnome3, librsvg, gdk_pixbuf, gpgme
-, libsecret, avahi, p11_kit, openssh }:
-
-let
-  majVer = gnome3.version;
-in stdenv.mkDerivation rec {
-  name = "seahorse-${majVer}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/seahorse/${majVer}/${name}.tar.xz";
-    sha256 = "0cg1grgpwbfkiny5148n17rzpc8kswyr5yff0kpm8l3lp01my2kp";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
-                  gnome3.gsettings_desktop_schemas makeWrapper gnupg
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
-                  libsecret avahi libsoup p11_kit vala gnome3.gcr
-                  openssh ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/seahorse" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Seahorse;
-    description = "Application for managing encryption keys and passwords in the GnomeKeyring";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
deleted file mode 100644
index 1debc3646bc8b..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool
-, libsecret, itstool, makeWrapper, librsvg }:
-
-stdenv.mkDerivation rec {
-  name = "vinagre-${version}";
-
-  majVersion = gnome3.version;
-  version = "${majVersion}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/vinagre/${majVersion}/${name}.tar.xz";
-    sha256 = "0gs8sqd4r6jlgxn1b7ggyfcisig50z79p0rmigpzwpjjx1bh0z6p";
-  };
-
-  buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret
-                  itstool makeWrapper gnome3.defaultIconTheme librsvg ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/vinagre" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Vinagre;
-    description = "Remote desktop viewer for GNOME";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
deleted file mode 100644
index 6a594aa6a1ee9..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3
-, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }:
-
-stdenv.mkDerivation rec {
-  name = "adwaita-icon-theme-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.version}/${name}.tar.xz";
-    sha256 = "a3c8ad3b099ca571b423811a20ee9a7a43498cfa04d299719ee43cd7af6f6eb1";
-  };
-
-  # For convenience, we can specify adwaita-icon-theme only in packages
-  propagatedBuildInputs = [ hicolor_icon_theme ];
-
-  buildInputs = [ gdk_pixbuf librsvg ];
-
-  nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
-
-  # remove a tree of dirs with no files within
-  postInstall = '' rm -r "$out/locale" '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
deleted file mode 100644
index 54d2c065d94eb..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl, vala, libgtop
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "baobab-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/baobab/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1wnf3yd3qi0xsmm37s6pk23qh095pk1fv9nhqjya1p9svwrh9r0z";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/baobab" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Baobab;
-    description = "Graphical application to analyse disk usage in any Gnome environment";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix
deleted file mode 100644
index c2cb6a661abea..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf
-, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake114x }:
-
-let
-  majorVersion = "0.4";
-in
-stdenv.mkDerivation rec {
-  name = "caribou-${majorVersion}.18.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/caribou/${majorVersion}/${name}.tar.xz";
-    sha256 = "0l1ikx56ddgayvny3s2xv8hs3p23xsclw4zljs3cczv4b89dzymf";
-  };
-
-  buildInputs = with gnome3;
-    [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake114x
-      pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ];
-
-  propagatedBuildInputs = [ gnome3.libgee libxklavier ];
-
-  preBuild = ''
-    patchShebangs .
-    substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
deleted file mode 100644
index 94be115e95ce8..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
-
-let
-  majorVersion = "3.16";
-in
-stdenv.mkDerivation rec {
-  name = "dconf-editor-${version}";
-  version = "${majorVersion}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/dconf-editor/${majorVersion}/${name}.tar.xz";
-    sha256 = "0vl5ygbh8blbk3710w34lmhxxl4g275vzpyhjsq0016c597isp88";
-  };
-
-  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
-                  intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/dconf-editor" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
deleted file mode 100644
index 990e2007a23f5..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
-
-let
-  majorVersion = "0.24";
-in
-stdenv.mkDerivation rec {
-  name = "dconf-${version}";
-  version = "${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz";
-    sha256 = "4373e0ced1f4d7d68d518038796c073696280e22957babb29feb0267c630fec2";
-  };
-
-  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
-                  intltool docbook_xsl docbook_xsl_ns makeWrapper ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
deleted file mode 100644
index 48b45f28522e1..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, gnome3, gdk_pixbuf
-, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
-, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
-, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control
-, telepathy_logger, libnotify, clutter, libsoup, gnutls
-, evolution_data_server
-, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
-, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee  }:
-
-# TODO: enable more features
-
-let
-  majorVersion = "3.12";
-in
-stdenv.mkDerivation rec {
-  name = "empathy-${majorVersion}.8";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz";
-    sha256 = "10z6ksia6yx7vg0wsdbk4w6vjgfg3cg3n04jf9bj2vr7kr5zvs7w";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
-                            gnome_online_accounts shared_mime_info ];
-  propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
-                            telepathy_mission_control ];
-  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
-                  libxml2 libxslt icu file makeWrapper
-                  telepathy_glib clutter_gtk clutter-gst cogl
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf
-                  libnotify clutter libsoup gnutls libgee p11_kit
-                  libcanberra_gtk3 telepathy_farstream farstream
-                  gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas
-                  file libtool librsvg ];
-
-  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
-                         "-I${dbus_libs.dev}/include/dbus-1.0"
-                         "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Empathy;
-    description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
-    maintainers = gnome3.maintainers;
-    # TODO: license = [ licenses.gpl2 licenses.lgpl2 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/eog/default.nix b/pkgs/desktops/gnome-3/3.16/core/eog/default.nix
deleted file mode 100644
index fa1d41ef153e4..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/eog/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
-, shared_mime_info, makeWrapper, librsvg, libexif }:
-
-
-stdenv.mkDerivation rec {
-  name = "eog-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/eog/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1ry10wvd2zq7vv4rf1qz0x1b77sdzaqlxyjbw3a0lccp4f2x2y99";
-  };
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg
-      gsettings_desktop_schemas shared_mime_info adwaita-icon-theme gnome_desktop libexif ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/eog" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.adwaita-icon-theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/EyeOfGnome; 
-    platforms = platforms.linux;
-    description = "GNOME image viewer";
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
deleted file mode 100644
index 73c8772164150..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
-, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
-, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
-, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
-, gdk_pixbuf, librsvg, gnome_common }:
-
-stdenv.mkDerivation rec {
-  name = "epiphany-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/epiphany/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1bicv1rfi697hk12p5n3jmcgjc81bwicjsmppdfjmvj94r4iniz8";
-  };
-
-  # Tests need an X display
-  configureFlags = [ "--disable-static --disable-tests" ];
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  nativeBuildInputs = [ pkgconfig file ];
-
-  configureScript = "./autogen.sh";
-
-  buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file 
-                  webkitgtk libsoup libsecret gnome_desktop libnotify libtool
-                  sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
-                  gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  patches = [ ./libxml_depend.patch ];
-
-  patchFlags = [ "-p0" ];
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Epiphany;
-    description = "WebKit based web browser for GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch b/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch
deleted file mode 100644
index 89e3694a02d9a..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig	2015-04-08 18:53:52.284580835 +0200
-+++ configure.ac	2015-04-08 18:55:55.697225280 +0200
-@@ -113,6 +113,7 @@
- PKG_CHECK_MODULES(WEB_EXTENSION, [
-                   webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED
-                   libsecret-1 >= $LIBSECRET_REQUIRED
-+                  libxml-2.0 >= $LIBXML_REQUIRED
-                   ])
- AC_SUBST(WEB_EXTENSION_CFLAGS)
- AC_SUBST(WEB_EXTENSION_LIBS)
diff --git a/pkgs/desktops/gnome-3/3.16/core/evince/default.nix b/pkgs/desktops/gnome-3/3.16/core/evince/default.nix
deleted file mode 100644
index 483f5104d8d10..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/evince/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
-, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
-, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper
-, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number
-, gobjectIntrospection
-}:
-
-stdenv.mkDerivation rec {
-  name = "evince-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/evince/${gnome3.version}/${name}.tar.xz";
-    sha256 = "016d9i83srv49saslmjl7v02n7sc6d7v6h68y06y9rfgbk8f4f2i";
-  };
-
-  buildInputs = [
-    pkgconfig intltool perl perlXMLParser libxml2
-    glib gtk3 pango atk gdk_pixbuf gobjectIntrospection
-    itstool gnome3.adwaita-icon-theme
-    gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
-    poppler ghostscriptX djvulibre libspectre
-    makeWrapper libsecret librsvg gnome3.adwaita-icon-theme
-  ];
-
-  configureFlags = [
-    "--disable-nautilus" # Do not use nautilus
-    "--enable-introspection"
-  ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  preConfigure = with stdenv.lib;
-    optionalString doCheck ''
-      for file in test/*.py; do
-        echo "patching $file"
-        sed '1s,/usr,${python},' -i "$file"
-      done
-    '' + optionalString (recentListSize != null) ''
-      sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
-      sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
-    '';
-
-  preFixup = ''
-    # Tell Glib/GIO about the MIME info directory, which is used
-    # by `g_file_info_get_content_type ()'.
-    wrapProgram "$out/bin/evince" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-
-  '';
-
-  doCheck = false; # would need pythonPackages.dogTail, which is missing
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/projects/evince/;
-    description = "GNOME's document viewer";
-
-    longDescription = ''
-      Evince is a document viewer for multiple document formats.  It
-      currently supports PDF, PostScript, DjVu, TIFF and DVI.  The goal
-      of Evince is to replace the multiple document viewers that exist
-      on the GNOME Desktop with a single simple application.
-    '';
-
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.vcunat ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
deleted file mode 100644
index 81a64e9e17579..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python
-, intltool, libsoup, libxml2, libsecret, icu, sqlite
-, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
-
-
-stdenv.mkDerivation rec {
-  name = "evolution-data-server-${gnome3.version}.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/evolution-data-server/${gnome3.version}/${name}.tar.xz";
-    sha256 = "19dcvhlqh25pkkd29hhm9yik8xxfy01hcakikrai0x1a04aa2s7f";
-  };
-
-  buildInputs = with gnome3;
-    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
-      gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ]
-    ++ stdenv.lib.optional valaSupport vala;
-
-  propagatedBuildInputs = [ libsecret nss nspr libical db ];
-
-  # uoa irrelevant for now
-  configureFlags = [ "--disable-uoa" ]
-                   ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
-
-  preFixup = ''
-    for f in "$out/libexec/"*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
deleted file mode 100644
index 4385c6b6f75b8..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
-, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
-, telepathy_glib, evolution_data_server, libsecret, db }:
-
-# TODO: enable more folks backends
-
-let
-  majorVersion = "0.11";
-in
-stdenv.mkDerivation rec {
-  name = "folks-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz";
-    sha256 = "0q9hny6a38zn0gamv0ji0pn3jw6bpn2i0fr6vbzkhm9h9ws0cqvz";
-  };
-
-  propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
-  # dbus_daemon needed for tests
-  buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
-                  vala libsecret libxml2 libsoup nspr nss intltool db ];
-  nativeBuildInputs = [ pkgconfig ];
-
-  configureFlags = "--disable-fatal-warnings";
-
-  NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss"
-                        "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"];
-
-  enableParallelBuilding = true;
-
-  postBuild = "rm -rf $out/share/gtk-doc";
-
-  meta = {
-    description = "Folks";
-
-    homepage = https://wiki.gnome.org/Projects/Folks;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = gnome3.maintainers;
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix
deleted file mode 100644
index a4cb3e8c14646..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2
-, intltool, polkit, orbit, withGtk ? false }:
-
-assert withGtk -> (gnome3 != null);
-
-stdenv.mkDerivation rec {
-
-  versionMajor = "3.2";
-  versionMinor = "6";
-  moduleName   = "GConf";
-
-  origName = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  name = "gconf-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
-    sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
-  };
-
-  buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk;
-  propagatedBuildInputs = [ glib dbus_glib  ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  # ToDo: ldap reported as not found but afterwards reported as supported
-
-  meta = with stdenv.lib; {
-    homepage = http://projects.gnome.org/gconf/;
-    description = "A system for storing application preferences";
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
deleted file mode 100644
index c7b4cdd0ab2f1..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
-, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
-, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "gcr-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gcr/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0xfhi0w358lvca1jjx24x2gm67mif33dsnmi9cv5i0f83ks8vzpc";
-  };
-
-  buildInputs = [
-    pkgconfig intltool gnupg glib gobjectIntrospection libxslt
-    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala
-  ];
-
-  propagatedBuildInputs = [ p11_kit ];
-
-  #doCheck = true;
-
-  #enableParallelBuilding = true; issues on hydra
-
-  preFixup = ''
-    wrapProgram "$out/bin/gcr-viewer" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
deleted file mode 100644
index 3749be2de27f7..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
-, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gdm-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3";
-  };
-
-  preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
-    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
-    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.dbus-launch}'
-    substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
-    sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in
- '';
-
-  configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth"
-                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-                     "--with-initial-vt=10" ];
-
-  buildInputs = [ pkgconfig glib itstool libxml2 intltool
-                  accountsservice gnome3.dconf systemd
-                  gobjectIntrospection libX11 gtk
-                  libcanberra_gtk3 pam libtool ];
-
-  #enableParallelBuilding = true; # problems compiling
-
-  # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GDM;
-    description = "A program that manages graphical display servers and handles graphical user logins";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch
deleted file mode 100644
index 7691a9e86f0fd..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gdm-3.16.0/daemon/gdm-display.c.orig	2015-04-08 13:53:14.370274369 +0200
-+++ gdm-3.16.0/daemon/gdm-display.c	2015-04-08 13:53:36.287520435 +0200
-@@ -1706,9 +1706,10 @@
- 
-                 gdm_error_trap_push ();
- 
--                for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
-+                /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
-                         XAddHost (self->priv->x11_display, &host_entries[i]);
--                }
-+                }*/
-+                XDisableAccessControl(self->priv->x11_display);
- 
-                 XSync (self->priv->x11_display, False);
-                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch
deleted file mode 100644
index b8fbad4d731d0..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index f759d2d..d154716 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -373,9 +373,12 @@ get_system_session_dirs (void)
- #ifdef ENABLE_WAYLAND_SUPPORT
-                 DATADIR "/wayland-sessions/",
- #endif
-+                NULL,
-                 NULL
-         };
- 
-+        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
-+
-         return search_dirs;
- }
- 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch
deleted file mode 100644
index b451d129391a0..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
-+++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
-@@ -322,7 +322,11 @@
- fallback:
- #endif
- 
--        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+        } else {
-+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        }
- }
- 
- static gboolean
---- gdm-3.16.0/daemon/gdm-x-session.c.orig	2015-04-15 18:44:16.875743928 +0200
-+++ gdm-3.16.0/daemon/gdm-x-session.c	2015-04-16 13:34:02.335708638 +0200
-@@ -207,6 +207,8 @@
-         char     *display_fd_string = NULL;
-         char     *vt_string = NULL;
-         char     *display_number;
-+        int nixos_argc = 0;
-+        char **nixos_argv = NULL;
-         gsize     display_number_size;
- 
-         auth_file = prepare_auth_file ();
-@@ -236,7 +238,15 @@
- 
-         display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
- 
--        g_ptr_array_add (arguments, X_SERVER);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+                int i = 0;
-+                g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL);
-+                for (i = 0; i < nixos_argc; i++) {
-+                        g_ptr_array_add (arguments, nixos_argv[i]);
-+                }
-+        } else {
-+                g_ptr_array_add (arguments, X_SERVER);
-+        }
- 
-         if (vt_string != NULL) {
-                 g_ptr_array_add (arguments, vt_string);
-@@ -259,12 +269,12 @@
-         g_ptr_array_add (arguments, "-noreset");
-         g_ptr_array_add (arguments, "-keeptty");
- 
--        g_ptr_array_add (arguments, "-verbose");
-+        /*g_ptr_array_add (arguments, "-verbose");
-         if (state->debug_enabled) {
-                 g_ptr_array_add (arguments, "7");
-         } else {
-                 g_ptr_array_add (arguments, "3");
--        }
-+        }*/
- 
-         if (state->debug_enabled) {
-                 g_ptr_array_add (arguments, "-core");
-@@ -275,6 +285,9 @@
-                                                    (const char * const *) arguments->pdata,
-                                                    &error);
-         g_free (display_fd_string);
-+        if (nixos_argv) {
-+                 g_strfreev (nixos_argv);
-+        }
-         g_clear_object (&launcher);
-         g_ptr_array_free (arguments, TRUE);
- 
---- gdm-3.16.0/daemon/gdm-session.c.orig	2015-04-16 14:19:01.392802683 +0200
-+++ gdm-3.16.0/daemon/gdm-session.c	2015-04-16 14:20:36.012296764 +0200
-@@ -2359,6 +2359,12 @@
-         gchar *desktop_names;
-         const char *locale;
- 
-+        if (g_getenv ("GDM_X_SERVER") != NULL) {
-+                gdm_session_set_environment_variable (self,
-+                                                      "GDM_X_SERVER",
-+                                                      g_getenv ("GDM_X_SERVER"));
-+        }
-+
-         gdm_session_set_environment_variable (self,
-                                               "GDMSESSION",
-                                               get_session_name (self));
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
deleted file mode 100644
index 7759d21960cb0..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
-, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gdm-3.14.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gdm/3.14/${name}.tar.xz";
-    sha256 = "0c2rvgcrf4s0nkxb19hf9pgh9c5pm6pginsq21dxj6hnjqabc3p2";
-  };
-
-  # Only needed to make it build
-  preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
-  '';
-
-  configureFlags = [ "--sysconfdir=/etc"
-                     "--localstatedir=/var"
-                     "--with-systemd=yes"
-                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
-
-  buildInputs = [ pkgconfig glib itstool libxml2 intltool
-                  accountsservice gnome3.dconf systemd
-                  gobjectIntrospection libX11 gtk
-                  libcanberra_gtk3 pam libtool ];
-
-  #enableParallelBuilding = true; # problems compiling
-
-  preBuild = ''
-    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
-  '';
-
-  # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch ./sessions_dir.patch
-              ./disable_x_access_control.patch ./no-dbus-launch.patch ];
-
-  installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GDM;
-    description = "A program that manages graphical display servers and handles graphical user logins";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch
deleted file mode 100644
index e100e013b786f..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gdm-3.14.2/daemon/gdm-slave.c.orig	2015-04-16 15:05:27.844353079 +0200
-+++ gdm-3.14.2/daemon/gdm-slave.c	2015-04-16 15:05:40.240417915 +0200
-@@ -369,8 +369,9 @@
-                 gdm_error_trap_push ();
- 
-                 for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
--                        XAddHost (slave->priv->server_display, &host_entries[i]);
-+                        //XAddHost (slave->priv->server_display, &host_entries[i]);
-                 }
-+                XDisableAccessControl(slave->priv->server_display);
- 
-                 XSync (slave->priv->server_display, False);
-                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch
deleted file mode 100644
index c87554078c7c4..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/daemon/gdm-launch-environment.c	2015-06-22 15:11:07.277474398 +0000
-+++ b/daemon/gdm-launch-environment.c	2015-06-22 15:12:31.301157665 +0000
-@@ -48,8 +48,6 @@
- #include "gdm-session-enum-types.h"
- #include "gdm-launch-environment.h"
- 
--#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session"
--
- extern char **environ;
- 
- #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate))
-@@ -512,7 +510,7 @@
-                 gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command);
-         } else {
-                 /* wrap it in dbus-launch */
--                char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command);
-+                char *command = g_strdup (launch_environment->priv->command);
- 
-                 gdm_session_select_program (launch_environment->priv->session, command);
-                 g_free (command);
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch
deleted file mode 100644
index b8fbad4d731d0..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index f759d2d..d154716 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -373,9 +373,12 @@ get_system_session_dirs (void)
- #ifdef ENABLE_WAYLAND_SUPPORT
-                 DATADIR "/wayland-sessions/",
- #endif
-+                NULL,
-                 NULL
-         };
- 
-+        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
-+
-         return search_dirs;
- }
- 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch
deleted file mode 100644
index 412daee9f2707..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
-+++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
-@@ -322,7 +322,11 @@
- fallback:
- #endif
- 
--        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+        } else {
-+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        }
- }
- 
- static gboolean
diff --git a/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix
deleted file mode 100644
index 97c5ce2a71ffb..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }:
-
-
-stdenv.mkDerivation rec {
-  name = "geocode-glib-${gnome3.version}.0";
-
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/geocode-glib/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1cbfv0kds6b6k0cl7q47xpj3x1scwcd7m68zl1rf7i4hmhw4hpqj";
-  };
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig glib libsoup json_glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
deleted file mode 100644
index ac53726bc537a..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-, spidermonkey_24, pango, readline, glib, libxml2 }:
-
-let
-  majorVersion = "1.43";
-in
-stdenv.mkDerivation rec {
-  name = "gjs-${majorVersion}.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gjs/${majorVersion}/${name}.tar.xz";
-    sha256 = "0khwm8l6m6x71rwf3q92d6scbhmrpiw7kqmj34nn588fb7a4vdc2";
-  };
-
-  buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline ];
-
-  propagatedBuildInputs = [ spidermonkey_24 ];
-
-  postInstall = ''
-    sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
-  '';
-
-  meta = with stdenv.lib; {
-    maintainers = gnome3.maintainers;
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix
deleted file mode 100644
index 12b4561e6315e..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, intltool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-backgrounds-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0fx0pjz356v4w462i9a3z9r26khxqmj0zhp7wfl5scyq07fzkqvn";
-  };
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
deleted file mode 100644
index e511cea941c8b..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
-, udev, itstool, libxml2, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-bluetooth-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.version}/${name}.tar.xz";
-    sha256 = "12z0792j5ln238ajhgqx5jrm34wz2yqbbskhlp23p9c0cwnj1srz";
-  };
-
-  buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
-                               makeWrapper gsettings_desktop_schemas itstool ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/bluetooth-sendto" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
-    description = "Application that let you manage Bluetooth in the GNOME destkop";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
deleted file mode 100644
index a13ca33fc81a9..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libxml2
-, bash, gtk3, glib, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-calculator-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-calculator/${gnome3.version}/${name}.tar.xz";
-    sha256 = "068mnwkxliwafcfk70cz85fqna76vjj7kgsm4yqs4c1fd72gphmv";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  libxml2 gnome3.gtksourceview mpfr gmp
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-calculator" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
-    description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
deleted file mode 100644
index 2762b3fa33bf0..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, which, gnome3, autoconf, automake }:
-
-let
-  majVer = "3.14";
-in stdenv.mkDerivation rec {
-  name = "gnome-common-${majVer}.0";
-
-  src = fetchurl {
-    url = "https://download.gnome.org/sources/gnome-common/${majVer}/${name}.tar.xz";
-    sha256 = "0b1676g4q44ah73c5gwl1kg88pc93pnq1pa9kwl43d0vg0pj802c";
-  };
-
-  patches = [(fetchurl {
-    name = "gnome-common-3-patch";
-    url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
-    sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
-  })];
-
-  propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
-
-  meta = with stdenv.lib; {
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
deleted file mode 100644
index 2e89210413f35..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, intltool, fetchurl, evolution_data_server, db
-, pkgconfig, gtk3, glib, libsecret
-, libchamplain, clutter_gtk, geocode_glib
-, bash, makeWrapper, itstool, folks, libnotify, libxml2
-, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
-, libsoup, vala, dbus_glib, automake115x, autoconf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-contacts-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-contacts/${gnome3.version}/${name}.tar.xz";
-    sha256 = "09syi67ijdx9dhsx9c740mf3fhs6z3kaijdr3fyj8gd80h7a3hym";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ];
-
-  # force build from vala
-  preBuild = ''
-   touch src/*.vala
-  '';
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
-                  gnome3.gsettings_desktop_schemas makeWrapper file libnotify
-                  folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
-                  libxml2 libsoup gnome3.gnome_online_accounts nspr nss
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  libchamplain clutter_gtk geocode_glib
-                  vala automake115x autoconf db ];
-
-  preFixup = ''
-    for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  patches = [ ./gio_unix.patch ];
-
-  patchFlags = "-p0";
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Contacts;
-    description = "Contacts is GNOME's integrated address book";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch
deleted file mode 100644
index f1b3d3c94ac26..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig	2015-04-09 18:45:50.581232289 +0200
-+++ configure.ac	2015-04-09 18:45:59.744280137 +0200
-@@ -54,6 +54,7 @@
- 	     champlain-0.12
- 	     clutter-gtk-1.0
- 	     geocode-glib-1.0 >= 3.15.3
-+	     gio-unix-2.0
- 	     "
- PKG_CHECK_MODULES(CONTACTS, [$pkg_modules])
- 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
deleted file mode 100644
index 0ca81f542993b..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
-, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
-, gdk_pixbuf, librsvg, libxkbfile, libnotify
-, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
-, cracklib, python, libkrb5, networkmanagerapplet, networkmanager
-, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev, libgudev
-, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk
-, fontconfig, sound-theme-freedesktop }:
-
-# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
-# TODO: bluetooth, wacom, printers
-
-stdenv.mkDerivation rec {
-  name = "gnome-control-center-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-control-center/${gnome3.version}/${name}.tar.xz";
-    sha256 = "07vvmnqjjcc0cblpr6cdmg3693hihpjrq3q30mm3q68pdyfzbjgf";
-  };
-
-  propagatedUserEnvPkgs =
-    [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=752596
-  enableParallelBuilding = false;
-
-  buildInputs = with gnome3;
-    [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
-      libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
-      gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality
-      accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
-      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
-      gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
-      gnome3.vino udev libgudev libcanberra_gtk3
-      networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ];
-
-  preBuild = ''
-    substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
-    substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
-
-    # hack to make test-endianess happy
-    mkdir -p $out/share/locale
-    substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/"
-  '';
-
-  patches = [ ./vpn_plugins_path.patch ];
-
-  preFixup = with gnome3; ''
-    wrapProgram $out/bin/gnome-control-center \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    for i in $out/share/applications/*; do
-      substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Utilities to configure the GNOME desktop";
-    license = licenses.gpl2Plus;
-    maintainers = gnome3.maintainers;
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch
deleted file mode 100644
index e25105a303f41..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c
-index 7dc23c2..fcb1384 100644
---- a/panels/network/connection-editor/vpn-helpers.c
-+++ b/panels/network/connection-editor/vpn-helpers.c
-@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error)
- 		if (!so_path)
- 			goto next;
- 
--		/* Remove any path and extension components, then reconstruct path
--		 * to the SO in LIBDIR
--		 */
--		so_name = g_path_get_basename (so_path);
--		g_free (so_path);
--		so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL);
--		g_free (so_name);
--
- 		module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
- 		if (!module) {
- 			g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the "
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
deleted file mode 100644
index e9a853c56a1e3..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
-, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
-, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-
-  majorVersion = gnome3.version;
-  minorVersion = "1";
-  name = "gnome-desktop-${majorVersion}.${minorVersion}";
-
-  # this should probably be setuphook for glib
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz";
-    sha256 = "0v7md6csbnv55j4kns2q0zjl4040zwf3ld6lc3qvik40fkzzbrjb";
-  };
-
-  buildInputs = [ pkgconfig python libxml2Python libxslt which libX11
-                  xkeyboard_config isocodes itstool wayland
-                  gtk3 glib intltool gnome_doc_utils libxkbfile
-                  gobjectIntrospection ];
-
-  propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
deleted file mode 100644
index 18b89279696e0..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-dictionary-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-dictionary/${gnome3.version}/${name}.tar.xz";
-    sha256 = "17ha4pmnh9v98hxqy4pr3ri9wsck9njfjwd8qa0gycksmbyd1cag";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-dictionary" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Dictionary;
-    description = "Dictionary is the GNOME application to look up definitions";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
deleted file mode 100644
index ea29cda296129..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
-, bash, gtk3, glib, makeWrapper, cracklib, libnotify
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
-, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-disk-utility-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.version}/${name}.tar.xz";
-    sha256 = "14h92bznizq0k4qz7hn41axhhfjyw2ncnmbkf8kldi9x909fvpml";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  libxslt libtool libsecret libpwquality cracklib
-                  libnotify libdvdread libcanberra_gtk3 docbook_xsl
-                  gdk_pixbuf gnome3.defaultIconTheme
-                  librsvg udisks2 gnome3.gnome_settings_daemon
-                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-disks" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
-    description = "A udisks graphical front-end";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
deleted file mode 100644
index 39d5e71a5a3e5..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool
-, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-font-viewer-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0dnkpg1d71dbzazi5chg3vj8bbia2w6k0ji4vh2f4s0b9rvybgzc";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-font-viewer" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Program that can preview fonts and create thumbnails for fonts";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
deleted file mode 100644
index c3f16db359e54..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
-, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
-, docbook_xsl_ns, docbook_xsl, gnome3 }:
-
-let
-  majVer = gnome3.version;
-in stdenv.mkDerivation rec {
-  name = "gnome-keyring-${majVer}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-keyring/${majVer}/${name}.tar.xz";
-    sha256 = "1xg1xha3x3hzlmvdq2zm90hc61pj7pnf9yxxvgq4ynl5af6bp8qm";
-  };
-
-  buildInputs = with gnome3; [
-    dbus libgcrypt pam python gtk3 gconf libgnome_keyring
-    pango gcr gdk_pixbuf atk p11_kit makeWrapper
-  ];
-
-  propagatedBuildInputs = [ glib libtasn1 libxslt ];
-
-  nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
-
-  configureFlags = [
-    "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" # NixOS hardcoded path
-    "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
-    "--with-pkcs11-modules=$$out/lib/pkcs11/"
-  ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-keyring" \
-      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    wrapProgram "$out/bin/gnome-keyring-daemon" \
-      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix
deleted file mode 100644
index 90209634fbf18..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-menus-${version}";
-  version = "3.10.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz";
-    sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
-  };
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
-
-  meta = {
-    homepage = "http://www.gnome.org";
-    description = "Gnome menu specification";
-
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
deleted file mode 100644
index 8bb21feb54ab8..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper
-, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
-, telepathy_glib, intltool, dbus_libs, icu, autoreconfHook
-, libsoup, docbook_xsl_ns, docbook_xsl, gnome3
-}:
-
-stdenv.mkDerivation rec {
-  name = "gnome-online-accounts-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1mpzj6fc42hhx77lki8cdycgfj9gjrm611rh0wsaqam4qq2c9a9c";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
-
-  enableParallelBuilding = true;
-
-  preAutoreconf = ''
-    sed '/disable-settings/d' -i configure.ac
-    sed "/if HAVE_INTROSPECTION/a INTROSPECTION_COMPILER_ARGS = --shared-library=$out/lib/libgoa-1.0.so" -i src/goa/Makefile.am
-  '';
-
-  buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper
-                  libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook
-                  docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ];
-
-  preFixup = ''
-    for f in "$out/libexec/"*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix
deleted file mode 100644
index 4c879b7509804..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
-, libsoup, json_glib, gmp, openssl, makeWrapper }:
-
-let
-  majVer = "3.14";
-in stdenv.mkDerivation rec {
-  name = "gnome-online-miners-${majVer}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-miners/${majVer}/${name}.tar.xz";
-    sha256 = "0bbak8srcrvnw18s4ls5mqaamx9nqdi93lij6yjs0a3q320k22xl";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
-                  gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
-                  gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
-                  gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    for f in $out/libexec/*; do
-      wrapProgram "$f" \
-        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
-    description = "A set of crawlers that go through your online content and index them locally in Tracker";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
deleted file mode 100644
index 0c18826086704..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
-, bash, gtk3, glib, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-screenshot-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-screenshot/${gnome3.version}/${name}.tar.xz";
-    sha256 = "5dd4bafb3deb0967866726ba89dab62bbd6dc3bda3b190474281142aa3dee948";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-screenshot" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot;
-    description = "Utility used in the GNOME desktop environment for taking screenshots";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
deleted file mode 100644
index bce31242dac05..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg }:
-
-
-stdenv.mkDerivation rec {
-  name = "gnome-session-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-session/${gnome3.version}/${name}.tar.xz";
-    sha256 = "17d9zryq13ajmai6fqynpfgghms52sj9h756f086i7fxbr2nsm4v";
-  };
-
-  configureFlags = "--enable-systemd";
-
-  buildInputs = with gnome3;
-    [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt 
-      gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
-      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-session" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
deleted file mode 100644
index c80d1101ac9f5..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
-, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
-, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager
-, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-settings-daemon-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1l61h497v57g3iqfmyzjh15z4c4akky3xziymphswzigb1ssv3da";
-  };
-
-  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
-      libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
-      libcanberra_gtk3 upower colord libgweather xkeyboard_config
-      polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
-      libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
-
-  preFixup = ''
-    wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix PATH : "${glib}/bin" \
-      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
deleted file mode 100644
index d4e5d807e483f..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, gnome3, file }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-shell-extensions-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0hd7jskwhrki0s9lmx6vc6rw9y689zp2h7zhlxk90hghy4nkvkc8";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool
-                  makeWrapper file ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;
-    description = "Modify and extend GNOME Shell functionality and behavior";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
deleted file mode 100644
index 899efc5443bb6..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
-, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
-, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
-, sqlite, libgweather, libcanberra_gtk3
-, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
-, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
-
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  # Needed to find /etc/NetworkManager/VPN
-  configureFlags = [ "--sysconfdir=/etc" ];
-
-  buildInputs = with gnome3;
-    [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
-      libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg
-      clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
-      libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
-      libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm
-      libcanberra_gtk3 gnome_control_center
-      defaultIconTheme sqlite gnome3.gnome-bluetooth
-      libgweather # not declared at build time, but typelib is needed at runtime
-      gnome3.gnome-clocks # schemas needed
-      at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
-
-  installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
-
-  preBuild = ''
-    patchShebangs src/data-to-c.pl
-    substituteInPlace data/Makefile --replace " install-keysDATA" ""
-  '';
-
-  preFixup = with gnome3; ''
-    wrapProgram "$out/bin/gnome-shell" \
-      --prefix PATH : "${unzip}/bin" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --suffix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
-    wrapProgram "$out/libexec/gnome-shell-calendar-server" \
-      --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
-    echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
-  '';
-
-  passthru = {
-    mozillaPlugin = "/lib/mozilla/plugins";
-  };
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix
deleted file mode 100644
index 782e18e4a9ddd..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-shell-3.16.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-shell/3.16/gnome-shell-3.16.1.tar.xz;
-    sha256 = "9bd9fbb40fb003ae09bebfe29d5b6a569b1fbb4a81c92ac9bada5efb956bf201";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
deleted file mode 100644
index 50ee229cfa498..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig
-, bash, gtk3, glib, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-system-log-3.9.90";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz";
-    sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-system-log" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-system-log/3.9/;
-    description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
deleted file mode 100644
index 353c8fcf4dbef..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
-, bash, gtk3, glib, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-system-monitor-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.version}/${name}.tar.xz";
-    sha256 = "14akcz4dwjnfx47gncyavjr82zc78a912v5gdp6h3z19bn5nx4q0";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
-                  gtkmm3 libgtop makeWrapper
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-system-monitor" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/;
-    description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
deleted file mode 100644
index 8be614f7397c1..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, libuuid, vala
-, desktop_file_utils, itstool, makeWrapper, appdata-tools }:
-
-stdenv.mkDerivation rec {
-
-  versionMajor = gnome3.version;
-  versionMinor = "1";
-
-  name = "gnome-terminal-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz";
-    sha256 = "0nxlsz9hwajqfrblvqzc09599dra3van2znmcknnhjcfv3slvkkx";
-  };
-
-  buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
-                  gnome3.dconf itstool makeWrapper gnome3.nautilus vala ];
-
-  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
-
-  # Silly ./configure, it looks for dbus file from gnome-shell in the
-  # installation tree of the package it is configuring.
-  preConfigure = ''
-    mkdir -p "$out/share/dbus-1/interfaces"
-    cp "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" "$out/share/dbus-1/interfaces"
-  '';
-
-  # FIXME: enable for gnome3
-  configureFlags = [ "--disable-migration" ];
-
-  preFixup = ''
-    for f in "$out/libexec/gnome-terminal-server"; do
-      wrapProgram "$f" \
-        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
deleted file mode 100644
index 7bd689511d534..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2
-, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-themes-standard-${gnome3.version}.0";
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-themes-standard/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0kyrbfrgl6g6wm6zpllldz36fclvl8vwmn1snwk18kf7f6ncpsac";
-  };
-  
-  buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf
-                  gnome3.defaultIconTheme ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix
deleted file mode 100644
index 17ebc84ced8c8..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-user-docs-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-docs/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0cck9hnp9az6qan97cv2d5lxlnzfss38h73g1a6dbspl4bnghy4n";
-  };
-
-  buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}";
-    description = "User and system administration help for the GNOME desktop";
-    maintainers = gnome3.maintainers;
-    license = licenses.cc-by-30;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
deleted file mode 100644
index cd02dcb821f84..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus
-, pkgconfig, gtk3, glib, libxml2, gnused
-, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd
-, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
-
-let
-  majVer = "3.14";
-in stdenv.mkDerivation rec {
-  name = "gnome-user-share-${majVer}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-share/${majVer}/${name}.tar.xz";
-    sha256 = "1s9fjzr161hy53i9ibk6aamc9af0cg8s151zj2fb6fxg67pv61bb";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  preConfigure = ''
-    sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf 
-  '';
-
-  configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd"
-                     "--with-modules-path=${apacheHttpd_2_2.out}/modules"
-                     "--disable-bluetooth"
-                     "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
-                  makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  nautilus libnotify libcanberra_gtk3 ];
-
-  postInstall = ''
-    mkdir -p $out/share/gsettings-schemas/$name
-    mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
-    ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
-  '';
-
-  preFixup = ''
-    wrapProgram "$out/libexec/gnome-user-share-webdav" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-user-share/3.8;
-    description = "Service that exports the contents of the Public folder in your home directory on the local network";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix
deleted file mode 100644
index a236238c257fb..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite
-, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av
-, gmime, json_glib, avahi, tracker, itstool }:
-
-stdenv.mkDerivation rec {
-  name = "grilo-plugins-0.2.13";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz";
-    sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55";
-  };
-
-  installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ];
-
-  buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
-                  lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts
-                  gnome3.totem-pl-parser gnome3.rest gmime json_glib
-                  avahi gnome3.libmediaart tracker intltool itstool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
-    description = "A collection of plugins for the Grilo framework";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
deleted file mode 100644
index 16dfb638a2490..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib
-, libxml2, gnome3, gobjectIntrospection, libsoup }:
-
-stdenv.mkDerivation rec {
-  name = "grilo-0.2.12";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz";
-    sha256 = "11bvc7rsrjjwz8hp67p3fn8zmywrpawrcbi3vgw8b0dwa0sndd2m";
-  };
-
-  setupHook = ./setup-hook.sh;
-
-  configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
-
-  preConfigure = ''
-    for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
-       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
-       substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
-    done
-  '';
-
-  buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
-                  gnome3.totem-pl-parser gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
-    description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh
deleted file mode 100644
index bc93dddec3864..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-make_grilo_find_plugins() {
-    if [ -d "$1"/lib/grilo-0.2 ]; then
-        addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.2"
-    fi
-}
-
-envHooks+=(make_grilo_find_plugins)
diff --git a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
deleted file mode 100644
index 53522c1307331..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
-  # just for passthru
-, gnome3, gtk3, gsettings_desktop_schemas }:
-
-stdenv.mkDerivation rec {
-
-  versionMajor = gnome3.version;
-  versionMinor = "1";
-  moduleName   = "gsettings-desktop-schemas";
-
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "0q9l9fr90pcb3s6crbxkj3wiwn7wp9zfpv7bdxkadj0hspd9zzkl";
-  };
-
-  postPatch = ''
-    for file in "background" "screensaver"; do
-      substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \
-        --replace "@datadir@" "${gnome3.gnome-backgrounds}/share/"
-    done
-  '';
-
-  buildInputs = [ glib gobjectIntrospection ];
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
deleted file mode 100644
index 5f255743313ef..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }:
-
-let
-  majVer = "1.0";
-in stdenv.mkDerivation rec {
-  name = "gsound-${majVer}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz";
-    sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29";
-  };
-
-  buildInputs = [ pkgconfig glib libcanberra gobjectIntrospection libtool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GSound;
-    description = "Small library for playing system sounds";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix
deleted file mode 100644
index 3aacdef9455e5..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
-, libxml2Python, perl, intltool, gettext, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "gtksourceview-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/${gnome3.version}/${name}.tar.xz";
-    sha256 = "030v7x1dmx5blqi9jcknsjd91jppbpl7f4z69k8c8kklr939i7k6";
-  };
-
-  propagatedBuildInputs = [ gtk3 ];
-
-  buildInputs = [ pkgconfig atk cairo glib pango
-                  libxml2Python perl intltool gettext ];
-
-  preBuild = ''
-    substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
-  ''; 
-
-  patches = [ ./nix_share_path.patch ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch
deleted file mode 100644
index c87350167c25c..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gtksourceview/gtksourceview-utils.c	2014-07-13 16:13:57.418687726 +0200
-+++ b/gtksourceview/gtksourceview-utils.c	2014-07-13 16:14:20.550847767 +0200
-@@ -68,6 +68,8 @@
- 							 basename,
- 							 NULL));
- 
-+        g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL));
-+
- 	g_ptr_array_add (dirs, NULL);
- 
- 	return (gchar**) g_ptr_array_free (dirs, FALSE);
diff --git a/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix
deleted file mode 100644
index 71a8dbf0ff847..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3
-, glib, desktop_file_utils, bash, appdata-tools
-, makeWrapper, gnome3, file, itstool, libxml2 }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.adwaita-icon-theme 
-
-stdenv.mkDerivation rec {
-  name = "gucharmap-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gucharmap/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1l26prbi5dmzxs62fz3vrhsif9jwqw4065qxp8hnc8bv34h59phw";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
-  buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools
-                  gnome3.yelp_tools libxml2 file desktop_file_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gucharmap" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Gucharmap;
-    description = "GNOME Character Map, based on the Unicode Character Database";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
deleted file mode 100644
index 76d9118c4b956..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, glib }:
-
-stdenv.mkDerivation rec {
-  name = "libcroco-0.6.8";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
-    sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
-  };
-
-  outputs = [ "dev" "out" ];
-  outputBin = "dev";
-
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
-
-  buildInputs = [ pkgconfig libxml2 glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix
deleted file mode 100644
index bedbbee2dfe52..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib
-, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }:
-
-let
-  majorVersion = "0.16";
-in
-stdenv.mkDerivation rec {
-  name = "libgdata-${majorVersion}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz";
-    sha256 = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827";
-  };
-
-  # TODO: need libuhttpmock
-  configureFlags = "--disable-tests";
-  
-  NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
-
-  buildInputs = with gnome3;
-    [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection 
-      liboauth gcr gnome_online_accounts p11_kit openssl ];
-
-  propagatedBuildInputs = [ json_glib ];
-      
-  meta = with stdenv.lib; {
-    description = "GData API library";
-    maintainers = with maintainers; [ raskin lethalman ];
-    platforms = platforms.linux;
-    license = licenses.lgpl21Plus;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix
deleted file mode 100644
index 4ff132950319f..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }:
-let
-  ver_maj = "0.16";
-  ver_min = "1";
-in
-stdenv.mkDerivation rec {
-  name = "libgee-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
-    sha256 = "d95f8ea8e78f843c71b1958fa2fb445e4a325e4821ec23d0d5108d8170e564a5";
-  };
-
-  doCheck = true;
-
-  patches = [ ./fix_introspection_paths.patch ];
-
-  buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch
deleted file mode 100644
index 67003f451645d..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- fix_introspection_paths.patch/configure	2014-01-07 17:43:53.521339338 +0000
-+++ fix_introspection_paths.patch/configure-fix	2014-01-07 17:45:11.068635069 +0000
-@@ -12085,8 +12085,8 @@
-        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
--       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
--       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+       INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
-+       INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
-        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/libgee-1.nix b/pkgs/desktops/gnome-3/3.16/core/libgee/libgee-1.nix
deleted file mode 100644
index 1715e7eeb8569..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgee/libgee-1.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }:
-let
-  ver_maj = "0.6";
-  ver_min = "8";
-in
-stdenv.mkDerivation rec {
-  name = "libgee-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
-    sha256 = "1lzmxgz1bcs14ghfp8qqzarhn7s64ayx8c508ihizm3kc5wqs7x6";
-  };
-
-  doCheck = true;
-
-  patches = [ ./fix_introspection_paths.patch ];
-
-  buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.spacefrogg ] ++ gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix
deleted file mode 100644
index c6c9323c010a3..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "libgnome-keyring-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz";
-    sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
-  };
-
-  propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = {
-    description = "Framework for managing passwords and other secrets";
-    homepage = http://live.gnome.org/GnomeKeyring;
-    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
-    inherit (glib.meta) platforms maintainers;
-
-    longDescription = ''
-      gnome-keyring is a program that keeps password and other secrets for
-      users. The library libgnome-keyring is used by applications to integrate
-      with the gnome-keyring system.
-    '';
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
deleted file mode 100644
index 4939a4ff72817..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "libgnomekbd-3.6.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz";
-    sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09";
-  };
-
-  buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ];
-
-  preFixup = ''
-    wrapProgram $out/bin/gkbd-keyboard-display \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Keyboard management library";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix
deleted file mode 100644
index 8ba578bad2b80..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
-, pango, gdk_pixbuf, atk, tzdata, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "libgweather-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgweather/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1zadscn3i86fy7xpqiyw14pvz4f5cdw50ir77wd0zfr72hk5a2fv";
-  };
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
-  propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix
deleted file mode 100644
index 72d307f4f1a76..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
-, openssl, bzip2, acl, attr
-}:
-
-stdenv.mkDerivation rec {
-  name = "libgxps-0.2.2";
-
-  src = fetchurl {
-    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
-    sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
-  };
-
-  buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr];
-
-  configureFlags = "--without-liblcms2";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
deleted file mode 100644
index cf3f06fef58a6..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3
-, glib, gtk3, gobjectIntrospection, python, pygobject3
-}:
-
-let
-  majorVersion = "1.12";
-in
-stdenv.mkDerivation rec {
-  name = "libpeas-${version}";
-  version = "${majorVersion}.1";
-
-  buildInputs =  [
-   intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3
-   gnome3.defaultIconTheme
-  ];
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libpeas/${majorVersion}/${name}.tar.xz";
-    sha256 = "e610be31c9d382580fb5d8686f8311149f27413f55af6abf5c033178b99452d6";
-  };
-
-  preFixup = ''
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A GObject-based plugins engine";
-    homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix
deleted file mode 100644
index 5a8117528b68a..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }:
-
-stdenv.mkDerivation rec {
-  name = "libzapojit-0.0.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz";
-    sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
-  };
-
-  buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
deleted file mode 100644
index a60db8f93f247..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
-, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3
-, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon }:
-
-
-stdenv.mkDerivation rec {
-  name = "mutter-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/mutter/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0qq7gpkljn1z45sg2sxvmia52krj4ck2541iar89z99s1cppaasa";
-  };
-
-  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; 
-
-  buildInputs = with gnome3;
-    [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
-      gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra
-      gnome3.geocode_glib
-      libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/mutter" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  patches = [ ./x86.patch ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch
deleted file mode 100644
index bc8829de42f16..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mutter-3.16.2/src/core/window.c.orig	2015-05-26 10:52:41.382834963 +0200
-+++ mutter-3.16.2/src/core/window.c	2015-05-26 10:53:03.039948034 +0200
-@@ -3499,7 +3499,7 @@
- 
- static MetaMonitorInfo *
- find_monitor_by_winsys_id (MetaWindow *window,
--                           guint       winsys_id)
-+                           gint       winsys_id)
- {
-   int i;
- 
-@@ -3618,7 +3618,7 @@
-    */
- 
-   gboolean did_placement;
--  guint old_output_winsys_id;
-+  gint old_output_winsys_id;
-   MetaRectangle unconstrained_rect;
-   MetaRectangle constrained_rect;
-   MetaMoveResizeResultFlags result = 0;
diff --git a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
deleted file mode 100644
index 0e732b607484a..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
-, gtk, gnome3, libunique, intltool, gobjectIntrospection
-, libnotify, makeWrapper, exempi, librsvg, tracker }:
-
-stdenv.mkDerivation rec {
-  name = "nautilus-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/nautilus/${gnome3.version}/${name}.tar.xz";
-    sha256 = "13s785kzk68xf4gdj0inz9k2hy06ll598w42141svdj77bdcsziy";
-  };
-
-  buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
-                  gnome3.gnome_desktop gnome3.adwaita-icon-theme
-                  gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/nautilus" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  patches = [ ./extension_dir.patch ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch
deleted file mode 100644
index 317b825799245..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c
-index 6273a76..4adcc8a 100644
---- a/libnautilus-private/nautilus-module.c
-+++ b/libnautilus-private/nautilus-module.c
-@@ -242,11 +242,17 @@ void
- nautilus_module_setup (void)
- {
- 	static gboolean initialized = FALSE;
-+	const gchar* extensiondir = NULL;
- 
- 	if (!initialized) {
- 		initialized = TRUE;
--		
--		load_module_dir (NAUTILUS_EXTENSIONDIR);
-+	
-+		extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
-+		if (extensiondir == NULL) {
-+			extensiondir = NAUTILUS_EXTENSIONDIR;
-+		}
-+	
-+		load_module_dir (extensiondir);
- 
- 		eel_debug_call_at_shutdown (free_module_objects);
- 	}
diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
deleted file mode 100644
index eada9ab199340..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "rest-0.7.92";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
-    sha256 = "07548c8785a3e743daf54a82b952ff5f32af94fee68997df4c83b00d52f9c0ec";
-  };
-
-  buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
-
-  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
deleted file mode 100644
index 8e5a1e21f52ba..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
-, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz
-, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
-, gdk_pixbuf, librsvg, gtk3 }:
-
-stdenv.mkDerivation rec {
-  name = "sushi-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/sushi/3.12/${name}.tar.xz";
-    sha256 = "78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff";
-  };
-
-  propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
-
-  buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3
-                  clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf
-                  librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk
-                  gnome3.evince icu makeWrapper ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram $out/libexec/sushi-start \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "http://en.wikipedia.org/wiki/Sushi_(software)";
-    description = "A quick previewer for Nautilus";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
deleted file mode 100644
index 63f36004bcd67..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "totem-pl-parser-3.10.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";
-    sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
-  };
-
-  buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Videos;
-    description = "Simple GObject-based library to parse and save a host of playlist formats";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
deleted file mode 100644
index 41f220ec38b85..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, intltool, fetchurl, gst_all_1
-, clutter_gtk, clutter-gst, pygobject3, shared_mime_info
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2, dbus_glib
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "totem-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/totem/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1qv6s7c06r6kdrd3jjqk8h79y8a7h8pjcx02rzp869jr7d9hkcb9";
-  };
-
-  doCheck = true;
-
-  enableParallelBuilding = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
-                  clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  gnome3.libpeas pygobject3 shared_mime_info dbus_glib
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop
-                  gnome3.gsettings_desktop_schemas makeWrapper file ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/totem" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Videos;
-    description = "Movie player for the GNOME desktop based on GStreamer";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
deleted file mode 100644
index 88e6da2ad2d07..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, intltool, fetchurl, libxml2, upower
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, vala, sqlite, libxslt
-, gnome3, librsvg, gdk_pixbuf, file, libnotify
-, evolution_data_server, gst_all_1, poppler
-, icu, taglib, libjpeg, libtiff, giflib, libcue
-, libvorbis, flac, exempi, networkmanager
-, libpng, libexif, libgsf, libuuid, bzip2 }:
-
-let
-  majorVersion = "1.4";
-in
-stdenv.mkDerivation rec {
-  name = "tracker-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/tracker/${majorVersion}/${name}.tar.xz";
-    sha256 = "1ssisbix7ib3d6bgx9s675gx6ayy68jq2srhpzv038mkbaskaz68";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0 -I${poppler}/include/poppler";
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
-                  bzip2 gnome3.totem-pl-parser libxslt
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite
-                  upower libnotify evolution_data_server gnome3.libgee
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
-                  poppler icu taglib libjpeg libtiff giflib libvorbis
-                  exempi networkmanager libpng libexif libgsf libuuid ];
-
-  preConfigure = ''
-    substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql"
-  '';
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/Tracker;
-    description = "Desktop-neutral user information store, search tool and indexer";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
deleted file mode 100644
index dcfd7b08b08ef..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
-, gnome3, libnotify, file, telepathy_glib, dbus_glib }:
-
-stdenv.mkDerivation rec {
-  name = "vino-${versionMajor}.${versionMinor}";
-  versionMajor = gnome3.version;
-  versionMinor = "0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz";
-    sha256 = "1icdc2y78xfg7czfiz05y9vsxkzzgrc0dpsrcxb41bg0sh9kd3b0";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
-                  gnome3.defaultIconTheme dbus_glib telepathy_glib file
-                  makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/libexec/vino-server" \
-      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Vino;
-    description = "GNOME desktop sharing server";
-    maintainers = with maintainers; [ lethalman iElectric ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix
deleted file mode 100644
index 663d6b9e35242..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  versionMajor = "0.36";
-  versionMinor = "3";
-  moduleName   = "vte";
-
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
-  };
-
-  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
-
-  configureFlags = [ "--enable-introspection" ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.lib}/lib -lncurses"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/;
-    description = "A library implementing a terminal emulator widget for GTK+";
-    longDescription = ''
-      VTE is a library (libvte) implementing a terminal emulator widget for
-      GTK+, and a minimal sample application (vte) using that.  Vte is
-      mainly used in gnome-terminal, but can also be used to embed a
-      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
-      character set conversion, as well as emulating any terminal known to
-      the system's terminfo database.
-    '';
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ astsmtl antono lethalman ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
deleted file mode 100644
index 2f0062101f2ed..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection, vala, libxml2
-, gnutls, selectTextPatch ? false }:
-
-stdenv.mkDerivation rec {
-  versionMajor = "0.40";
-  versionMinor = "0";
-  moduleName   = "vte";
-
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "0lnq0bgkmsixjwmfacb2ch9qfjqjxa8zkk1hiv3l29kgca0n3nal";
-  };
-
-  patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.40.0.patch;
-
-  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib 
-                  gnome3.gtk3 ncurses vala libxml2 ];
-
-  propagatedBuildInputs = [ gnutls ];
-
-  preConfigure = "patchShebangs .";
-
-  configureFlags = [ "--enable-introspection" ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.lib}/lib -lncurses"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/;
-    description = "A library implementing a terminal emulator widget for GTK+";
-    longDescription = ''
-      VTE is a library (libvte) implementing a terminal emulator widget for
-      GTK+, and a minimal sample application (vte) using that.  Vte is
-      mainly used in gnome-terminal, but can also be used to embed a
-      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
-      character set conversion, as well as emulating any terminal known to
-      the system's terminfo database.
-    '';
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ astsmtl antono lethalman ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch
deleted file mode 100644
index c18f1b76b410c..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-Only in vte-0.40.0.new: .git
-diff --unified -aur vte-0.40.0/src/vteaccess.c vte-0.40.0.new/src/vteaccess.c
---- vte-0.40.0/src/vteaccess.c	2015-03-16 06:34:37.000000000 -0400
-+++ vte-0.40.0.new/src/vteaccess.c	2015-04-10 00:08:53.146853382 -0400
-@@ -1444,7 +1444,7 @@
- 	*start_offset = offset_from_xy (priv, start_x, start_y);
- 	_vte_terminal_get_end_selection (terminal, &end_x, &end_y);
- 	*end_offset = offset_from_xy (priv, end_x, end_y);
--	return _vte_terminal_get_selection (terminal);
-+	return vte_terminal_get_selection (terminal);
- }
- 
- static gboolean
-diff --unified -aur vte-0.40.0/src/vte.c vte-0.40.0.new/src/vte.c
---- vte-0.40.0/src/vte.c	2015-03-18 12:38:09.000000000 -0400
-+++ vte-0.40.0.new/src/vte.c	2015-04-10 00:08:53.150186722 -0400
-@@ -123,7 +123,6 @@
- 						 gpointer data,
- 						 GArray *attributes,
- 						 gboolean include_trailing_spaces);
--static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal);
- static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal);
- static void vte_terminal_stop_processing (VteTerminal *terminal);
- 
-@@ -3344,9 +3343,10 @@
- 	_vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n");
- 	terminal->pvt->pty_input_source = 0;
- }
--static void
--_vte_terminal_connect_pty_read(VteTerminal *terminal)
-+void
-+vte_terminal_connect_pty_read(VteTerminal *terminal)
- {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
- 	if (terminal->pvt->pty_channel == NULL) {
- 		return;
- 	}
-@@ -3398,9 +3398,10 @@
- 	}
- }
- 
--static void
--_vte_terminal_disconnect_pty_read(VteTerminal *terminal)
-+void
-+vte_terminal_disconnect_pty_read(VteTerminal *terminal)
- {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
- 	if (terminal->pvt->pty_input_source != 0) {
- 		_vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n");
- 		g_source_remove(terminal->pvt->pty_input_source);
-@@ -6302,6 +6303,28 @@
- 	}
- }
- 
-+/**
-+ * vte_terminal_set_cursor_position:
-+ * @terminal: a #VteTerminal
-+ * @column: the new cursor column
-+ * @row: the new cursor row
-+ *
-+ * Set the location of the cursor.
-+ */
-+void
-+vte_terminal_set_cursor_position(VteTerminal *terminal,
-+				 long column, long row)
-+{
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
-+
-+	_vte_invalidate_cursor_once(terminal, FALSE);
-+	terminal->pvt->cursor.col = column;
-+	terminal->pvt->cursor.row = row;
-+	_vte_invalidate_cursor_once(terminal, FALSE);
-+	_vte_check_cursor_blink(terminal);
-+	vte_terminal_queue_cursor_moved(terminal);
-+}
-+
- static GtkClipboard *
- vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board)
- {
-@@ -6465,7 +6488,7 @@
-         vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE);
- 
- 	/* Temporarily stop caring about input from the child. */
--	_vte_terminal_disconnect_pty_read(terminal);
-+	vte_terminal_disconnect_pty_read(terminal);
- }
- 
- static gboolean
-@@ -6482,7 +6505,7 @@
- 		terminal->pvt->selecting = FALSE;
- 
- 		/* Reconnect to input from the child if we paused it. */
--		_vte_terminal_connect_pty_read(terminal);
-+		vte_terminal_connect_pty_read(terminal);
- 
- 		return TRUE;
- 	}
-@@ -6982,6 +7005,50 @@
- 	vte_terminal_deselect_all (terminal);
- }
- 
-+/**
-+ * vte_terminal_get_selection_block_mode:
-+ * @terminal: a #VteTerminal
-+ *
-+ * Checks whether or not block selection is enabled.
-+ *
-+ * Returns: %TRUE if block selection is enabled, %FALSE if not
-+ */
-+gboolean
-+vte_terminal_get_selection_block_mode(VteTerminal *terminal) {
-+	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
-+	return terminal->pvt->selection_block_mode;
-+}
-+
-+/**
-+ * vte_terminal_set_selection_block_mode:
-+ * @terminal: a #VteTerminal
-+ * @block_mode: whether block selection is enabled
-+ *
-+ * Sets whether or not block selection is enabled.
-+ */
-+void
-+vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
-+	terminal->pvt->selection_block_mode = block_mode;
-+}
-+
-+/**
-+ * vte_terminal_select_text:
-+ * @terminal: a #VteTerminal
-+ * @start_col: the starting column for the selection
-+ * @start_row: the starting row for the selection
-+ * @end_col: the end column for the selection
-+ * @end_row: the end row for the selection
-+ *
-+ * Sets the current selection region.
-+ */
-+void
-+vte_terminal_select_text(VteTerminal *terminal,
-+			 long start_col, long start_row,
-+			 long end_col, long end_row) {
-+	_vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0);
-+}
-+
- /* Autoscroll a bit. */
- static gboolean
- vte_terminal_autoscroll(VteTerminal *terminal)
-@@ -8631,7 +8698,7 @@
- #endif
- 		kill(terminal->pvt->pty_pid, SIGHUP);
- 	}
--	_vte_terminal_disconnect_pty_read(terminal);
-+	vte_terminal_disconnect_pty_read(terminal);
- 	_vte_terminal_disconnect_pty_write(terminal);
- 	if (terminal->pvt->pty_channel != NULL) {
- 		g_io_channel_unref (terminal->pvt->pty_channel);
-@@ -12188,7 +12255,7 @@
-         g_object_freeze_notify(object);
- 
-         if (pvt->pty != NULL) {
--                _vte_terminal_disconnect_pty_read(terminal);
-+                vte_terminal_disconnect_pty_read(terminal);
-                 _vte_terminal_disconnect_pty_write(terminal);
- 
-                 if (terminal->pvt->pty_channel != NULL) {
-@@ -12243,7 +12310,7 @@
-         _vte_terminal_setup_utf8 (terminal);
- 
-         /* Open channels to listen for input on. */
--        _vte_terminal_connect_pty_read (terminal);
-+        vte_terminal_connect_pty_read (terminal);
- 
-         g_object_notify(object, "pty");
- 
-@@ -12276,7 +12343,7 @@
- }
- 
- char *
--_vte_terminal_get_selection(VteTerminal *terminal)
-+vte_terminal_get_selection(VteTerminal *terminal)
- {
- 	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
- 
-diff --unified -aur vte-0.40.0/src/vteint.h vte-0.40.0.new/src/vteint.h
---- vte-0.40.0/src/vteint.h	2014-05-28 08:22:48.000000000 -0400
-+++ vte-0.40.0.new/src/vteint.h	2015-04-10 00:08:53.153520062 -0400
-@@ -25,7 +25,6 @@
- G_BEGIN_DECLS
- 
- void _vte_terminal_accessible_ref(VteTerminal *terminal);
--char* _vte_terminal_get_selection(VteTerminal *terminal);
- void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y);
- void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y);
- void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset);
-diff --unified -aur vte-0.40.0/src/vteterminal.h vte-0.40.0.new/src/vteterminal.h
---- vte-0.40.0/src/vteterminal.h	2015-03-18 12:38:09.000000000 -0400
-+++ vte-0.40.0.new/src/vteterminal.h	2015-04-10 00:08:53.150186722 -0400
-@@ -169,6 +169,18 @@
- 
- void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
- void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_set_selection_block_mode(VteTerminal *terminal,
-+                                           gboolean block_mode) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_select_text(VteTerminal *terminal,
-+                              long start_col, long start_row,
-+                              long end_col, long end_row) _VTE_GNUC_NONNULL(1);
-+char *
-+vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+
-+/* pause and unpause output */
-+void vte_terminal_disconnect_pty_read(VteTerminal *vte);
-+void vte_terminal_connect_pty_read(VteTerminal *vte);
- 
- /* By-word selection */
- void vte_terminal_set_word_char_exceptions(VteTerminal *terminal,
-@@ -280,6 +292,8 @@
- void vte_terminal_get_cursor_position(VteTerminal *terminal,
- 				      glong *column,
-                                       glong *row) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_set_cursor_position(VteTerminal *terminal,
-+				      long column, long row) _VTE_GNUC_NONNULL(1);
- 
- /* Add a matching expression, returning the tag the widget assigns to that
-  * expression. */
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix
deleted file mode 100644
index adf01c6df8451..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
-
-let
-  majVer = gnome3.version;
-in stdenv.mkDerivation rec {
-  name = "yelp-tools-${majVer}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/yelp-tools/${majVer}/${name}.tar.xz";
-    sha256 = "177qzvj5w019isdp41qxqcys2kc4sq2x6dqhqn6l9ipib8a6rxml";
-  };
-
-  buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp/Tools;
-    description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
-    maintainers = with maintainers; [ iElectric ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix
deleted file mode 100644
index a76a2e3073ff8..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, bash
-, itstool, libxml2, libxslt, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "yelp-xsl-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/yelp-xsl/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0jhpni4mmfvj3xf57rjm61nc8d0x66hz9gd1ywws5lh39g6fx59j";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp;
-    description = "Yelp's universal stylesheets for Mallard and DocBook";
-    maintainers = gnome3.maintainers;
-    license = [licenses.gpl2 licenses.lgpl2];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
deleted file mode 100644
index e48dcafb3cf80..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, gnome3, gdk_pixbuf, sqlite
-, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1
-, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "yelp-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/yelp/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1jk7aad1srykhgc3x0hd3q3dnlshmy1ak00alwjzaasxvy6hp0b0";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
-  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite
-                  libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
-                  librsvg gdk_pixbuf gnome3.defaultIconTheme
-                  gnome3.gsettings_desktop_schemas wrapGAppsHook
-                  gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp;
-    description = "The help viewer in Gnome";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
deleted file mode 100644
index 9ce2726e7042b..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, itstool }:
-
-stdenv.mkDerivation rec {
-
-  versionMajor = "3.16";
-  versionMinor = "3";
-
-  name = "zenity-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz";
-    sha256 = "1fhyzcmhrzqi10ks1gy8cxyqnbdfsnmqw3bkixnzrcf5zcb81qkz";
-  };
-
-  preBuild = ''
-    mkdir -p $out/include
-  '';
-
-  buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
-
-  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
deleted file mode 100644
index 6899ed855c7da..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ /dev/null
@@ -1,399 +0,0 @@
-{ pkgs }:
-
-let
-
-  pkgsFun = overrides:
-    let 
-      self = self_ // overrides;
-      self_ = with self; {
-
-  overridePackages = f:
-    let newself = pkgsFun (f newself self);
-    in newself;
-
-  callPackage = pkgs.newScope self;
-
-  corePackages = with gnome3; [
-    pkgs.desktop_file_utils pkgs.ibus
-    pkgs.shared_mime_info # for update-mime-database
-    glib # for gsettings
-    gtk3 # for gtk-update-icon-cache
-    glib_networking gvfs dconf gnome-backgrounds gnome_control_center
-    gnome-menus gnome_settings_daemon gnome_shell
-    gnome_themes_standard defaultIconTheme gnome-shell-extensions
-    pkgs.hicolor_icon_theme
-  ];
-
-  optionalPackages = with gnome3; [ baobab empathy eog epiphany evince
-    gucharmap nautilus totem vino yelp gnome-bluetooth
-    gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
-    gnome-system-log gnome-system-monitor
-    gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
-    gnome-clocks gnome-music gnome-tweak-tool gnome-photos
-    nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
-    gnome-characters gnome-calendar accerciser gnome-nettool
-    gnome-getting-started-docs
-  ];
-
-  gamesPackages = with gnome3; [ swell-foop lightsoff iagno
-    tali quadrapassel gnome-sudoku aisleriot five-or-more
-    four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
-    gnome-mines gnome-nibbles gnome-robots gnome-tetravex
-    hitori gnome-taquin
-  ];
-
-  inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
-  inherit (pkgs.gnome2) ORBit2;
-  libsoup = pkgs.libsoup.override { gnomeSupport = true; };
-  libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
-  orbit = ORBit2;
-  gnome3 = self // { recurseForDerivations = false; };
-  clutter = pkgs.clutter_1_22;
-  clutter_gtk = pkgs.clutter_gtk_1_6.override { inherit clutter gtk3; };
-  clutter-gst_2 = pkgs.clutter-gst;
-  clutter-gst = pkgs.clutter-gst_3_0.override { inherit clutter; };
-  cogl = pkgs.cogl_1_20;
-  gtk = gtk3;
-  gtkmm = gtkmm3;
-  gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
-  vala = pkgs.vala_0_26;
-  gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
-
-  version = "3.16";
-  maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ];
-
-# Simplify the nixos module and gnome packages
-  defaultIconTheme = adwaita-icon-theme;
-
-#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
-
-  adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { };
-
-  baobab = callPackage ./core/baobab { };
-
-  caribou = callPackage ./core/caribou { };
-
-  dconf = callPackage ./core/dconf { };
-  dconf-editor = callPackage ./core/dconf-editor { };
-
-  empathy = callPackage ./core/empathy { 
-    webkitgtk = webkitgtk24x;
-    clutter-gst = pkgs.clutter-gst;
-  };
-
-  epiphany = callPackage ./core/epiphany { };
-
-  evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
-
-  evolution_data_server = callPackage ./core/evolution-data-server { };
-
-  gconf = callPackage ./core/gconf { };
-
-  geocode_glib = callPackage ./core/geocode-glib { };
-
-  gcr = callPackage ./core/gcr { }; # ToDo: tests fail
-
-  gdm = callPackage ./core/gdm { };
-
-  gjs = callPackage ./core/gjs { };
-
-  glib_networking = pkgs.glib_networking.override {
-    inherit gsettings_desktop_schemas;
-  };
-
-  gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
-
-  gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
-
-  gnome-contacts = callPackage ./core/gnome-contacts { };
-
-  gnome_control_center = callPackage ./core/gnome-control-center { };
-
-  gnome-calculator = callPackage ./core/gnome-calculator { };
-
-  gnome_common = callPackage ./core/gnome-common { };
-
-  gnome_desktop = callPackage ./core/gnome-desktop { };
-
-  gnome-dictionary = callPackage ./core/gnome-dictionary { };
-
-  gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
-
-  gnome-font-viewer = callPackage ./core/gnome-font-viewer { };
-
-  gnome-menus = callPackage ./core/gnome-menus { };
-
-  gnome_keyring = callPackage ./core/gnome-keyring { };
-
-  libgnome_keyring = callPackage ./core/libgnome-keyring { };
-
-  libgnomekbd = callPackage ./core/libgnomekbd { };
-
-  folks = callPackage ./core/folks { };
-
-  gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
-
-  gnome-online-miners = callPackage ./core/gnome-online-miners { };
-
-  gnome_session = callPackage ./core/gnome-session { };
-
-  gnome_shell = callPackage ./core/gnome-shell { };
-
-  gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
-
-  gnome-screenshot = callPackage ./core/gnome-screenshot { };
-
-  gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
-
-  gnome-system-log = callPackage ./core/gnome-system-log { };
-
-  gnome-system-monitor = callPackage ./core/gnome-system-monitor { };
-
-  gnome_terminal = callPackage ./core/gnome-terminal { };
-
-  gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
-
-  gnome-user-docs = callPackage ./core/gnome-user-docs { };
-
-  gnome-user-share = callPackage ./core/gnome-user-share { };
-
-  grilo = callPackage ./core/grilo { };
-
-  grilo-plugins = callPackage ./core/grilo-plugins { };
-
-  gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
-
-  gsound = callPackage ./core/gsound { };
-
-  gtksourceview = callPackage ./core/gtksourceview { };
-
-  gucharmap = callPackage ./core/gucharmap { };
-
-  gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
-
-  eog = callPackage ./core/eog { };
-
-  libcroco = callPackage ./core/libcroco {};
-
-  libgee = callPackage ./core/libgee { };
-  libgee_1 = callPackage ./core/libgee/libgee-1.nix { };
-
-  libgdata = callPackage ./core/libgdata { };
-
-  libgxps = callPackage ./core/libgxps { };
-
-  libpeas = callPackage ./core/libpeas {};
-
-  libgweather = callPackage ./core/libgweather { };
-
-  libzapojit = callPackage ./core/libzapojit { };
-
-  mutter = callPackage ./core/mutter { };
-
-  nautilus = callPackage ./core/nautilus { };
-
-  networkmanager_openvpn = pkgs.networkmanager_openvpn.override {
-    inherit gnome3;
-  };
-
-  networkmanager_pptp = pkgs.networkmanager_pptp.override {
-    inherit gnome3;
-  };
-
-  networkmanager_vpnc = pkgs.networkmanager_vpnc.override {
-    inherit gnome3;
-  };
-
-  networkmanager_openconnect = pkgs.networkmanager_openconnect.override {
-    inherit gnome3;
-  };
-
-  networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
-    inherit gnome3;
-  };
-
-  networkmanagerapplet = pkgs.networkmanagerapplet.override {
-    inherit gnome3 gsettings_desktop_schemas glib_networking;
-  };
-
-  rest = callPackage ./core/rest { };
-
-  sushi = callPackage ./core/sushi {
-    webkitgtk = webkitgtk24x;
-    clutter-gst = pkgs.clutter-gst;
-  };
-
-  totem = callPackage ./core/totem { };
-
-  totem-pl-parser = callPackage ./core/totem-pl-parser { };
-
-  tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; };
-
-  vte = callPackage ./core/vte { };
-
-  vte_290 = callPackage ./core/vte/2.90.nix { };
-
-  vte-select-text = vte.override { selectTextPatch = true; };
-
-  vino = callPackage ./core/vino { };
-
-  yelp = callPackage ./core/yelp { 
-    webkitgtk = webkitgtk24x;
-  };
-
-  yelp_xsl = callPackage ./core/yelp-xsl { };
-
-  yelp_tools = callPackage ./core/yelp-tools { };
-
-  zenity = callPackage ./core/zenity { };
-
-
-#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
-
-  accerciser = callPackage ./apps/accerciser { };
-
-  bijiben = callPackage ./apps/bijiben {
-    webkitgtk = webkitgtk24x;
-  };
-
-  cheese = callPackage ./apps/cheese { };
-
-  evolution = callPackage ./apps/evolution {
-    webkitgtk = webkitgtk24x;
-  };
-
-  file-roller = callPackage ./apps/file-roller { };
-
-  gedit = callPackage ./apps/gedit { };
-
-  glade = callPackage ./apps/glade { };
-
-  gnome-boxes = callPackage ./apps/gnome-boxes {
-    gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
-    spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
-  };
-
-  gnome-calendar = callPackage ./apps/gnome-calendar { };
-
-  gnome-characters = callPackage ./apps/gnome-characters { };
-
-  gnome-clocks = callPackage ./apps/gnome-clocks { };
-
-  gnome-documents = callPackage ./apps/gnome-documents { };
-
-  gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { };
-
-  gnome-logs = callPackage ./apps/gnome-logs { };
-
-  gnome-maps = callPackage ./apps/gnome-maps { };
-
-  gnome-music = callPackage ./apps/gnome-music { };
-
-  gnome-nettool = callPackage ./apps/gnome-nettool { };
-
-  gnome-photos = callPackage ./apps/gnome-photos {
-    gegl = gegl_0_3;
-  };
-
-  gnome-weather = callPackage ./apps/gnome-weather { };
-
-  nautilus-sendto = callPackage ./apps/nautilus-sendto { };
-
-  polari = callPackage ./apps/polari { };
-
-  # scrollkeeper replacement
-  rarian = callPackage ./desktop/rarian { };
-
-  seahorse = callPackage ./apps/seahorse { };
-
-  vinagre = callPackage ./apps/vinagre { };
-
-#### Dev http://ftp.gnome.org/pub/GNOME/devtools/
-
-  anjuta = callPackage ./devtools/anjuta { };
-
-  devhelp = callPackage ./devtools/devhelp {
-    webkitgtk = webkitgtk24x;
-  };
-
-  gdl = callPackage ./devtools/gdl { };
-
-  gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };
-
-#### Games
-
-  aisleriot = callPackage ./games/aisleriot { };
-
-  five-or-more = callPackage ./games/five-or-more { };
-
-  four-in-a-row = callPackage ./games/four-in-a-row { };
-
-  gnome-chess = callPackage ./games/gnome-chess { };
-
-  gnome-klotski = callPackage ./games/gnome-klotski { };
-
-  gnome-mahjongg = callPackage ./games/gnome-mahjongg { };
-
-  gnome-mines = callPackage ./games/gnome-mines { };
-
-  gnome-nibbles = callPackage ./games/gnome-nibbles { };
-
-  gnome-robots = callPackage ./games/gnome-robots { };
-
-  gnome-sudoku = callPackage ./games/gnome-sudoku { };
-
-  gnome-taquin = callPackage ./games/gnome-taquin { };
-
-  gnome-tetravex = callPackage ./games/gnome-tetravex { };
-
-  hitori = callPackage ./games/hitori { };
-
-  iagno = callPackage ./games/iagno { };
-
-  lightsoff = callPackage ./games/lightsoff { };
-
-  swell-foop = callPackage ./games/swell-foop { };
-
-  tali = callPackage ./games/tali { };
-
-  quadrapassel = callPackage ./games/quadrapassel { };
-
-#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
-
-  california = callPackage ./misc/california { };
-
-  geary = callPackage ./misc/geary { 
-    webkitgtk = webkitgtk24x;
-  };
-
-  gfbgraph = callPackage ./misc/gfbgraph { };
-
-  gitg = callPackage ./misc/gitg { 
-    webkitgtk = webkitgtk24x;
-    libgit2 = pkgs.libgit2_0_21;
-  };
-
-  libgda = callPackage ./misc/libgda { };
-
-  libgit2-glib = callPackage ./misc/libgit2-glib {
-    libgit2 = pkgs.libgit2_0_21.override { libssh2 = null; };
-  };
-
-  libmediaart = callPackage ./misc/libmediaart { };
-
-  gexiv2 = callPackage ./misc/gexiv2 { };
-
-  gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
-
-  gpaste = callPackage ./misc/gpaste { };
-
-  gtkhtml = callPackage ./misc/gtkhtml { };
-
-  pomodoro = callPackage ./misc/pomodoro { };
-
-  gnome-video-effects = callPackage ./misc/gnome-video-effects { };
-
-    };
-  in self; # pkgsFun
-
-in pkgsFun {}
diff --git a/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix
deleted file mode 100644
index a1b38b21869ac..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
-
-stdenv.mkDerivation rec {
-  name = "rarian-0.8.1";
-  src = fetchurl {
-    url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
-    sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
-  };
-
-  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
-  configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
deleted file mode 100644
index e488ab6404726..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
-  itstool, python, makeWrapper }:
-
-let
-  major = gnome3.version;
-  minor = "0";
-
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "anjuta-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz";
-    sha256 = "0g4lv6rzkwfz2wp4fg97qlbvyfh2k9gl7k7lidazaikvnc0jlhvp";
-  };
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
-    gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper ];
-
-  preFixup = ''
-    wrapProgram $out/bin/anjuta \
-      --prefix XDG_DATA_DIRS : \
-        "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Software development studio";
-    homepage = http://anjuta.org/;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
deleted file mode 100644
index d4dfb7f0a8c1c..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, webkitgtk, intltool }:
-
-stdenv.mkDerivation rec {
-  name = "devhelp-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/devhelp/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0i8kyh86hzwxs8dm047ivghl2b92vigdxa3x4pk4ha0whpk38g37";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://live.gnome.org/devhelp;
-    description = "API documentation browser for GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
deleted file mode 100644
index aa7aa8b469d03..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }:
-
-let
-  major = gnome3.version;
-  minor = "0";
-
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "gdl-${version}";
-
-  src = fetchurl {
-    url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz";
-    sha256 = "107zwvs913jr5hb59a4a8hsk19yinsicr2ma4vm216nzyl2f3jrl";
-  };
-
-  buildInputs = [ pkgconfig libxml2 gtk3 intltool ];
-
-  meta = with stdenv.lib; {
-    description = "Gnome docking library";
-    homepage = https://developer.gnome.org/gdl/;
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix
deleted file mode 100644
index 0daa0405b699f..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-devel-docs-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1jkh40ya5mqss57p27b1hv77x5qis4zc377pyvzqa5wkzrvd0nls";
-  };
-
-  buildInputs = [ intltool itstool libxml2 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/GNOME/gnome-devel-docs;
-    description = "Developer documentation for GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.fdl12;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix
deleted file mode 100644
index 94f4e5e4d04b9..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3
-, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils
-, guile, libcanberra_gtk3 }:
-
-stdenv.mkDerivation rec {
-  name = "aisleriot-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/aisleriot/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0rncdg21ys7ik971yw75qbawq89mikbh4dq5mg2msmrl6xsgv0zl";
-  };
-
-  configureFlags = [ "--with-card-theme-formats=svg" ];
-
-  buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf
-                  librsvg libxml2 desktop_file_utils guile libcanberra_gtk3 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Aisleriot;
-    description = "A collection of patience games written in guile scheme";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
deleted file mode 100644
index 70e7184b33878..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "five-or-more-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/five-or-more/${gnome3.version}/${name}.tar.xz";
-    sha256 = "018723w2q0fijvxs1kafrxg39f6ank6x51nfbf3mhn9q7jz9k2g3";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Five_or_more;
-    description = "Remove colored balls from the board by forming lines";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
deleted file mode 100644
index 292a54bf19383..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "four-in-a-row-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/four-in-a-row/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1bm5chsvpw0jg1xh9g2n1w5i0fvxs50aqkgmrla9cpawsvzfshmz";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg
-    libxml2 gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Four-in-a-row;
-    description = "Make lines of the same color to win";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
deleted file mode 100644
index e80c6691e202f..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, librsvg, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-chess-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-chess/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0j1vvf1myki3bafsqv52q59qk1nhf1636nrb15fpfvm88p3b8wwg";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Chess;
-    description = "Play the classic two-player boardgame of chess";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
deleted file mode 100644
index cab2f194d4951..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libxml2, intltool, itstool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-klotski-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-klotski/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0a64935c7pp51jhaf29q9zlx3lamj7zrhyff7clvv0w8v1w6gpax";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Klotski;
-    description = "Slide blocks to solve the puzzle";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
deleted file mode 100644
index 73cb0cf6cebe7..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-mahjongg-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-mahjongg/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1jbd3gbmxqf36as9xsiarad575l4rpcfv6w1pn192r02aj3hgipj";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Mahjongg;
-    description = "Disassemble a pile of tiles by removing matching pairs";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
deleted file mode 100644
index 92aa5bd72196d..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-mines-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-mines/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0f0496nhirvpw4zk8bcl24rb2v20cm3gw8d5ybmch42mscmjrb0p";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Mines;
-    description = "Clear hidden mines from a minefield";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
deleted file mode 100644
index 673edff645dcd..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool
-, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-nibbles-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-nibbles/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1384hc7vx3i1jkmc1pw1cjh61jymq9441ci1k06vjz62r9as1nmx";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Nibbles;
-    description = "Guide a worm around a maze";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
deleted file mode 100644
index 306a9e40852ac..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-robots-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-robots/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0dhzl1rhn4ysp3s3j0lxsiw64acz0w1n1bljrfln9s07x8nj17nx";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3
-    libxml2 gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Robots;
-    description = "Avoid the robots and make them crash into each other";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix
deleted file mode 100644
index eda3cf1f84e3e..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook
-, json_glib, qqwing, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-sudoku-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-sudoku/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1b9xwldzjjpkwb2na9cbs8z4gv8dlj9dm574gybdz466190lrsxv";
-  };
-
-  buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee
-                  json_glib qqwing itstool libxml2 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Sudoku;
-    description = "Test your logic skills in this number grid puzzle";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
deleted file mode 100644
index 2a2f97d1e49d1..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-taquin-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-taquin/${gnome3.version}/${name}.tar.xz";
-    sha256 = "024a1ing1iclmyhi5vlps6xna84vgy7s098h9yvzq43fsahmx8pi";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3
-    intltool itstool libxml2 gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Taquin;
-    description = "Move tiles so that they reach their places";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
deleted file mode 100644
index 2b577799307c0..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libxml2, intltool, itstool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-tetravex-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-tetravex/${gnome3.version}/${name}.tar.xz";
-    sha256 = "07cmcmrd5fj8vm682894gra2vj8jwx01n3ggjinl93yv4gwpplz9";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Tetravex;
-    description = "Complete the puzzle by matching numbered tiles";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
deleted file mode 100644
index bd6be7d43c581..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libxml2, intltool, itstool }:
-
-stdenv.mkDerivation rec {
-  name = "hitori-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz";
-    sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Hitori;
-    description = "GTK+ application to generate and let you play games of Hitori";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
deleted file mode 100644
index b5fab4a0e6f78..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
-, intltool, itstool, libcanberra_gtk3, libxml2, dconf }:
-
-stdenv.mkDerivation rec {
-  name = "iagno-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/iagno/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0pg4sx277idfab3qxxn8c7r6gpdsdw5br0x7fxhxqascvvx8my1k";
-  };
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Iagno;
-    description = "Computer version of the game Reversi, more popularly called Othello";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
deleted file mode 100644
index 313614f1744d9..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
-, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }:
-
-stdenv.mkDerivation rec {
-  name = "lightsoff-${gnome3.version}.1.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/lightsoff/${gnome3.version}/${name}.tar.xz";
-    sha256 = "00a2jv7wr6fxrzk7avwa0wspz429ad7ri7v95jv31nqn5q73y4c0";
-  };
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf
-                  libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Lightsoff;
-    description = "Puzzle game, where the objective is to turn off all of the tiles on the board";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix
deleted file mode 100644
index 98cfd55a31eb9..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
-, librsvg, libcanberra_gtk3
-, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "quadrapassel-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/quadrapassel/${gnome3.version}/${name}.tar.xz";
-    sha256 = "17c6ddjgmakj615ahnrmrzayjxc2ylr8dddfzi9py875q5vk7grx";
-  };
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  libcanberra_gtk3 itstool intltool clutter
-                  libxml2 clutter_gtk wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Quadrapassel;
-    description = "Classic falling-block game, Tetris";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
deleted file mode 100644
index 510e6d6d1a89c..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf
-, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "swell-foop-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/swell-foop/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0bhjmjcjsqdb89shs0ygi6ps5hb3lk8nhrbjnsjk4clfqbw0jzwf";
-  };
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = "https://wiki.gnome.org/Apps/Swell%20Foop";
-    description = "Puzzle game, previously known as Same GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/tali/default.nix b/pkgs/desktops/gnome-3/3.16/games/tali/default.nix
deleted file mode 100644
index a38d8845bef03..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/tali/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
-, librsvg, intltool, itstool, libxml2, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "tali-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/tali/${gnome3.version}/${name}.tar.xz";
-    sha256 = "10cfgxiqg38z5ngkiznglxjgm1552mjvfw4bjhjic0yi5cvdr6dg";
-  };
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  libxml2 itstool intltool wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Tali;
-    description = "Sort of poker with dice and less money";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
deleted file mode 100644
index c229cc96094fe..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8a94642..1ca6426 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS)
- GLIB_REQUIRED=2.38.0
- GTK_REQUIRED=3.12.2
- GEE_REQUIRED=0.10.5
--ECAL_REQUIRED=3.8.5
-+ECAL_REQUIRED=3.13.90
- LIBSOUP_REQUIRED=2.44
- GDATA_REQUIRED=0.14.0
- GOA_REQUIRED=3.8.3
-diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala
-index ee6a572..5009b5d 100644
---- a/src/backing/eds/backing-eds-calendar-source.vala
-+++ b/src/backing/eds/backing-eds-calendar-source.vala
-@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource {
-
-     // Invoked by EdsStore prior to making it available outside of unit
-     internal async void open_async(Cancellable? cancellable) throws Error {
--        client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS,
-+        client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1,
-             cancellable);
-
-         client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE);
-diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi
-index 6ead3ec..46fd711 100644
---- a/vapi/libecal-1.2.vapi
-+++ b/vapi/libecal-1.2.vapi
-@@ -23,7 +23,7 @@ namespace E {
-		public bool check_save_schedules ();
-		public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error;
-		[CCode (finish_name = "e_cal_client_connect_finish")]
--		public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
-+		public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error;
-		public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
-		[CCode (finish_name = "e_cal_client_create_object_finish")]
-		public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error;
diff --git a/pkgs/desktops/gnome-3/3.16/misc/california/default.nix b/pkgs/desktops/gnome-3/3.16/misc/california/default.nix
deleted file mode 100644
index 4bdeeb23a91e0..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/california/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala, makeWrapper
-, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }:
-
-let
-  majorVersion = "0.4";
-in
-stdenv.mkDerivation rec {
-  name = "california-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz";
-    sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ makeWrapper intltool pkgconfig vala glib gtk3 gnome3.libgee
-    libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server
-    sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/california" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share"
-  '';
-
-  enableParallelBuilding = true;
-
-  # Apply fedoras patch to build with evolution-data-server >3.13
-  patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/California;
-    description = "Calendar application for GNOME 3";
-    maintainers = with maintainers; [ pSub ];
-    license = licenses.lgpl21;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
deleted file mode 100644
index 9ed8494098d1d..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala
-, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
-, libnotify, libcanberra, libsecret, gmime
-, libpthreadstubs, sqlite
-, gnome3, librsvg, gnome_doc_utils, webkitgtk }:
-
-let
-  majorVersion = "0.10";
-  minorVersion = "0";
-in
-stdenv.mkDerivation rec {
-  name = "geary-${majorVersion}.${minorVersion}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
-    sha256 = "46197a5a1b8b040adcee99082dbfd9fff9ca804e3bf0055a2e90b13214bdbca5";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
-                  vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite
-                  libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr
-                  gdk_pixbuf librsvg gnome3.defaultIconTheme ];
-
-  preConfigure = ''
-    substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0'
-  '';
-
-  postInstall = ''
-    mkdir -p $out/share/gsettings-schemas/${name}/
-    mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name}
-  '';
-
-  preFixup = ''
-    wrapProgram "$out/bin/geary" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  enableParallelBuilding = true;
-
-  # patches = [ ./disable_valadoc.patch ];
-  patchFlags = "-p0";
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Geary;
-    description = "Mail client for GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch
deleted file mode 100644
index e65c0dea74728..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/CMakeLists.txt.orig	2014-05-23 14:41:20.809160364 +0200
-+++ src/CMakeLists.txt	2014-05-23 14:41:29.240261581 +0200
-@@ -696,21 +696,6 @@
-         ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/
- )
- 
--# Valadoc
--#################################################
--foreach(pkg ${ENGINE_PACKAGES})
--    list(APPEND valadoc_pkg_opts "--pkg=${pkg}")
--endforeach(pkg ${ENGINE_PACKAGES})
--
--include(FindValadoc)
--add_custom_target(
--    valadoc
--    WORKING_DIRECTORY
--        ${CMAKE_SOURCE_DIR}/src
--    COMMAND
--        ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
--)
--
- ## Make clean: remove copied files
- ##################################################
- set_property(
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
deleted file mode 100644
index 7cea9cd8d1506..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }:
-
-let
-  majorVersion = "0.10";
-in
-stdenv.mkDerivation rec {
-  name = "gexiv2-${version}";
-  version = "${majorVersion}.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz";
-    sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988";
-  };
-
-  preConfigure = ''
-    patchShebangs .
-  '';
-
-  buildInputs = [ pkgconfig glib libtool m4 ];
-  propagatedBuildInputs = [ exiv2 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/gexiv2;
-    description = "GObject wrapper around the Exiv2 photo metadata library";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix
deleted file mode 100644
index e85b087fa41f3..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, glib
-, gnome3, libsoup, json_glib }:
-
-stdenv.mkDerivation rec {
-  name = "gfbgraph-0.2.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz";
-    sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4";
-  };
-
-  buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ];
-  propagatedBuildInputs = [ libsoup json_glib gnome3.rest ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "GLib/GObject wrapper for the Facebook Graph API";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
deleted file mode 100644
index 6295773d4587a..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib
-, json_glib, webkitgtk,  makeWrapper, libpeas, bash, gobjectIntrospection
-, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.adwaita-icon-theme 
-
-let
-  majorVersion = "3.14";
-in
-stdenv.mkDerivation rec {
-  name = "gitg-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gitg/${majorVersion}/${name}.tar.xz";
-    sha256 = "8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b";
-  };
-
-  preCheck = ''
-    substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
-  '';
-  doCheck = true;
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  propagatedUserEnvPkgs = [ shared_mime_info
-                            gnome3.gnome_themes_standard ];
-
-  buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
-                  libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg
-                  gobjectIntrospection makeWrapper gnome3.adwaita-icon-theme ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gitg" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
-    description = "GNOME GUI client to view git repositories";
-    maintainers = with maintainers; [ iElectric ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
deleted file mode 100644
index d5a6f90e33dbe..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 175218579aa2b4f4974ff1cf4fd1ac93082a4714 Mon Sep 17 00:00:00 2001
-From: Jascha Geerds <jg@ekby.de>
-Date: Sat, 1 Aug 2015 21:01:11 +0200
-Subject: [PATCH 1/1] Search for themes and icons in system data dirs
-
----
- gtweak/tweaks/tweak_group_interface.py | 17 ++++-------------
- gtweak/tweaks/tweak_group_keymouse.py  |  7 ++-----
- gtweak/utils.py                        | 17 +++++++++++++++++
- 3 files changed, 23 insertions(+), 18 deletions(-)
-
-diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
-index ed2ad5f..a319907 100644
---- a/gtweak/tweaks/tweak_group_interface.py
-+++ b/gtweak/tweaks/tweak_group_interface.py
-@@ -26,7 +26,7 @@ from gi.repository import Gtk
- from gi.repository import GLib
- 
- import gtweak
--from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file
-+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
- from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
- from gtweak.gshellwrapper import GnomeShellFactory
- from gtweak.gsettings import GSettingsSetting
-@@ -46,10 +46,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
- 
-     def _get_valid_themes(self):
-         """ Only shows themes that have variations for gtk+-3 and gtk+-2 """
--        dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
--                 os.path.join(GLib.get_user_data_dir(), "themes"),
--                 os.path.join(os.path.expanduser("~"), ".themes"))
--        valid = walk_directories(dirs, lambda d:
-+        valid = walk_directories(get_resource_dirs('themes'), lambda d:
-                     os.path.exists(os.path.join(d, "gtk-2.0")) and \
-                         os.path.exists(os.path.join(d, "gtk-3.0")))
-         return valid
-@@ -64,10 +61,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
-             **options)
- 
-     def _get_valid_icon_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
--                 os.path.join(GLib.get_user_data_dir(), "icons"),
--                 os.path.join(os.path.expanduser("~"), ".icons"))
--        valid = walk_directories(dirs, lambda d:
-+        valid = walk_directories(get_resource_dirs("icons"), lambda d:
-                     os.path.isdir(d) and \
- 			os.path.exists(os.path.join(d, "index.theme")))
-         return valid
-@@ -82,10 +76,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
-             **options)
- 
-     def _get_valid_cursor_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
--                 os.path.join(GLib.get_user_data_dir(), "icons"),
--                 os.path.join(os.path.expanduser("~"), ".icons"))
--        valid = walk_directories(dirs, lambda d:
-+        valid = walk_directories(get_resource_dirs("icons"), lambda d:
-                     os.path.isdir(d) and \
-                         os.path.exists(os.path.join(d, "cursors")))
-         return valid
-diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
-index b56a4f4..3486098 100644
---- a/gtweak/tweaks/tweak_group_keymouse.py
-+++ b/gtweak/tweaks/tweak_group_keymouse.py
-@@ -20,7 +20,7 @@ import os.path
- from gi.repository import GLib
- 
- import gtweak
--from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default
-+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
- from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title
- 
- class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -47,10 +47,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
-             **options)
- 
-     def _get_valid_key_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
--                 os.path.join(GLib.get_user_data_dir(), "themes"),
--                 os.path.join(os.path.expanduser("~"), ".themes"))
--        valid = walk_directories(dirs, lambda d:
-+        valid = walk_directories(get_resource_dirs("themes"), lambda d:
-                     os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
-                     os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
-         return valid
-diff --git a/gtweak/utils.py b/gtweak/utils.py
-index 3d20425..0fcb51d 100644
---- a/gtweak/utils.py
-+++ b/gtweak/utils.py
-@@ -21,6 +21,7 @@ import tempfile
- import shutil
- import subprocess
- import glob
-+import itertools
- 
- import gtweak
- from gtweak.gsettings import GSettingsSetting
-@@ -114,6 +115,22 @@ def execute_subprocess(cmd_then_args, block=True):
-         stdout, stderr = p.communicate()
-         return stdout, stderr, p.returncode
- 
-+def get_resource_dirs(resource):
-+    """Returns a list of all known resource dirs for a given resource.
-+
-+    :param str resource:
-+        Name of the resource (e.g. "themes")
-+    :return:
-+        A list of resource dirs
-+    """
-+    dirs = [os.path.join(dir, resource)
-+            for dir in itertools.chain(GLib.get_system_data_dirs(),
-+                                       (gtweak.DATA_DIR,
-+                                        GLib.get_user_data_dir()))]
-+    dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))]
-+
-+    return [dir for dir in dirs if os.path.isdir(dir)]
-+
- @singleton
- class AutostartManager:
- 
--- 
-2.4.5
-
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
deleted file mode 100644
index 61ae27349795c..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From edd3203c7b7d5ba596df9f148c443cdfc8a58d88 Mon Sep 17 00:00:00 2001
-From: Jascha Geerds <jg@ekby.de>
-Date: Sat, 1 Aug 2015 21:26:57 +0200
-Subject: [PATCH 1/1] Don't show multiple entries for a single theme
-
----
- gtweak/tweaks/tweak_group_interface.py |  8 ++++----
- gtweak/tweaks/tweak_group_keymouse.py  |  4 ++--
- gtweak/utils.py                        | 16 ++++++++++++++++
- 3 files changed, 22 insertions(+), 6 deletions(-)
-
-diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
-index a319907..82c0286 100644
---- a/gtweak/tweaks/tweak_group_interface.py
-+++ b/gtweak/tweaks/tweak_group_interface.py
-@@ -26,7 +26,7 @@ from gi.repository import Gtk
- from gi.repository import GLib
- 
- import gtweak
--from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
-+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources
- from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
- from gtweak.gshellwrapper import GnomeShellFactory
- from gtweak.gsettings import GSettingsSetting
-@@ -49,7 +49,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
-         valid = walk_directories(get_resource_dirs('themes'), lambda d:
-                     os.path.exists(os.path.join(d, "gtk-2.0")) and \
-                         os.path.exists(os.path.join(d, "gtk-3.0")))
--        return valid
-+        return get_unique_resources(valid)
- 
- class IconThemeSwitcher(GSettingsComboTweak):
-     def __init__(self, **options):
-@@ -64,7 +64,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
-         valid = walk_directories(get_resource_dirs("icons"), lambda d:
-                     os.path.isdir(d) and \
- 			os.path.exists(os.path.join(d, "index.theme")))
--        return valid
-+        return get_unique_resources(valid)
- 
- class CursorThemeSwitcher(GSettingsComboTweak):
-     def __init__(self, **options):
-@@ -79,7 +79,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
-         valid = walk_directories(get_resource_dirs("icons"), lambda d:
-                     os.path.isdir(d) and \
-                         os.path.exists(os.path.join(d, "cursors")))
--        return valid
-+        return get_unique_resources(valid)
- 
- class ShellThemeTweak(Gtk.Box, Tweak):
- 
-diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
-index 3486098..9f53425 100644
---- a/gtweak/tweaks/tweak_group_keymouse.py
-+++ b/gtweak/tweaks/tweak_group_keymouse.py
-@@ -20,7 +20,7 @@ import os.path
- from gi.repository import GLib
- 
- import gtweak
--from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
-+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources
- from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title
- 
- class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -50,7 +50,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
-         valid = walk_directories(get_resource_dirs("themes"), lambda d:
-                     os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
-                     os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
--        return valid
-+        return get_unique_resources(valid)
- 
- TWEAK_GROUPS = [
-     ListBoxTweakGroup(_("Keyboard and Mouse"),
-diff --git a/gtweak/utils.py b/gtweak/utils.py
-index 0fcb51d..ce8e12e 100644
---- a/gtweak/utils.py
-+++ b/gtweak/utils.py
-@@ -131,6 +131,22 @@ def get_resource_dirs(resource):
- 
-     return [dir for dir in dirs if os.path.isdir(dir)]
- 
-+def get_unique_resources(dirs):
-+    """Filter out duplicated resources.
-+
-+    :param list dirs:
-+        List of resource dirs (e.g. /usr/share/themes/Adwaita)
-+    :return:
-+        List of dirs without duplicated resources
-+    """
-+    unique_dirs = {}
-+    for dir in dirs:
-+        basename = os.path.basename(dir)
-+        if basename not in unique_dirs:
-+            unique_dirs[basename] = dir
-+
-+    return unique_dirs
-+
- @singleton
- class AutostartManager:
- 
--- 
-2.4.5
-
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
deleted file mode 100644
index 840ebb82ec756..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dea8fc3c37c43f4fbbcc658ee995a95b93452b3c Mon Sep 17 00:00:00 2001
-From: Jascha Geerds <jg@ekby.de>
-Date: Sun, 2 Aug 2015 12:01:20 +0200
-Subject: [PATCH 1/1] Create config dir if it doesn't exist
-
-Otherwise gnome-tweak-tool can't enable the dark theme and fails
-without a clear error message.
----
- gtweak/gtksettings.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py
-index bcec9f1..f39991b 100644
---- a/gtweak/gtksettings.py
-+++ b/gtweak/gtksettings.py
-@@ -35,6 +35,10 @@ class GtkSettingsManager:
-     def _get_keyfile(self):
-         keyfile = None
-         try:
-+            config_dir = os.path.dirname(self._path)
-+            if not os.path.isdir(config_dir):
-+                os.makedirs(config_dir)
-+
-             keyfile = GLib.KeyFile()
-             keyfile.load_from_file(self._path, 0)
-         except MemoryError:
--- 
-2.4.5
-
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
deleted file mode 100644
index c790d41f10737..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, intltool, fetchurl, python, pygobject3, atk
-, pkgconfig, gtk3, glib, libsoup
-, bash, makeWrapper, itstool, libxml2, python3Packages
-, gnome3, librsvg, gdk_pixbuf, file, libnotify }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-tweak-tool-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-tweak-tool/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0r5x67aj79dsw2xl98q4harxv3hjs52g0m6pw43vx29lbir07r5i";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  makeFlags = [ "DESTDIR=/" ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  python pygobject3 libnotify gnome3.gnome_shell
-                  libsoup gnome3.gnome_settings_daemon gnome3.nautilus
-                  gnome3.gnome_desktop ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-tweak-tool" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --suffix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
-  '';
-
-  patches = [
-    ./find_gsettings.patch
-    ./0001-Search-for-themes-and-icons-in-system-data-dirs.patch
-    ./0002-Don-t-show-multiple-entries-for-a-single-theme.patch
-    ./0003-Create-config-dir-if-it-doesn-t-exist.patch
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
-    description = "A tool to customize advanced GNOME 3 options";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch
deleted file mode 100644
index 3e68c04cb3ab8..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
-index a00fe19..dce74b2 100644
---- a/gtweak/gsettings.py
-+++ b/gtweak/gsettings.py
-@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception):
- 
- class _GSettingsSchema:
-     def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options):
--        if not schema_dir:
--            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
-         if not schema_filename:
-             schema_filename = schema_name + ".gschema.xml"
-+        if not schema_dir:
-+            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
-+            for xdg_dir in GLib.get_system_data_dirs():
-+                dir = os.path.join(xdg_dir, "glib-2.0", "schemas")
-+                if os.path.exists(os.path.join(dir, schema_filename)):
-+                    schema_dir = dir
-+                    break
- 
-         schema_path = os.path.join(schema_dir, schema_filename)
-         if not os.path.exists(schema_path):
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix
deleted file mode 100644
index c0bd2fed3f2d3..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-video-effects-${version}";
-  version = "0.4.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz";
-    sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil";
-  };
-
-  buildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
deleted file mode 100644
index 0d6551216cf85..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib
-, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  version = "${gnome3.version}.3.1";
-  name = "gpaste-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "1m171r1d1jrv9d7ssj25ikrw7lc96gr41rgkxnsa2lsqrvv8i16l";
-  };
-
-  buildInputs = [ intltool autoreconfHook pkgconfig vala glib
-                  gtk3 gnome3.gnome_control_center dbus
-                  clutter pango appstream-glib makeWrapper ];
-
-  preConfigure = "intltoolize -f";
-
-  configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
-                     "--with-dbusservicesdir=$(out)/share/dbus-1/services" ];
-
-  enableParallelBuilding = true;
-
-  preFixup = 
-    let
-      libPath = stdenv.lib.makeLibraryPath
-        [ glib gtk3 clutter pango ];
-    in
-    ''
-      for i in $out/libexec/gpaste/*; do
-        wrapProgram $i \
-          --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
-      done
-    '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/Keruspe/GPaste;
-    description = "Clipboard management system with GNOME3 integration";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix
deleted file mode 100644
index d86e234e80f50..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, intltool
-, gnome3, enchant, isocodes }:
-
-let
-  majorVersion = "4.8";
-in
-stdenv.mkDerivation rec {
-  name = "gtkhtml-${majorVersion}.5";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtkhtml/${majorVersion}/${name}.tar.xz";
-    sha256 = "2ff5bbec4d8e7eca66a36f7e3863a104e098ce9b58e6d0374de7cb80c3d93e8d";
-  };
-
-  buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme
-                  gnome3.gsettings_desktop_schemas ];
-
-  propagatedBuildInputs = [ enchant isocodes ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix
deleted file mode 100644
index 1fcb411d120d8..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }:
-
-let
-  major = "5.2";
-  minor = "2";
-
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "libgda-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz";
-    sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4";
-  };
-
-  configureFlags = [
-    "--enable-gi-system-install=no"
-  ];
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ];
-
-  meta = with stdenv.lib; {
-    description = "Database access library";
-    homepage = http://www.gnome-db.org/;
-    license = [ licenses.lgpl2 licenses.gpl2 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix
deleted file mode 100644
index dbdd2cc7fd13b..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala
-, gtk_doc, gobjectIntrospection, libgit2, glib }:
-
-let
-  majorVersion = "0.0";
-in
-stdenv.mkDerivation rec {
-  name = "libgit2-glib-${majorVersion}.24";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgit2-glib/0.0/${name}.tar.xz";
-    sha256 = "8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8";
-  };
-
-  buildInputs = [ gnome3.gnome_common libtool pkgconfig vala
-                  gtk_doc gobjectIntrospection libgit2 glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
deleted file mode 100644
index b864801257308..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }:
-
-let
-  majorVersion = "1.9";
-in
-stdenv.mkDerivation rec {
-  name = "libmediaart-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz";
-    sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll";
-  };
-
-  buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    description = "Library tasked with managing, extracting and handling media art caches";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix
deleted file mode 100644
index 0440af440fece..0000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
-  dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base,
-  glib, gobjectIntrospection, telepathy_glib
-}:
-
-stdenv.mkDerivation rec {
-  rev = "624945d";
-  name = "gnome-shell-pomodoro-${gnome3.version}-${rev}";
-
-  src = fetchFromGitHub {
-      owner = "codito";
-      repo = "gnome-pomodoro";
-      rev = "${rev}";
-      sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq";
-  };
-
-  configureScript = ''./autogen.sh'';
-
-  buildInputs = [
-    which automake113x intltool glib gobjectIntrospection pkgconfig libtool
-    makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
-    gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
-    gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib
-    gnome3.defaultIconTheme
-  ];
-
-  preBuild = ''
-    sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \
-      vapi/Makefile
-  '';
-
-  preFixup = ''
-    wrapProgram $out/bin/gnome-pomodoro \
-        --prefix XDG_DATA_DIRS : \
-        "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/codito/gnome-shell-pomodoro;
-    description = "A time management utility for GNOME based on the pomodoro technique";
-    longDescription = ''
-      This GNOME utility helps to manage time according to Pomodoro Technique.
-      It intends to improve productivity and focus by taking short breaks.
-    '';
-    maintainers = with maintainers; [ DamienCassou jgeerds ];
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix
index faaadf5bb91fd..b541834a1c2a2 100644
--- a/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "geocode-glib-3.18.0";
+  name = "geocode-glib-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/geocode-glib/3.18/geocode-glib-3.18.0.tar.xz;
-    sha256 = "8fb7f0d569e3e6696aaa1fdf275cb3094527ec5e9fa36fd88dd633dfec63495d";
+    url = mirror://gnome/sources/geocode-glib/3.18/geocode-glib-3.18.1.tar.xz;
+    sha256 = "75d12bf82575449b8290b7463e8b6cf1b99f2c9942db6391a3d5b0bbb600c365";
   };
 }
diff --git a/pkgs/desktops/plasma-5.5/bluedevil.nix b/pkgs/desktops/plasma-5.5/bluedevil.nix
index dc11ee170b35c..6596c246202f0 100644
--- a/pkgs/desktops/plasma-5.5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5.5/bluedevil.nix
@@ -20,5 +20,7 @@ plasmaPackage {
   postInstall = ''
     wrapQtProgram "$out/bin/bluedevil-wizard"
     wrapQtProgram "$out/bin/bluedevil-sendfile"
+    # Fix the location of logic.js for the plasmoid
+    ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js
   '';
 }
diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix
new file mode 100644
index 0000000000000..24cba18254f26
--- /dev/null
+++ b/pkgs/development/compilers/as31/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+let
+
+  version = "2.3.1";
+
+in stdenv.mkDerivation {
+  name = "as31-${version}";
+  src = fetchurl {
+    name = "as31-${version}.tar.gz"; # Nix doesn't like the colons in the URL
+    url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz";
+    sha256 = "0mbk6z7z03xb0r0ccyzlgkjdjmdzknck4yxxmgr9k7v8f5c348fd";
+  };
+  preConfigure = ''
+    chmod +x ./configure
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://wiki.erazor-zone.de/wiki:projects:linux:as31";
+    description = "An 8031/8051 assembler by Ken Stauffer and Theo Deraadt which produces a variety of object code output formats";
+    maintainers = with maintainers; [ aneeshusa ];
+  };
+}
diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index 59c85d03d4ba2..6daf7a6115a30 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = https://git.kernel.org/cgit/utils/dtc/dtc.git;
     license = licenses.gpl2; # dtc itself is GPLv2, libfdt is dual GPL/BSD
     maintainers = [ maintainers.dezgeg ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index 851459ad7d96e..f863565ab0723 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -7,11 +7,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="ecl";
-    version="15.3.7";
+    version="16.0.0";
     name="${baseName}-${version}";
-    hash="13wlxkd5prm93gcm2dhm7v52fl803yx93aa97lrb39z0y6xzziid";
-    url="mirror://sourceforge/project/ecls/ecls/15.3/ecl-15.3.7.tgz";
-    sha256="13wlxkd5prm93gcm2dhm7v52fl803yx93aa97lrb39z0y6xzziid";
+    hash="0czh78z9i5b7jc241mq1h1gdscvdw5fbhfb0g9sn4rchwk1x8gil";
+    url="https://common-lisp.net/project/ecl/files/ecl-16.0.0.tgz";
+    sha256="0czh78z9i5b7jc241mq1h1gdscvdw5fbhfb0g9sn4rchwk1x8gil";
   };
   buildInputs = [
     libtool autoconf automake
diff --git a/pkgs/development/compilers/ecl/default.upstream b/pkgs/development/compilers/ecl/default.upstream
index 70dcb1b434428..eeb82cbfcab16 100644
--- a/pkgs/development/compilers/ecl/default.upstream
+++ b/pkgs/development/compilers/ecl/default.upstream
@@ -1,4 +1,2 @@
-url http://sourceforge.net/projects/ecls/files/ecls/
-SF_version_dir
-version_link '[.]tgz/download$'
-SF_redirect
+url https://common-lisp.net/project/ecl/
+version_link '[.]tgz$'
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 1ea2894d88d7c..25b1599fbea0f 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -1,56 +1,52 @@
-a @ { mpfr, m4, binutils, fetchcvs, emacs, zlib, which
-, texinfo, libX11, xproto, inputproto, libXi
-, libXext, xextproto, libXt, libXaw, libXmu, stdenv, ... } :
-let
-  buildInputs = with a; [
+{ stdenv, fetchurl, mpfr, m4, binutils, fetchcvs, emacs, zlib, which
+, texinfo, libX11, xproto, inputproto, libXi, gmp
+, libXext, xextproto, libXt, libXaw, libXmu } :
+
+assert stdenv ? cc ;
+assert stdenv.cc.isGNU ;
+assert stdenv.cc ? libc ;
+assert stdenv.cc.libc != null ;
+
+stdenv.mkDerivation rec {
+  name = "gcl-${version}";
+  version = "2.6.12";
+
+  src = fetchurl {
+    sha256 = "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f";
+    url = "http://gnu.spinellicreations.com/gcl/${name}.tar.gz";
+  };
+
+  buildInputs = [
     mpfr m4 binutils emacs gmp
     libX11 xproto inputproto libXi
     libXext xextproto libXt libXaw libXmu
     zlib which texinfo
   ];
-in
-
-(
-assert a.stdenv ? cc ;
-assert a.stdenv.cc.isGNU ;
-assert a.stdenv.cc ? libc ;
-assert a.stdenv.cc.libc != null ;
 
-rec {
-  src = a.fetchurl {
-    sha256 = "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f";
-    url="http://gnu.spinellicreations.com/gcl/${name}.tar.gz";
-  };
-
-  name = "gcl-2.6.12";
-  inherit buildInputs;
   configureFlags = [
     "--enable-ansi"
   ];
 
   # Upstream bug submitted - http://savannah.gnu.org/bugs/index.php?30371
   # $TMPDIR must have no extension
-  setVars = a.noDepEntry ''
-    export TMPDIR="''${TMPDIR:-''${TMP:-''${TEMP}}}/tmp-for-gcl"
-    mkdir -p "$TMPDIR"
-  '';
+  # setVars = a.noDepEntry ''
+  #   export TMPDIR="''${TMPDIR:-''${TMP:-''${TEMP}}}/tmp-for-gcl"
+  #   mkdir -p "$TMPDIR"
+  # '';
 
-  preBuild = a.fullDepEntry (''
-    sed -re "s@/bin/cat@$(which cat)@g" -i configure */configure
-    sed -re "s@if test -d /proc/self @if false @" -i configure
-    sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.cc.cc}/include -I${a.stdenv.cc.libc}/include ^g' -i makefile
-  '') ["minInit" "doUnpack" "addInputs"];
+  preBuild = ''
+    # sed -re "s@/bin/cat@$(which cat)@g" -i configure */configure
+    # sed -re "s@if test -d /proc/self @if false @" -i configure
+    # sed -re 's^([ \t])cpp ^\1cpp -I${stdenv.cc.cc}/include -I${stdenv.cc.libc}/include ^g' -i makefile
+  '';
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "doUnpack" "preBuild"
-    "doConfigure" "doMakeInstall"];
-}) // {
+  # phaseNames = ["setVars" "doUnpack" "preBuild"
+  #   "doConfigure" "doMakeInstall"];
+
   meta = {
     description = "GNU Common Lisp compiler working via GCC";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index 6e9f4691f73b9..ec397d9cc5248 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "8.0.0.20160111";
+  version = "8.0.0.20160204";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/8.0.1-rc1/${name}-src.tar.xz";
-    sha256 = "0y4nha46mw01ysw90kh8szcbsfdc37rqjm7r5fyk6flqwr8b6pvr";
+    url = "https://downloads.haskell.org/~ghc/8.0.1-rc2/${name}-src.tar.xz";
+    sha256 = "0v8pciva93i4a6h0l76vq6bbvrg76b1y4awwbxcg3m9gnqkvmy2k";
   };
 
   patches = [
diff --git a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
index 516ef9ab92dbf..cbf21cb8f5bce 100644
--- a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
+++ b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
@@ -1,7 +1,7 @@
 { fetchgit }:
 fetchgit {
   url = git://github.com/ghcjs/ghcjs-boot.git;
-  rev = "3529c6ab61d5f786bdde449fd069520664330b30";
-  sha256 = "0d33nmbwrdn7ai4lsrn3qzcfy71hbini0jl437387cxdh3z6sjqa";
+  rev = "97dea5c4145bf80a1e7cffeb1ecd4d0ecacd5a2f";
+  sha256 = "1cgjzm595l2dx6fibzbkyv23bp1857qia0hb9d8aghf006al558j";
   fetchSubmodules = true;
 }
diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/ghcjs.patch
index 751f114ba43ae..61bbb95b0a588 100644
--- a/pkgs/development/compilers/ghcjs/ghcjs.patch
+++ b/pkgs/development/compilers/ghcjs/ghcjs.patch
@@ -1,8 +1,8 @@
 diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs
-index 3c68dcf..64f3cf7 100644
+index db8b12e..7b815c5 100644
 --- a/src-bin/Boot.hs
 +++ b/src-bin/Boot.hs
-@@ -512,9 +512,7 @@ initPackageDB :: B ()
+@@ -526,9 +526,7 @@ initPackageDB :: B ()
  initPackageDB = do
    msg info "creating package databases"
    initDB "--global" <^> beLocations . blGlobalDB
@@ -12,7 +12,7 @@ index 3c68dcf..64f3cf7 100644
      initDB dbName db = do
        rm_rf db >> mkdir_p db
        ghcjs_pkg_ ["init", toTextI db] `catchAny_` return ()
-@@ -538,29 +536,22 @@ installDevelopmentTree = subTop $ do
+@@ -552,29 +550,22 @@ installDevelopmentTree = subTop $ do
    msgD info $ "preparing development boot tree"
    checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do
      testGit "ghcjs-boot" >>= \case
@@ -46,7 +46,7 @@ index 3c68dcf..64f3cf7 100644
        mapM_ patchPackage =<< allPackages
        preparePrimops
        buildGenPrim
-@@ -1085,8 +1076,11 @@ cabalInstallFlags parmakeGhcjs = do
+@@ -1110,14 +1101,14 @@ cabalInstallFlags parmakeGhcjs = do
             , "--avoid-reinstalls"
             , "--builddir",      "dist"
             , "--with-compiler", ghcjs ^. pgmLocText
@@ -58,13 +58,19 @@ index 3c68dcf..64f3cf7 100644
 +           , "--libsubdir",     "$pkgid"
             , bool haddock "--enable-documentation" "--disable-documentation"
             , "--haddock-html"
- -- workaround for hoogle support being broken in haddock for GHC 7.10RC1
+--- workaround for hoogle support being broken in haddock for GHC 7.10RC1
+-#if !(__GLASGOW_HASKELL__ >= 709)
+            , "--haddock-hoogle"
+-#endif
+            , "--haddock-hyperlink-source"
+ -- don't slow down Windows builds too much, on other platforms we get this more
+ -- or less for free, thanks to dynamic-too
 diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs
-index 33a401f..79833c5 100644
+index 33a401f..e2405a7 100644
 --- a/src/Compiler/Info.hs
 +++ b/src/Compiler/Info.hs
 @@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do
-
+ 
  -- | the directory to use if started without -B flag
  getDefaultTopDir :: IO FilePath
 -getDefaultTopDir = do
@@ -75,6 +81,6 @@ index 33a401f..79833c5 100644
 -        targetOS   = os
 -        subdir     = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion
 +getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@"
-
+ 
  getDefaultLibDir :: IO FilePath
  getDefaultLibDir = getDefaultTopDir
diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix
index 863c74bc4c1b6..fb03d98dbdc06 100644
--- a/pkgs/development/compilers/icedtea-web/default.nix
+++ b/pkgs/development/compilers/icedtea-web/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "icedtea-web-${version}";
 
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchurl {
     url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz";
-    sha256 = "0869j9jn0z5b5pfspp4v5cj2ksmbqmmmjhqicn4kqc6wr6v6md59";
+    sha256 = "004kwrngyxxlrlzby4vzxjr0xcyngcdc9dfgnvi61ffnjr006ryf";
   };
 
   nativeBuildInputs = [ pkgconfig bc perl ];
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index b17be1c534b02..a6f5dcc215927 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, makeWrapper, jre, unzip, which }:
+{ stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0-beta-4584";
+  version = "1.0.0-rc-1036";
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/build-${version}/kotlin-compiler-${version}.zip";
-    sha256 = "191698784f4a1f769df14757bad40243293aa6bc3d8e906bfa0c80c3db0a1d2c";
+    sha256 = "8d72ff925678a2172fbbefcb6f0c5a195a300dccf240e5add16c3e8d86e13d67";
   };
 
-  propagatedBuildInputs = [ jre which ] ;
+  propagatedBuildInputs = [ jre ] ;
   buildInputs = [ makeWrapper unzip ] ;
 
   installPhase = ''
diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index 940089cafe926..709f0f5578899 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -65,6 +65,11 @@ stdenv.mkDerivation rec {
   postInstall = ''
     echo "Updating Mono key store"
     $out/bin/cert-sync ${cacert}/etc/ssl/certs/ca-bundle.crt
+  ''
+  # According to [1], gmcs is just mcs
+  # [1] https://github.com/mono/mono/blob/master/scripts/gmcs.in
+  + ''
+    ln -s $out/bin/mcs $out/bin/gmcs
   '';
 
   meta = {
diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
index b71c97d56224a..48a586ffb0f25 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "71";
+  patchVersion = "73";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "11wcizv4gvlffzn2wj34ffwrq21xwh4ikg2vjv63avdfp2hazjqv";
-  sha256_x86_64 = "18jqdrlbv4sdds2hlmp437waq7r9b33f7hdp8kb6l7pkrizr9nwv";
+  sha256_i686 = "1bi3yj2ds9w13p2lzvmxffk5gax8syi3bw52w8pam1jr3fmzgwgl";
+  sha256_x86_64 = "1rp3nbnhkncyr48m0nn3pf5fr4bp3lzm0ki4gca7mn7rzag19a26";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index f4bb68500d23d..0f6c4ad668a6a 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "72";
+  patchVersion = "74";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "023rnlm5v7d9w4d7bgcac8j0r1vqkbv6fl20k8354pzpdjg6liaq";
-  sha256_x86_64 = "167ca39a6y0n8l87kdm5nv2hrp0wf6g4mw1rbychjc04f5igkrs6";
+  sha256_i686 = "1vc3g89fbrmznb10bhh5gs143hcjg4wsy4j4hwnr1djfj83y8188";
+  sha256_x86_64 = "1pfx7il1h42w3kigscdvm9vfy616lmsp1d2cqvplim3nyxwmvz8b";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix
index ce1e4cf1f5cef..e7d4403968213 100644
--- a/pkgs/development/compilers/rustc/default.nix
+++ b/pkgs/development/compilers/rustc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, callPackage }:
 
 callPackage ./generic.nix {
-  shortVersion = "1.5.0";
+  shortVersion = "1.6.0";
   isRelease = true;
   forceBundledLLVM = false;
   configureFlags = [ "--release-channel=stable" ];
-  srcSha = "1vfpwx6a2f2rn528774cz9r7r82ppycn8z8ybll6bphdw7cyar1g";
+  srcSha = "1dvpiswl0apknizsz9bcrjnc4c43ys191a1b9gm3569xdlmxr36w";
 
   /* Rust is bootstrapped from an earlier built version. We need
   to fetch these earlier versions, which vary per platform.
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 2cefc4cfc137b..4d2039669598a 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -2,11 +2,11 @@
 { stdenv, callPackage }:
 
 callPackage ./generic.nix {
-  shortVersion = "2016-01-10";
+  shortVersion = "2016-02-01";
   isRelease = false;
-  forceBundledLLVM = false;
-  srcRev = "d70ab2bdf16c22b9f3ff0230089b44855e3f1593";
-  srcSha = "13ssis1bdgg8sdkgrvxcbd1qcfmf7q6bv4akfxrjgdm44l1n1l97";
+  forceBundledLLVM = true;
+  srcRev = "094c5b0d6";
+  srcSha = "0908xzxb4q8vqwmzi5c2vzrhfsrw7d18r4n7mq3ir5671y9cqpvz";
 
   /* Rust is bootstrapped from an earlier built version. We need
   to fetch these earlier versions, which vary per platform.
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 87cb5e6fcfd28..3212601e7899d 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0ggdw2wfbl0gmfkcm3qbqvhalfb1r9wfxzmi8fd38s53f7j4grd2";
+    sha256 = "18mgj1h9wqi0zq4k7y5r5fk10mlbpgh3796d3dac75bpxabg30nk";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index 0d91ca2ff3b24..93aa7811449ae 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -1,3 +1,8 @@
+# Note: The Haskell package set used for building UHC is
+# determined in the file top-level/haskell-packages.nix.
+# We are using Stackage LTS to avoid constant breakage.
+# Bump the Stackage LTS release to the last release if possible
+# when a new UHC version is released.
 { stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages }:
 
 let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [fgl vector syb uulib network binary hashable uhc-util mtl transformers directory containers array process filepath shuffle uuagc] );
@@ -50,8 +55,10 @@ in stdenv.mkDerivation rec {
     # On Darwin, the GNU libtool is used, which does not
     # support the -static flag and thus breaks the build.
     platforms = ["x86_64-linux"];
-
-    broken = true;  # https://github.com/UU-ComputerScience/uhc/issues/69
+    # Hydra currently doesn't build the Stackage LTS package set,
+    # and we don't want to build all our haskell dependencies
+    # from scratch just to build UHC.
+    hydraPlatforms = stdenv.lib.platforms.none;
 
   };
 }
diff --git a/pkgs/development/coq-modules/contribs/all.nix b/pkgs/development/coq-modules/contribs/all.nix
index d01c32bdb0af4..d2ef82c558750 100644
--- a/pkgs/development/coq-modules/contribs/all.nix
+++ b/pkgs/development/coq-modules/contribs/all.nix
@@ -11,7 +11,7 @@ AreaMethod = "07d86p5xbnhbrily18hda0hymf3zx8yhw905plmrqyfbcc6x5531";
 Automata = "0g75gjdj79ysiq1pwqk658jxs2z1l8pk702iz69008vkjzbzkhvm";
 AxiomaticABP = "19x16dgsqyw2pflza8cgv29585a6yy3r8pz4z8ns3r7qhpp1449b";
 BDDs = "0s5a67w9v1lklph8dm4d9bkd6f9qzfb377gvisr3hslacn9ya8zy";
-Bertrand = "1ih0zbk3phk0zwms0mwkcikmki25hgbp1l980gpydj5a0s9ildyg";
+Bertrand = "05i6xw9gi5ad78rsw5pfhiqllw9x4q4phfi4ddzlxpsgshiw7d0k";
 Buchberger = "1v7zi62ar4inncbcphalsyaggx8im02j81b0fnpvx2x3kyv2pr94";
 CCS = "1na7902k05z19a727wa7rz0dbf1fhcl53r4zxvcgvg5dasvwfc97";
 CFGV = "13gk597r9n2wcgcbhribsqrp9wb8mmr3qd4zbv2ig8469kng0j4m";
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c233934a21515..be238e7791d31 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -605,14 +605,8 @@ self: super: {
   # https://github.com/junjihashimoto/test-sandbox-compose/issues/2
   test-sandbox-compose = dontCheck super.test-sandbox-compose;
 
-  # https://github.com/jgm/pandoc/issues/2190
-  pandoc = overrideCabal super.pandoc (drv: {
-    enableSharedExecutables = false;
-    postInstall = ''            # install man pages
-      mv man $out/
-      find $out/man -type f ! -name "*.[0-9]" -exec rm {} +
-    '';
-  });
+  # https://github.com/jgm/pandoc/issues/2709
+  pandoc = disableSharedExecutables super.pandoc;
 
   # Tests attempt to use NPM to install from the network into
   # /homeless-shelter. Disabled.
@@ -627,14 +621,6 @@ self: super: {
   # https://github.com/haskell/haddock/issues/378
   haddock-library = dontCheck super.haddock-library;
 
-  # Already fixed in upstream darcs repo.
-  xmonad-contrib = overrideCabal super.xmonad-contrib (drv: {
-    postPatch = ''
-      sed -i -e '24iimport Control.Applicative' XMonad/Util/Invisible.hs
-      sed -i -e '22iimport Control.Applicative' XMonad/Hooks/DebugEvents.hs
-    '';
-  });
-
   # https://github.com/anton-k/csound-expression-dynamic/issues/1
   csound-expression-dynamic = dontHaddock super.csound-expression-dynamic;
 
@@ -773,9 +759,6 @@ self: super: {
   elm-server = markBroken super.elm-server;
   elm-yesod = markBroken super.elm-yesod;
 
-  # https://github.com/GaloisInc/HaNS/pull/8
-  hans = appendPatch super.hans ./patches/hans-disable-webserver.patch;
-
   # https://github.com/athanclark/sets/issues/2
   sets = dontCheck super.sets;
 
@@ -840,6 +823,9 @@ self: super: {
   configurator = dontCheck super.configurator;
 
   # The cabal files for these libraries do not list the required system dependencies.
+  miniball = overrideCabal super.miniball (drv: {
+    librarySystemDepends = [ pkgs.miniball ];
+  });
   SDL-image = overrideCabal super.SDL-image (drv: {
     librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or [];
   });
diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index c16c9d962e76c..2c495a80e2eb9 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -41,7 +41,7 @@ self: super: {
   unix = null;
 
   # These packages are core libraries in GHC 7.10.x, but not here.
-  binary = self.binary_0_8_0_1;
+  binary = self.binary_0_8_2_0;
   deepseq = self.deepseq_1_3_0_1;
   haskeline = self.haskeline_0_7_2_1;
   hoopl = self.hoopl_3_10_2_0;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 9ba96214d6f20..8b9d962e83221 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -42,7 +42,7 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_0_1; process = self.process_1_2_3_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_2_0; process = self.process_1_2_3_0; };
 
   # Newer versions don't compile.
   Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index a1dad7f3cd9a1..6d47ccc866c81 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -41,10 +41,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_1; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_0; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_1; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_0; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index c5e5802903db9..60be40a79af0b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -40,10 +40,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_1; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_0; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_1; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_0; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 118d9966b68e8..d9a5702a0949c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -34,6 +34,9 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # cabal-install can use the native Cabal library.
+  cabal-install = super.cabal-install.override { Cabal = null; };
+
   # jailbreak-cabal can use the native Cabal library.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 6e8c0be7d0d97..dd51b99bf930a 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -12,7 +12,7 @@ self: super: {
   # LLVM is not supported on this GHC; use the latest one.
   inherit (pkgs) llvmPackages;
 
-  inherit (pkgs.haskell.packages.ghc7102) jailbreak-cabal alex happy gtk2hs-buildtools;
+  inherit (pkgs.haskell.packages.ghc7103) jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle;
 
   # This is the list of packages that are built into a booted ghcjs installation
   # It can be generated with the command:
@@ -85,6 +85,25 @@ self: super: {
     '';
   });
 
+  ghcjs-ffiqq = self.callPackage
+    ({ mkDerivation, base, template-haskell, ghcjs-base, split, containers, text, ghc-prim
+     }:
+     mkDerivation {
+       pname = "ghcjs-ffiqq";
+       version = "0.1.0.0";
+       src = pkgs.fetchFromGitHub {
+         owner = "ghcjs";
+         repo = "ghcjs-ffiqq";
+         rev = "da31b18582542fcfceade5ef6b2aca66662b9e20";
+         sha256 = "1mkp8p9hispyzvkb5v607ihjp912jfip61id8d42i19k554ssp8y";
+       };
+       libraryHaskellDepends = [
+         base template-haskell ghcjs-base split containers text ghc-prim
+       ];
+       description = "FFI QuasiQuoter for GHCJS";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
     libraryHaskellDepends =
       removeLibraryHaskellDepends [
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index e9ab7886bf2cf..4dc205d8973dc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -634,6 +634,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -908,6 +909,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1189,6 +1191,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1202,6 +1205,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1780,6 +1784,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1885,6 +1890,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_5";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2244,6 +2250,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2465,6 +2472,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2475,6 +2483,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2493,6 +2507,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2517,6 +2532,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2614,6 +2630,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2799,6 +2816,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2904,6 +2922,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3029,6 +3048,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3184,6 +3204,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3216,6 +3237,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3301,6 +3323,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3475,16 +3498,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3684,6 +3710,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3737,6 +3764,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3877,6 +3905,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -4017,6 +4046,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4141,6 +4171,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4324,6 +4355,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4876,6 +4908,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5063,6 +5096,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5071,6 +5105,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5110,6 +5146,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5202,11 +5239,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5636,6 +5675,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5877,6 +5917,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6146,6 +6187,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6546,6 +6588,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6557,6 +6600,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6645,6 +6689,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6861,6 +6906,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6878,6 +6924,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6979,6 +7026,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8048,6 +8096,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8291,6 +8340,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8380,6 +8430,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9015,6 +9066,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index f5ffa31c0b903..6cc26a6686e31 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -634,6 +634,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -908,6 +909,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1189,6 +1191,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1202,6 +1205,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1780,6 +1784,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1885,6 +1890,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_5";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2244,6 +2250,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2465,6 +2472,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2475,6 +2483,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2493,6 +2507,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2517,6 +2532,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2614,6 +2630,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2799,6 +2816,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2904,6 +2922,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3029,6 +3048,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3184,6 +3204,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3216,6 +3237,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3301,6 +3323,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3475,16 +3498,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3684,6 +3710,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3737,6 +3764,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3877,6 +3905,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -4017,6 +4046,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4141,6 +4171,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4324,6 +4355,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4876,6 +4908,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5063,6 +5096,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5071,6 +5105,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5110,6 +5146,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5202,11 +5239,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5636,6 +5675,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5877,6 +5917,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6146,6 +6187,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6546,6 +6588,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6557,6 +6600,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6645,6 +6689,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6861,6 +6906,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6878,6 +6924,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6979,6 +7026,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8048,6 +8096,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8291,6 +8340,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8380,6 +8430,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9015,6 +9066,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 7bfff63172983..063b2a48a5d14 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -634,6 +634,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -908,6 +909,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1189,6 +1191,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1202,6 +1205,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1780,6 +1784,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1885,6 +1890,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_5";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2244,6 +2250,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2465,6 +2472,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2475,6 +2483,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2493,6 +2507,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2517,6 +2532,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2614,6 +2630,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2799,6 +2816,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2904,6 +2922,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3029,6 +3048,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3184,6 +3204,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3216,6 +3237,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3301,6 +3323,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3475,16 +3498,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3684,6 +3710,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3737,6 +3764,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3877,6 +3905,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -4017,6 +4046,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4141,6 +4171,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4324,6 +4355,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4876,6 +4908,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5063,6 +5096,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5071,6 +5105,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5110,6 +5146,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5202,11 +5239,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5636,6 +5675,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5877,6 +5917,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6146,6 +6187,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6546,6 +6588,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6557,6 +6600,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6645,6 +6689,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6861,6 +6906,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6878,6 +6924,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6979,6 +7026,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8048,6 +8096,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8291,6 +8340,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8380,6 +8430,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9015,6 +9066,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 0041c132ac49e..17c987efd9331 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -634,6 +634,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -908,6 +909,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1189,6 +1191,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1202,6 +1205,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1780,6 +1784,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1885,6 +1890,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_5";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2244,6 +2250,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2465,6 +2472,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2475,6 +2483,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2493,6 +2507,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2517,6 +2532,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2614,6 +2630,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2799,6 +2816,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2904,6 +2922,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3029,6 +3048,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3184,6 +3204,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3216,6 +3237,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3301,6 +3323,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3475,16 +3498,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3684,6 +3710,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3737,6 +3764,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3877,6 +3905,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -4017,6 +4046,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4141,6 +4171,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4324,6 +4355,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4876,6 +4908,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5063,6 +5096,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5071,6 +5105,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5110,6 +5146,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5202,11 +5239,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5636,6 +5675,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5877,6 +5917,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6146,6 +6187,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6546,6 +6588,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6557,6 +6600,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6645,6 +6689,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6861,6 +6906,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6878,6 +6924,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6979,6 +7026,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8048,6 +8096,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8291,6 +8340,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8380,6 +8430,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9015,6 +9066,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index f4c19fe757056..c430217eb7e15 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -634,6 +634,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -908,6 +909,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1189,6 +1191,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1202,6 +1205,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1780,6 +1784,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1885,6 +1890,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_6";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2244,6 +2250,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2465,6 +2472,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2475,6 +2483,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2493,6 +2507,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2517,6 +2532,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2613,6 +2629,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2798,6 +2815,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2903,6 +2921,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3028,6 +3047,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3183,6 +3203,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3215,6 +3236,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3300,6 +3322,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3474,16 +3497,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3683,6 +3709,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3736,6 +3763,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3874,6 +3902,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -4014,6 +4043,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4138,6 +4168,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4321,6 +4352,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4873,6 +4905,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5060,6 +5093,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5068,6 +5102,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5107,6 +5143,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5199,11 +5236,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5633,6 +5672,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5874,6 +5914,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6143,6 +6184,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6543,6 +6585,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6554,6 +6597,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6642,6 +6686,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6858,6 +6903,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6875,6 +6921,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6976,6 +7023,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8044,6 +8092,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8287,6 +8336,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8376,6 +8426,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9011,6 +9062,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index fdcd0e2bab6f7..8d76c7cfdd735 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -634,6 +634,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -908,6 +909,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1189,6 +1191,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1202,6 +1205,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1780,6 +1784,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1885,6 +1890,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_6";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2244,6 +2250,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2465,6 +2472,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2475,6 +2483,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2493,6 +2507,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2517,6 +2532,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2613,6 +2629,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2798,6 +2815,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2903,6 +2921,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3028,6 +3047,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3183,6 +3203,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3215,6 +3236,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3300,6 +3322,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3474,16 +3497,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3683,6 +3709,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3736,6 +3763,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3874,6 +3902,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -4014,6 +4043,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4138,6 +4168,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4321,6 +4352,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4873,6 +4905,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5060,6 +5093,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5068,6 +5102,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5107,6 +5143,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5199,11 +5236,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5633,6 +5672,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5874,6 +5914,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6143,6 +6184,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6543,6 +6585,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6554,6 +6597,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6642,6 +6686,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6858,6 +6903,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6875,6 +6921,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6976,6 +7023,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8044,6 +8092,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8287,6 +8336,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8376,6 +8426,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9011,6 +9062,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 70339bd0bb736..c52414a8319a4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -634,6 +634,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -907,6 +908,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1188,6 +1190,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1201,6 +1204,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1779,6 +1783,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1884,6 +1889,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_6";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2243,6 +2249,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2464,6 +2471,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2474,6 +2482,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2492,6 +2506,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2516,6 +2531,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2612,6 +2628,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2797,6 +2814,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2902,6 +2920,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3027,6 +3046,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3182,6 +3202,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3214,6 +3235,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3299,6 +3321,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3473,16 +3496,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3682,6 +3708,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3735,6 +3762,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3873,6 +3901,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -4013,6 +4042,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4136,6 +4166,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4319,6 +4350,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4871,6 +4903,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5058,6 +5091,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5066,6 +5100,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5105,6 +5141,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5197,11 +5234,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5631,6 +5670,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5872,6 +5912,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6140,6 +6181,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6540,6 +6582,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6551,6 +6594,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6639,6 +6683,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6855,6 +6900,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6872,6 +6918,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6972,6 +7019,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8040,6 +8088,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8283,6 +8332,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8372,6 +8422,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9004,6 +9055,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 38156ce2ed5f0..1c609caa978a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -634,6 +634,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -907,6 +908,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1188,6 +1190,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1201,6 +1204,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1779,6 +1783,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1884,6 +1889,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_6";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2243,6 +2249,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2464,6 +2471,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2474,6 +2482,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2492,6 +2506,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2516,6 +2531,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2612,6 +2628,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2797,6 +2814,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2902,6 +2920,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3027,6 +3046,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3182,6 +3202,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3214,6 +3235,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3299,6 +3321,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3473,16 +3496,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3682,6 +3708,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3735,6 +3762,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3873,6 +3901,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -4013,6 +4042,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4136,6 +4166,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4319,6 +4350,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4871,6 +4903,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5058,6 +5091,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5066,6 +5100,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5105,6 +5141,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5197,11 +5234,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5631,6 +5670,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5872,6 +5912,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6140,6 +6181,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6540,6 +6582,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6551,6 +6594,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6639,6 +6683,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6855,6 +6900,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6872,6 +6918,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6972,6 +7019,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8040,6 +8088,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8283,6 +8332,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8372,6 +8422,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9004,6 +9055,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index f6622404e5f88..98cab9aaae081 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -631,6 +631,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -904,6 +905,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1184,6 +1186,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1197,6 +1200,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1774,6 +1778,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1877,6 +1882,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_7";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2055,6 +2061,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2235,6 +2242,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2455,6 +2463,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2465,6 +2474,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2483,6 +2498,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2507,6 +2523,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2603,6 +2620,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2788,6 +2806,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2893,6 +2912,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14";
   "elm-get" = dontDistribute super."elm-get";
@@ -3017,6 +3037,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3172,6 +3193,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3204,6 +3226,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3289,6 +3312,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3463,16 +3487,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3671,6 +3698,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3724,6 +3752,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3862,6 +3891,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -4003,6 +4033,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4126,6 +4157,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4308,6 +4340,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4859,6 +4892,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5046,6 +5080,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5054,6 +5089,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5093,6 +5130,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5185,11 +5223,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5619,6 +5659,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5860,6 +5901,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6128,6 +6170,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6528,6 +6571,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6539,6 +6583,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6627,6 +6672,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6843,6 +6889,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6860,6 +6907,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6959,6 +7007,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8026,6 +8075,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8269,6 +8319,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8357,6 +8408,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8989,6 +9041,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index dcab2aa28320e..45096136b7d50 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -631,6 +631,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -904,6 +905,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1184,6 +1186,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1197,6 +1200,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1774,6 +1778,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1876,6 +1881,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2054,6 +2060,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2234,6 +2241,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2453,6 +2461,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2463,6 +2472,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2481,6 +2496,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2505,6 +2521,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2601,6 +2618,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2785,6 +2803,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2890,6 +2909,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3014,6 +3034,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3169,6 +3190,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3201,6 +3223,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3286,6 +3309,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3460,16 +3484,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3668,6 +3695,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3721,6 +3749,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3859,6 +3888,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3999,6 +4029,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4122,6 +4153,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4302,6 +4334,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4853,6 +4886,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5040,6 +5074,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5048,6 +5083,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5087,6 +5124,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5179,11 +5217,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5613,6 +5653,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5853,6 +5894,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6121,6 +6163,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6521,6 +6564,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6532,6 +6576,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6620,6 +6665,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6836,6 +6882,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6853,6 +6900,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6952,6 +7000,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8015,6 +8064,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8257,6 +8307,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8345,6 +8396,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8976,6 +9028,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 6b041938ec1ac..c569da0fce663 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -630,6 +630,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -903,6 +904,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1183,6 +1185,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1199,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1773,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1874,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2051,6 +2057,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2238,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2457,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2459,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2477,6 +2492,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2501,6 +2517,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2597,6 +2614,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2799,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2905,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3030,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3162,6 +3183,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3194,6 +3216,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3278,6 +3301,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3451,16 +3475,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3659,6 +3686,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3712,6 +3740,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3849,6 +3878,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3989,6 +4019,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4111,6 +4142,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4291,6 +4323,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4837,6 +4870,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5024,6 +5058,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5032,6 +5067,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5071,6 +5108,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5163,11 +5201,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5596,6 +5636,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5835,6 +5876,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6102,6 +6144,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6501,6 +6544,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6512,6 +6556,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6600,6 +6645,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6815,6 +6861,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6832,6 +6879,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6931,6 +6979,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7990,6 +8039,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8230,6 +8280,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8318,6 +8369,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8946,6 +8998,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 6851fcfd4cbfc..3cb13aa169657 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -630,6 +630,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -903,6 +904,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1183,6 +1185,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1199,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1773,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1874,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2051,6 +2057,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2238,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2457,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2459,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2477,6 +2492,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2501,6 +2517,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2597,6 +2614,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2799,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2905,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3030,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3161,6 +3182,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3193,6 +3215,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3277,6 +3300,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3450,16 +3474,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3658,6 +3685,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3711,6 +3739,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3848,6 +3877,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3988,6 +4018,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4110,6 +4141,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4290,6 +4322,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4835,6 +4868,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5021,6 +5055,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5029,6 +5064,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5068,6 +5105,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5160,11 +5198,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5592,6 +5632,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5831,6 +5872,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6098,6 +6140,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6497,6 +6540,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6508,6 +6552,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6596,6 +6641,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6811,6 +6857,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6828,6 +6875,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6927,6 +6975,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7986,6 +8035,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8226,6 +8276,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8314,6 +8365,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8942,6 +8994,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 50ee12bb52dc8..621806b6fb886 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -630,6 +630,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -903,6 +904,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1183,6 +1185,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1199,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1773,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1874,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2051,6 +2057,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2238,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2457,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2459,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2477,6 +2492,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2501,6 +2517,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2597,6 +2614,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2799,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2905,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3030,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3161,6 +3182,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3193,6 +3215,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3277,6 +3300,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3450,16 +3474,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3658,6 +3685,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3711,6 +3739,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3848,6 +3877,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3988,6 +4018,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4110,6 +4141,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4289,6 +4321,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4834,6 +4867,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5020,6 +5054,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_8";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5028,6 +5063,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5067,6 +5104,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5159,11 +5197,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5591,6 +5631,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5830,6 +5871,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6097,6 +6139,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6496,6 +6539,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6507,6 +6551,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6595,6 +6640,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6810,6 +6856,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6827,6 +6874,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6926,6 +6974,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7985,6 +8034,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8224,6 +8274,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8312,6 +8363,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8940,6 +8992,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 318f7595f64be..652e60c78d8b7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -630,6 +630,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -903,6 +904,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1183,6 +1185,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1199,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1773,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1874,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2051,6 +2057,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2238,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2457,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2459,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2477,6 +2492,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2501,6 +2517,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2597,6 +2614,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2799,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2905,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3030,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3161,6 +3182,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3193,6 +3215,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3277,6 +3300,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3450,16 +3474,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3658,6 +3685,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3711,6 +3739,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3847,6 +3876,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3987,6 +4017,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4109,6 +4140,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4288,6 +4320,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4833,6 +4866,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5019,6 +5053,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_8";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5027,6 +5062,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5066,6 +5103,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5158,11 +5196,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5590,6 +5630,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5829,6 +5870,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6096,6 +6138,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6495,6 +6538,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6506,6 +6550,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6594,6 +6639,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6809,6 +6855,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6826,6 +6873,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6925,6 +6973,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7983,6 +8032,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8222,6 +8272,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8310,6 +8361,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8938,6 +8990,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 3a378f0f3c99a..e89537089f38b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -629,6 +629,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -902,6 +903,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1182,6 +1184,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1195,6 +1198,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1771,6 +1775,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1872,6 +1877,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2049,6 +2055,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2229,6 +2236,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2446,6 +2454,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2456,6 +2465,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2474,6 +2489,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2498,6 +2514,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2594,6 +2611,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2778,6 +2796,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2883,6 +2902,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3007,6 +3027,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3158,6 +3179,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3190,6 +3212,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3274,6 +3297,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3447,16 +3471,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3655,6 +3682,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3708,6 +3736,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3844,6 +3873,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3984,6 +4014,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4106,6 +4137,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4284,6 +4316,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4829,6 +4862,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5015,6 +5049,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_9";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5023,6 +5058,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5062,6 +5099,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5153,11 +5191,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5585,6 +5625,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5823,6 +5864,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6090,6 +6132,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6489,6 +6532,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6500,6 +6544,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6588,6 +6633,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6802,6 +6848,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6819,6 +6866,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6918,6 +6966,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7976,6 +8025,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8215,6 +8265,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8303,6 +8354,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8931,6 +8983,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 2fa448b07e10a..288a2bf2d4e0e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -629,6 +629,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -901,6 +902,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1181,6 +1183,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1194,6 +1197,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1770,6 +1774,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1871,6 +1876,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2047,6 +2053,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2227,6 +2234,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2443,6 +2451,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2453,6 +2462,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2471,6 +2486,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2495,6 +2511,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2591,6 +2608,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2775,6 +2793,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2880,6 +2899,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3003,6 +3023,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3154,6 +3175,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3186,6 +3208,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3270,6 +3293,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3443,16 +3467,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3651,6 +3678,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3704,6 +3732,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3840,6 +3869,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3980,6 +4010,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4102,6 +4133,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4280,6 +4312,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4825,6 +4858,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5011,6 +5045,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_9";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5019,6 +5054,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5058,6 +5095,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5149,11 +5187,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5581,6 +5621,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5819,6 +5860,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6084,6 +6126,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6483,6 +6526,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6494,6 +6538,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6582,6 +6627,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6709,6 +6755,7 @@ self: super: {
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
   "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6794,6 +6841,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6811,6 +6859,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6910,6 +6959,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7966,6 +8016,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8205,6 +8256,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8293,6 +8345,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8920,6 +8973,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index b84ea04fd9ace..75b907a56050e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -631,6 +631,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -904,6 +905,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1184,6 +1186,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1197,6 +1200,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1774,6 +1778,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1876,6 +1881,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2053,6 +2059,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2233,6 +2240,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2451,6 +2459,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2461,6 +2470,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2479,6 +2494,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2503,6 +2519,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2599,6 +2616,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2783,6 +2801,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2888,6 +2907,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3012,6 +3032,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3167,6 +3188,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3199,6 +3221,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3284,6 +3307,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3457,16 +3481,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3665,6 +3692,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3718,6 +3746,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3856,6 +3885,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3996,6 +4026,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4119,6 +4150,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4299,6 +4331,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4850,6 +4883,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5037,6 +5071,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5045,6 +5080,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5084,6 +5121,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5176,11 +5214,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5610,6 +5650,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5850,6 +5891,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6118,6 +6160,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6517,6 +6560,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6528,6 +6572,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6616,6 +6661,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6831,6 +6877,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6848,6 +6895,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6947,6 +6995,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8009,6 +8058,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8251,6 +8301,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8339,6 +8390,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8970,6 +9022,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 2bbcedea2ebfa..987cbdd2454a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -630,6 +630,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -903,6 +904,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1183,6 +1185,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1199,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1773,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1875,6 +1880,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2052,6 +2058,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2232,6 +2239,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2450,6 +2458,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2460,6 +2469,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2478,6 +2493,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2502,6 +2518,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2598,6 +2615,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2782,6 +2800,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2887,6 +2906,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3011,6 +3031,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3165,6 +3186,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3197,6 +3219,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3282,6 +3305,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3455,16 +3479,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3663,6 +3690,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3716,6 +3744,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3854,6 +3883,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3994,6 +4024,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4116,6 +4147,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4296,6 +4328,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4847,6 +4880,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5034,6 +5068,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5042,6 +5077,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5081,6 +5118,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5173,11 +5211,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5607,6 +5647,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5846,6 +5887,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6114,6 +6156,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6513,6 +6556,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6524,6 +6568,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6612,6 +6657,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6827,6 +6873,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6844,6 +6891,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6943,6 +6991,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8004,6 +8053,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8246,6 +8296,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8334,6 +8385,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8965,6 +9017,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 952676714551e..c3ea5f923c055 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -630,6 +630,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -903,6 +904,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1183,6 +1185,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1199,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1773,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1874,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2051,6 +2057,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2238,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2457,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2459,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2477,6 +2492,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2501,6 +2517,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2597,6 +2614,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2799,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2905,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3030,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3164,6 +3185,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3196,6 +3218,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3281,6 +3304,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3454,16 +3478,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3662,6 +3689,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3715,6 +3743,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3853,6 +3882,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3993,6 +4023,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4115,6 +4146,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4295,6 +4327,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4846,6 +4879,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5033,6 +5067,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5041,6 +5076,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5080,6 +5117,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5172,11 +5210,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5606,6 +5646,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5845,6 +5886,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6113,6 +6155,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6512,6 +6555,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6523,6 +6567,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6611,6 +6656,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6826,6 +6872,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6843,6 +6890,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6942,6 +6990,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8003,6 +8052,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8244,6 +8294,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8332,6 +8383,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8962,6 +9014,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index adcdd01ed2612..fbd3969eaf96f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -630,6 +630,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -903,6 +904,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1183,6 +1185,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1199,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1773,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1874,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2051,6 +2057,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2238,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2457,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2459,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2477,6 +2492,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2501,6 +2517,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2597,6 +2614,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2799,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2905,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3030,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3164,6 +3185,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3196,6 +3218,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3281,6 +3304,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3454,16 +3478,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3662,6 +3689,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3715,6 +3743,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3853,6 +3882,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3993,6 +4023,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4115,6 +4146,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4295,6 +4327,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4841,6 +4874,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5028,6 +5062,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5036,6 +5071,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5075,6 +5112,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5167,11 +5205,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5601,6 +5641,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5840,6 +5881,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6108,6 +6150,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6507,6 +6550,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6518,6 +6562,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6606,6 +6651,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6821,6 +6867,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6838,6 +6885,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6937,6 +6985,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7998,6 +8047,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8239,6 +8289,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8327,6 +8378,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8957,6 +9009,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 553dd0774d21c..c7c05da3ec4fd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -630,6 +630,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -903,6 +904,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1183,6 +1185,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1199,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1773,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1874,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2051,6 +2057,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2238,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2457,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2459,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2477,6 +2492,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2501,6 +2517,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2597,6 +2614,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2799,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2905,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3030,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3162,6 +3183,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3194,6 +3216,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3279,6 +3302,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3452,16 +3476,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3660,6 +3687,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3713,6 +3741,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3850,6 +3879,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3990,6 +4020,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4112,6 +4143,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4292,6 +4324,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4838,6 +4871,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5025,6 +5059,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5033,6 +5068,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5072,6 +5109,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5164,11 +5202,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5597,6 +5637,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5836,6 +5877,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6104,6 +6146,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6503,6 +6546,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6514,6 +6558,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6602,6 +6647,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6817,6 +6863,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6834,6 +6881,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6933,6 +6981,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7994,6 +8043,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8234,6 +8284,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8322,6 +8373,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8952,6 +9004,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index eb92109fd38cf..56a7a77807dcb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -630,6 +630,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -903,6 +904,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1183,6 +1185,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1199,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1773,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1874,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2051,6 +2057,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2238,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2457,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2459,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2477,6 +2492,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2501,6 +2517,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2597,6 +2614,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2799,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2905,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3030,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3162,6 +3183,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3194,6 +3216,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3278,6 +3301,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3451,16 +3475,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3659,6 +3686,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3712,6 +3740,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3849,6 +3878,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3989,6 +4019,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4111,6 +4142,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4291,6 +4323,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4837,6 +4870,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -5024,6 +5058,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5032,6 +5067,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5071,6 +5108,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5163,11 +5201,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5596,6 +5636,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5835,6 +5876,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = dontDistribute super."multiarg";
@@ -6103,6 +6145,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6502,6 +6545,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6513,6 +6557,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6601,6 +6646,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6816,6 +6862,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6833,6 +6880,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6932,6 +6980,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7993,6 +8042,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8233,6 +8283,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8321,6 +8372,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8951,6 +9003,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 8e1c69f9d0a79..2f8fcbf8bb475 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -625,6 +625,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -895,6 +896,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1174,6 +1176,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1187,6 +1190,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1759,6 +1763,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1860,6 +1865,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2036,6 +2042,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2215,6 +2222,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2428,6 +2436,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2438,6 +2447,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2456,6 +2471,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2480,6 +2496,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2576,6 +2593,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2760,6 +2778,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2865,6 +2884,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2988,6 +3008,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3140,6 +3161,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3171,6 +3193,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3253,6 +3276,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3426,16 +3450,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3633,6 +3660,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3651,6 +3679,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3684,6 +3713,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3820,6 +3850,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3960,6 +3991,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4082,6 +4114,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4259,6 +4292,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4796,6 +4830,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4979,6 +5014,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_11";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4987,6 +5023,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5026,6 +5064,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5115,11 +5154,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5542,6 +5583,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5661,6 +5703,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5773,6 +5816,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6034,6 +6078,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6430,6 +6475,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6440,6 +6486,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6528,6 +6575,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6655,6 +6703,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6741,6 +6790,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6758,6 +6808,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6857,6 +6908,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7905,6 +7957,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8144,6 +8197,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8231,6 +8285,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8852,6 +8907,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 18261e8ccb9d5..3df16eb261724 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -625,6 +625,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -895,6 +896,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1174,6 +1176,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1187,6 +1190,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1759,6 +1763,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1859,6 +1864,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2035,6 +2041,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2214,6 +2221,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2427,6 +2435,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2437,6 +2446,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2455,6 +2470,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2479,6 +2495,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2575,6 +2592,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2759,6 +2777,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2864,6 +2883,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2987,6 +3007,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3139,6 +3160,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3170,6 +3192,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3252,6 +3275,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3425,16 +3449,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3632,6 +3659,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3650,6 +3678,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3683,6 +3712,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3819,6 +3849,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3959,6 +3990,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4081,6 +4113,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4258,6 +4291,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4795,6 +4829,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4978,6 +5013,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4986,6 +5022,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5025,6 +5063,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5114,11 +5153,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5541,6 +5582,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5660,6 +5702,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5772,6 +5815,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6033,6 +6077,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6429,6 +6474,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6439,6 +6485,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6527,6 +6574,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6654,6 +6702,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6740,6 +6789,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6757,6 +6807,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6856,6 +6907,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7904,6 +7956,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8143,6 +8196,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8230,6 +8284,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8850,6 +8905,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 95b74fb6ccaaf..0d6f60e04f693 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -624,6 +624,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -892,6 +893,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1169,6 +1171,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1182,6 +1185,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1750,6 +1754,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1848,6 +1853,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2023,6 +2029,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2201,6 +2208,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2413,6 +2421,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2423,6 +2432,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2441,6 +2456,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2464,6 +2480,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2560,6 +2577,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2744,6 +2762,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2848,6 +2867,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2970,6 +2990,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3120,6 +3141,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3151,6 +3173,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3233,6 +3256,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3406,16 +3430,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3613,6 +3640,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3631,6 +3659,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3664,6 +3693,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3798,6 +3828,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3938,6 +3969,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4060,6 +4092,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4236,6 +4269,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4613,6 +4647,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4769,6 +4804,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4950,6 +4986,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4958,6 +4995,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4997,6 +5036,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5086,11 +5126,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5507,6 +5549,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5626,6 +5669,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5739,6 +5783,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5998,6 +6043,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6390,6 +6436,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6400,6 +6447,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6488,6 +6536,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6614,6 +6663,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6700,6 +6750,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6717,6 +6768,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6816,6 +6868,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7854,6 +7907,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8091,6 +8145,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8178,6 +8233,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8795,6 +8851,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 9a47f9dda6f4c..1882dbd6a0886 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -624,6 +624,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -892,6 +893,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1168,6 +1170,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1181,6 +1184,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1749,6 +1753,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1847,6 +1852,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2022,6 +2028,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2200,6 +2207,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2412,6 +2420,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2422,6 +2431,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2440,6 +2455,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2463,6 +2479,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2559,6 +2576,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2743,6 +2761,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2847,6 +2866,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2969,6 +2989,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3119,6 +3140,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3150,6 +3172,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3232,6 +3255,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3404,16 +3428,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3611,6 +3638,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3629,6 +3657,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3662,6 +3691,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3796,6 +3826,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3936,6 +3967,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4058,6 +4090,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4233,6 +4266,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4610,6 +4644,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4766,6 +4801,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4946,6 +4982,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4954,6 +4991,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4993,6 +5032,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5082,11 +5122,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5503,6 +5545,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5622,6 +5665,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5734,6 +5778,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5993,6 +6038,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6384,6 +6430,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6394,6 +6441,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6482,6 +6530,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6608,6 +6657,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6694,6 +6744,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6711,6 +6762,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6810,6 +6862,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7845,6 +7898,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8082,6 +8136,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8169,6 +8224,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8786,6 +8842,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index eddd47d1c8745..b731ee685637c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -624,6 +624,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -892,6 +893,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1168,6 +1170,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1181,6 +1184,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1749,6 +1753,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1847,6 +1852,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2022,6 +2028,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2200,6 +2207,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2412,6 +2420,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2422,6 +2431,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2440,6 +2455,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2463,6 +2479,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2559,6 +2576,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2743,6 +2761,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2847,6 +2866,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2969,6 +2989,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3119,6 +3140,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3150,6 +3172,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3232,6 +3255,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3404,16 +3428,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3611,6 +3638,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3629,6 +3657,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3662,6 +3691,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3796,6 +3826,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3936,6 +3967,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4058,6 +4090,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4233,6 +4266,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4610,6 +4644,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4766,6 +4801,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4946,6 +4982,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4954,6 +4991,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4993,6 +5032,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5082,11 +5122,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5503,6 +5545,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5622,6 +5665,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5734,6 +5778,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5993,6 +6038,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6384,6 +6430,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6394,6 +6441,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6482,6 +6530,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6608,6 +6657,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6694,6 +6744,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6711,6 +6762,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6810,6 +6862,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7844,6 +7897,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8081,6 +8135,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8168,6 +8223,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8785,6 +8841,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index b4614ffe878d6..db5547dc9ef50 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -624,6 +624,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -892,6 +893,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1168,6 +1170,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1181,6 +1184,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1749,6 +1753,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1847,6 +1852,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2022,6 +2028,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2200,6 +2207,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2412,6 +2420,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2422,6 +2431,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2440,6 +2455,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2463,6 +2479,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2559,6 +2576,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2743,6 +2761,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2847,6 +2866,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2969,6 +2989,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3119,6 +3140,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3150,6 +3172,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3232,6 +3255,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3404,16 +3428,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3611,6 +3638,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3629,6 +3657,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3662,6 +3691,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3795,6 +3825,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3935,6 +3966,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4057,6 +4089,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4232,6 +4265,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4609,6 +4643,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4764,6 +4799,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4944,6 +4980,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4952,6 +4989,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4991,6 +5030,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5080,11 +5120,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5501,6 +5543,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5620,6 +5663,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5732,6 +5776,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5991,6 +6036,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6382,6 +6428,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6392,6 +6439,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6480,6 +6528,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6606,6 +6655,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6692,6 +6742,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6709,6 +6760,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6808,6 +6860,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7842,6 +7895,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8079,6 +8133,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8166,6 +8221,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8783,6 +8839,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 4d8ef2724d6f6..0b500291fcfbf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -624,6 +624,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -892,6 +893,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1168,6 +1170,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1181,6 +1184,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1748,6 +1752,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1846,6 +1851,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2021,6 +2027,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2199,6 +2206,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2411,6 +2419,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2421,6 +2430,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2439,6 +2454,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2462,6 +2478,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2558,6 +2575,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2742,6 +2760,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2846,6 +2865,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2968,6 +2988,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3117,6 +3138,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3148,6 +3170,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3230,6 +3253,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3402,16 +3426,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3609,6 +3636,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3627,6 +3655,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3660,6 +3689,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3793,6 +3823,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3933,6 +3964,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4055,6 +4087,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4230,6 +4263,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4606,6 +4640,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4761,6 +4796,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4941,6 +4977,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4949,6 +4986,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4988,6 +5027,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5077,11 +5117,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5498,6 +5540,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5617,6 +5660,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5729,6 +5773,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5988,6 +6033,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6379,6 +6425,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6389,6 +6436,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6477,6 +6525,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6603,6 +6652,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6689,6 +6739,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6706,6 +6757,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6805,6 +6857,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7838,6 +7891,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8075,6 +8129,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8162,6 +8217,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8777,6 +8833,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 94e9eb0184e48..f8c70e4bae830 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -624,6 +624,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -892,6 +893,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1168,6 +1170,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1181,6 +1184,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1748,6 +1752,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1846,6 +1851,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2021,6 +2027,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2199,6 +2206,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2411,6 +2419,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2421,6 +2430,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2439,6 +2454,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2462,6 +2478,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2558,6 +2575,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2742,6 +2760,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2846,6 +2865,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2967,6 +2987,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3116,6 +3137,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3147,6 +3169,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3229,6 +3252,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3401,16 +3425,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3608,6 +3635,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3626,6 +3654,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3659,6 +3688,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3792,6 +3822,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3932,6 +3963,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4054,6 +4086,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4229,6 +4262,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4605,6 +4639,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4760,6 +4795,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4940,6 +4976,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4948,6 +4985,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4987,6 +5026,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5076,11 +5116,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5497,6 +5539,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5616,6 +5659,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5727,6 +5771,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5984,6 +6029,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6375,6 +6421,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6385,6 +6432,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6473,6 +6521,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6599,6 +6648,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6685,6 +6735,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6702,6 +6753,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6801,6 +6853,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7833,6 +7886,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8070,6 +8124,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8157,6 +8212,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8771,6 +8827,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 8fc73ea3a05a6..af59ccac5127f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -623,6 +623,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -891,6 +892,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1167,6 +1169,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1183,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1747,6 +1751,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1845,6 +1850,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2019,6 +2025,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2197,6 +2204,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2408,6 +2416,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2418,6 +2427,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2436,6 +2451,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2459,6 +2475,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2555,6 +2572,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2738,6 +2756,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2842,6 +2861,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2963,6 +2983,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3111,6 +3132,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3142,6 +3164,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3224,6 +3247,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3396,16 +3420,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3603,6 +3630,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3621,6 +3649,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3654,6 +3683,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3787,6 +3817,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3927,6 +3958,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4049,6 +4081,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4224,6 +4257,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4600,6 +4634,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4755,6 +4790,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4935,6 +4971,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4943,6 +4980,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4982,6 +5021,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5071,11 +5111,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5491,6 +5533,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5610,6 +5653,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5721,6 +5765,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5978,6 +6023,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6369,6 +6415,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6379,6 +6426,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6467,6 +6515,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6593,6 +6642,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6679,6 +6729,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6696,6 +6747,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6795,6 +6847,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7827,6 +7880,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8064,6 +8118,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8151,6 +8206,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8764,6 +8820,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 4b57e8e021f94..bdce43f453324 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -623,6 +623,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -891,6 +892,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1167,6 +1169,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1183,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1745,6 +1749,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1843,6 +1848,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2017,6 +2023,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2195,6 +2202,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2406,6 +2414,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2416,6 +2425,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2434,6 +2449,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2457,6 +2473,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2553,6 +2570,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2736,6 +2754,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2840,6 +2859,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2960,6 +2980,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3107,6 +3128,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3138,6 +3160,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3220,6 +3243,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3391,16 +3415,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3598,6 +3625,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3616,6 +3644,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3649,6 +3678,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3782,6 +3812,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3922,6 +3953,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4044,6 +4076,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4219,6 +4252,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4595,6 +4629,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4750,6 +4785,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4930,6 +4966,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4938,6 +4975,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4977,6 +5016,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5066,11 +5106,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5486,6 +5528,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5605,6 +5648,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5716,6 +5760,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5972,6 +6017,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6363,6 +6409,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6373,6 +6420,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6461,6 +6509,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6587,6 +6636,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6673,6 +6723,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6690,6 +6741,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6789,6 +6841,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7821,6 +7874,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8058,6 +8112,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8145,6 +8200,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8758,6 +8814,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index c299d34ec0228..a8b13abbac898 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -623,6 +623,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -891,6 +892,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1167,6 +1169,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1183,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1745,6 +1749,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1842,6 +1847,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2016,6 +2022,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2194,6 +2201,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2405,6 +2413,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2415,6 +2424,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2433,6 +2448,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2456,6 +2472,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2552,6 +2569,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2735,6 +2753,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2838,6 +2857,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2958,6 +2978,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3105,6 +3126,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3136,6 +3158,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3218,6 +3241,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3389,16 +3413,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3596,6 +3623,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3614,6 +3642,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3647,6 +3676,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3780,6 +3810,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3920,6 +3951,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4042,6 +4074,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4216,6 +4249,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4592,6 +4626,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4747,6 +4782,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4927,6 +4963,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4935,6 +4972,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4974,6 +5013,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5063,11 +5103,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5483,6 +5525,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5602,6 +5645,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5713,6 +5757,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5968,6 +6013,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6358,6 +6404,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6368,6 +6415,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6456,6 +6504,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6582,6 +6631,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6668,6 +6718,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6685,6 +6736,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6784,6 +6836,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7815,6 +7868,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8052,6 +8106,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8139,6 +8194,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8751,6 +8807,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index ad3e0bad7db51..7f018681924b7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -623,6 +623,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -891,6 +892,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1167,6 +1169,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1183,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1745,6 +1749,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1842,6 +1847,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2016,6 +2022,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2194,6 +2201,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2405,6 +2413,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2415,6 +2424,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2433,6 +2448,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2456,6 +2472,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2552,6 +2569,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2735,6 +2753,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2838,6 +2857,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2958,6 +2978,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3105,6 +3126,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3136,6 +3158,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3217,6 +3240,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3388,16 +3412,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3595,6 +3622,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3613,6 +3641,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3646,6 +3675,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3779,6 +3809,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3919,6 +3950,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4041,6 +4073,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4215,6 +4248,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4591,6 +4625,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4746,6 +4781,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4926,6 +4962,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4934,6 +4971,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4973,6 +5012,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5062,11 +5102,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5481,6 +5523,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5600,6 +5643,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5661,6 +5705,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = dontDistribute super."monoidal-containers";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5710,6 +5755,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5965,6 +6011,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6355,6 +6402,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6365,6 +6413,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6453,6 +6502,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6579,6 +6629,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6665,6 +6716,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6682,6 +6734,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6781,6 +6834,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7810,6 +7864,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8047,6 +8102,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8134,6 +8190,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8745,6 +8802,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 69e76d6b5696c..c2aa4a3421bae 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -625,6 +625,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -894,6 +895,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1173,6 +1175,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1186,6 +1189,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1758,6 +1762,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1856,6 +1861,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2032,6 +2038,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2211,6 +2218,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2424,6 +2432,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2434,6 +2443,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2452,6 +2467,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2476,6 +2492,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2572,6 +2589,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2756,6 +2774,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2861,6 +2880,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2984,6 +3004,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3136,6 +3157,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3167,6 +3189,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3249,6 +3272,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3422,16 +3446,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3629,6 +3656,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3647,6 +3675,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3680,6 +3709,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3816,6 +3846,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3956,6 +3987,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4078,6 +4110,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4255,6 +4288,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4792,6 +4826,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4975,6 +5010,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4983,6 +5019,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5022,6 +5060,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5111,11 +5150,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5538,6 +5579,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5657,6 +5699,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5769,6 +5812,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6030,6 +6074,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6426,6 +6471,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6436,6 +6482,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6524,6 +6571,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6651,6 +6699,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6737,6 +6786,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6754,6 +6804,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6853,6 +6904,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7901,6 +7953,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8140,6 +8193,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8227,6 +8281,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8846,6 +8901,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index c107ba1cc83b1..f94aa3dd4a667 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -623,6 +623,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -891,6 +892,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1167,6 +1169,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1183,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1745,6 +1749,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1842,6 +1847,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2016,6 +2022,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2193,6 +2200,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2404,6 +2412,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2414,6 +2423,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2432,6 +2447,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2455,6 +2471,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2551,6 +2568,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2734,6 +2752,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2837,6 +2856,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2957,6 +2977,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3104,6 +3125,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3135,6 +3157,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3216,6 +3239,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3387,16 +3411,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3594,6 +3621,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3612,6 +3640,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3645,6 +3674,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3778,6 +3808,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3918,6 +3949,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4040,6 +4072,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4214,6 +4247,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4590,6 +4624,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4745,6 +4780,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4925,6 +4961,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4933,6 +4970,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4972,6 +5011,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5061,11 +5101,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5480,6 +5522,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5599,6 +5642,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5660,6 +5704,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = dontDistribute super."monoidal-containers";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5709,6 +5754,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5964,6 +6010,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6353,6 +6400,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6363,6 +6411,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6451,6 +6500,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6577,6 +6627,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6663,6 +6714,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6680,6 +6732,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6779,6 +6832,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7807,6 +7861,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8044,6 +8099,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8131,6 +8187,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8742,6 +8799,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 414d0d4a4d2f6..404bb06d59701 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -623,6 +623,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -891,6 +892,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1167,6 +1169,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1183,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1745,6 +1749,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1842,6 +1847,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2016,6 +2022,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2193,6 +2200,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2404,6 +2412,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2414,6 +2423,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2432,6 +2447,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2455,6 +2471,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2551,6 +2568,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2734,6 +2752,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2837,6 +2856,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2957,6 +2977,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3104,6 +3125,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3135,6 +3157,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3216,6 +3239,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3387,16 +3411,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3594,6 +3621,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3612,6 +3640,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3645,6 +3674,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3778,6 +3808,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3918,6 +3949,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4040,6 +4072,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4214,6 +4247,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4590,6 +4624,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4745,6 +4780,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4925,6 +4961,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4933,6 +4970,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4972,6 +5011,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5061,11 +5101,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5479,6 +5521,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5598,6 +5641,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5659,6 +5703,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = dontDistribute super."monoidal-containers";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5708,6 +5753,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5963,6 +6009,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6352,6 +6399,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6362,6 +6410,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6449,6 +6498,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6575,6 +6625,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6661,6 +6712,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6678,6 +6730,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6777,6 +6830,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7805,6 +7859,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8042,6 +8097,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8129,6 +8185,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8737,6 +8794,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 3915f14e98db5..ae87d1cd488cc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -623,6 +623,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -891,6 +892,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1167,6 +1169,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1183,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1745,6 +1749,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1842,6 +1847,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2016,6 +2022,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2193,6 +2200,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2404,6 +2412,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2414,6 +2423,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2432,6 +2447,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2455,6 +2471,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2551,6 +2568,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2734,6 +2752,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2837,6 +2856,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2957,6 +2977,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3104,6 +3125,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3135,6 +3157,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3216,6 +3239,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3387,16 +3411,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3594,6 +3621,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3612,6 +3640,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3645,6 +3674,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3778,6 +3808,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3918,6 +3949,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4040,6 +4072,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4213,6 +4246,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4589,6 +4623,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4744,6 +4779,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4924,6 +4960,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4932,6 +4969,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4971,6 +5010,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5060,11 +5100,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5478,6 +5520,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5596,6 +5639,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5657,6 +5701,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = dontDistribute super."monoidal-containers";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5706,6 +5751,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5961,6 +6007,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6350,6 +6397,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6360,6 +6408,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6447,6 +6496,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6573,6 +6623,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6659,6 +6710,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6676,6 +6728,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6775,6 +6828,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7803,6 +7857,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8040,6 +8095,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8127,6 +8183,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8735,6 +8792,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index a6e8bdea0bf5e..8566604ebe3b2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -625,6 +625,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -894,6 +895,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1173,6 +1175,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1186,6 +1189,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1758,6 +1762,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1856,6 +1861,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2032,6 +2038,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2211,6 +2218,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2424,6 +2432,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2434,6 +2443,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2452,6 +2467,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2476,6 +2492,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2572,6 +2589,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2756,6 +2774,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2861,6 +2880,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2984,6 +3004,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3135,6 +3156,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3166,6 +3188,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3248,6 +3271,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3421,16 +3445,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3628,6 +3655,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3646,6 +3674,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3679,6 +3708,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3815,6 +3845,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3955,6 +3986,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4077,6 +4109,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4254,6 +4287,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4790,6 +4824,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4973,6 +5008,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4981,6 +5017,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5020,6 +5058,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5109,11 +5148,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5536,6 +5577,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5655,6 +5697,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5767,6 +5810,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6028,6 +6072,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6424,6 +6469,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6434,6 +6480,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6522,6 +6569,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6649,6 +6697,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6735,6 +6784,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6752,6 +6802,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6851,6 +6902,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7899,6 +7951,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8138,6 +8191,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8225,6 +8279,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8844,6 +8899,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index fbf589da2a48a..9f910c8105481 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -625,6 +625,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -894,6 +895,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1173,6 +1175,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1186,6 +1189,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1757,6 +1761,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1855,6 +1860,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2031,6 +2037,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2210,6 +2217,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2423,6 +2431,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2433,6 +2442,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2451,6 +2466,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2475,6 +2491,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2571,6 +2588,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2755,6 +2773,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2860,6 +2879,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2983,6 +3003,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3134,6 +3155,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3165,6 +3187,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3247,6 +3270,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3420,16 +3444,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3627,6 +3654,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3645,6 +3673,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3678,6 +3707,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3814,6 +3844,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3954,6 +3985,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4076,6 +4108,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4253,6 +4286,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4789,6 +4823,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4972,6 +5007,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4980,6 +5016,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5019,6 +5057,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5108,11 +5147,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5534,6 +5575,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5653,6 +5695,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5765,6 +5808,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6026,6 +6070,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6420,6 +6465,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6430,6 +6476,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6518,6 +6565,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6645,6 +6693,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6731,6 +6780,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6748,6 +6798,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6847,6 +6898,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7894,6 +7946,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8133,6 +8186,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8220,6 +8274,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8839,6 +8894,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 950c96577cbb5..7d5e081463d8f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -625,6 +625,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -894,6 +895,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1173,6 +1175,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1186,6 +1189,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1757,6 +1761,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1855,6 +1860,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2031,6 +2037,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2210,6 +2217,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2422,6 +2430,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2432,6 +2441,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2450,6 +2465,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2474,6 +2490,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2570,6 +2587,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2754,6 +2772,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2859,6 +2878,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2982,6 +3002,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3133,6 +3154,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3164,6 +3186,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3246,6 +3269,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3419,16 +3443,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3626,6 +3653,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3644,6 +3672,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3677,6 +3706,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3813,6 +3843,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3953,6 +3984,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4075,6 +4107,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4252,6 +4285,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4788,6 +4822,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4971,6 +5006,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4979,6 +5015,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5018,6 +5056,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5107,11 +5146,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5532,6 +5573,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5651,6 +5693,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5763,6 +5806,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6024,6 +6068,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6418,6 +6463,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6428,6 +6474,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6516,6 +6563,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6643,6 +6691,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6729,6 +6778,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6746,6 +6796,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6845,6 +6896,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7892,6 +7944,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8131,6 +8184,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8218,6 +8272,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8837,6 +8892,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 38c75d61d58fe..a1607e9aeae7d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -625,6 +625,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -894,6 +895,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1171,6 +1173,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1184,6 +1187,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1754,6 +1758,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1852,6 +1857,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2028,6 +2034,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2207,6 +2214,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2419,6 +2427,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2429,6 +2438,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2447,6 +2462,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2471,6 +2487,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2567,6 +2584,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2751,6 +2769,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2856,6 +2875,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2979,6 +2999,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3130,6 +3151,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3161,6 +3183,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3243,6 +3266,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3416,16 +3440,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3623,6 +3650,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3641,6 +3669,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3674,6 +3703,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3808,6 +3838,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3948,6 +3979,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4070,6 +4102,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4247,6 +4280,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4783,6 +4817,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4966,6 +5001,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4974,6 +5010,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5013,6 +5051,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5102,11 +5141,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5527,6 +5568,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5646,6 +5688,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5758,6 +5801,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6018,6 +6062,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6412,6 +6457,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6422,6 +6468,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6510,6 +6557,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6637,6 +6685,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6723,6 +6772,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6740,6 +6790,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6839,6 +6890,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7886,6 +7938,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8123,6 +8176,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8210,6 +8264,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8828,6 +8883,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 997a567ddd364..123833c374d2a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -624,6 +624,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -893,6 +894,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1170,6 +1172,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1183,6 +1186,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1753,6 +1757,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1851,6 +1856,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2027,6 +2033,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2206,6 +2213,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2418,6 +2426,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2428,6 +2437,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2446,6 +2461,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2470,6 +2486,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2566,6 +2583,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2750,6 +2768,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2855,6 +2874,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2978,6 +2998,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3129,6 +3150,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3160,6 +3182,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3242,6 +3265,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3415,16 +3439,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3622,6 +3649,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3640,6 +3668,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3673,6 +3702,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3807,6 +3837,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3947,6 +3978,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4069,6 +4101,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4246,6 +4279,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4782,6 +4816,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4965,6 +5000,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4973,6 +5009,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5012,6 +5050,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5101,11 +5140,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5526,6 +5567,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5645,6 +5687,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5758,6 +5801,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6017,6 +6061,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6411,6 +6456,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6421,6 +6467,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6509,6 +6556,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6636,6 +6684,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6722,6 +6771,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6739,6 +6789,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6838,6 +6889,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7885,6 +7937,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8122,6 +8175,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8209,6 +8263,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8827,6 +8882,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index ad0e17a2b4a3b..6c391312b272f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -624,6 +624,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -892,6 +893,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1169,6 +1171,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1182,6 +1185,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1752,6 +1756,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1850,6 +1855,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2026,6 +2032,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2205,6 +2212,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2417,6 +2425,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2427,6 +2436,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2445,6 +2460,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2469,6 +2485,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2565,6 +2582,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2749,6 +2767,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2854,6 +2873,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2977,6 +2997,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3127,6 +3148,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3158,6 +3180,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3240,6 +3263,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3413,16 +3437,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3620,6 +3647,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3638,6 +3666,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3671,6 +3700,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3805,6 +3835,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3945,6 +3976,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4067,6 +4099,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4244,6 +4277,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4623,6 +4657,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4779,6 +4814,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4962,6 +4998,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4970,6 +5007,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5009,6 +5048,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5098,11 +5138,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5523,6 +5565,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5642,6 +5685,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5755,6 +5799,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6014,6 +6059,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6408,6 +6454,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6418,6 +6465,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6506,6 +6554,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6633,6 +6682,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6719,6 +6769,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6736,6 +6787,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6835,6 +6887,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7878,6 +7931,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8115,6 +8169,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8202,6 +8257,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8820,6 +8876,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 70df2406a7e91..7722a893c0f47 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -624,6 +624,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -892,6 +893,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1169,6 +1171,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1182,6 +1185,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1750,6 +1754,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1848,6 +1853,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2023,6 +2029,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2202,6 +2209,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2414,6 +2422,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2424,6 +2433,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2442,6 +2457,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2466,6 +2482,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2562,6 +2579,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2746,6 +2764,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2850,6 +2869,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2972,6 +2992,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3122,6 +3143,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3153,6 +3175,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3235,6 +3258,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3408,16 +3432,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3615,6 +3642,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3633,6 +3661,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3666,6 +3695,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3800,6 +3830,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3940,6 +3971,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4062,6 +4094,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4239,6 +4272,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4616,6 +4650,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4772,6 +4807,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4955,6 +4991,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4963,6 +5000,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5002,6 +5041,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -5091,11 +5131,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5514,6 +5556,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5633,6 +5676,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5746,6 +5790,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6005,6 +6050,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6398,6 +6444,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6408,6 +6455,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6496,6 +6544,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6623,6 +6672,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6709,6 +6759,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6726,6 +6777,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6825,6 +6877,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7864,6 +7917,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -8101,6 +8155,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -8188,6 +8243,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8805,6 +8861,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index cd610a659c459..de0f4fe5fa105 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -611,6 +611,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -872,6 +873,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1143,6 +1145,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1155,6 +1158,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1262,6 +1266,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1692,6 +1697,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1783,6 +1789,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1954,6 +1961,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2128,6 +2136,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2337,6 +2346,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2347,6 +2357,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2364,6 +2380,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2386,6 +2403,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2481,6 +2499,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2654,6 +2673,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2754,6 +2774,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2871,6 +2892,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3011,6 +3033,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3041,6 +3064,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3122,6 +3146,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3291,16 +3316,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3497,6 +3525,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3515,6 +3544,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3547,6 +3577,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3676,6 +3707,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3816,6 +3848,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_1_4";
@@ -3936,6 +3969,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4105,6 +4139,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4476,6 +4511,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4622,6 +4658,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4796,6 +4833,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4803,6 +4841,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4841,6 +4881,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4919,11 +4960,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4938,6 +4981,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5324,6 +5368,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5438,6 +5483,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5496,6 +5542,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_2";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5540,6 +5587,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5791,6 +5839,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6165,6 +6214,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_4_1";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6175,6 +6225,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6262,6 +6313,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6387,6 +6439,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6471,6 +6524,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6488,6 +6542,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6588,6 +6643,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6810,6 +6866,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7594,6 +7651,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7821,6 +7879,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7907,6 +7966,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8057,6 +8117,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8496,6 +8557,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 54efeb53169b2..d88256166b26d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -611,6 +611,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -872,6 +873,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1142,6 +1144,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1154,6 +1157,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1261,6 +1265,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1691,6 +1696,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1782,6 +1788,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1953,6 +1960,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2127,6 +2135,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2336,6 +2345,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2346,6 +2356,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2363,6 +2379,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2385,6 +2402,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2480,6 +2498,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2653,6 +2672,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2753,6 +2773,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2870,6 +2891,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3008,6 +3030,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3038,6 +3061,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3119,6 +3143,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3288,16 +3313,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3494,6 +3522,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3512,6 +3541,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3544,6 +3574,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3673,6 +3704,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3813,6 +3845,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_1_4";
@@ -3933,6 +3966,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4102,6 +4136,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4473,6 +4508,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4619,6 +4655,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4793,6 +4830,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4800,6 +4838,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4838,6 +4878,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4916,11 +4957,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4935,6 +4978,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5320,6 +5364,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5434,6 +5479,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5492,6 +5538,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_2";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5536,6 +5583,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5786,6 +5834,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6159,6 +6208,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_4_1";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6169,6 +6219,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6256,6 +6307,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6381,6 +6433,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6465,6 +6518,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6482,6 +6536,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6582,6 +6637,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6803,6 +6859,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7587,6 +7644,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7814,6 +7872,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7900,6 +7959,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8049,6 +8109,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8488,6 +8549,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 31a89af13be88..c3a43b75622d0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -606,6 +606,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -866,6 +867,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1136,6 +1138,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1148,6 +1151,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1255,6 +1259,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1675,6 +1680,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1766,6 +1772,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1840,6 +1847,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1935,6 +1943,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2109,6 +2118,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2315,6 +2325,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2325,6 +2336,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2342,6 +2359,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2364,6 +2382,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2459,6 +2478,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2542,6 +2562,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2624,6 +2645,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2723,6 +2745,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2805,6 +2828,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2839,6 +2863,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2975,6 +3000,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3004,6 +3030,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3084,6 +3111,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3252,16 +3280,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3456,6 +3487,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3474,6 +3506,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3506,6 +3539,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3635,6 +3669,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3706,6 +3741,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3774,6 +3810,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3892,6 +3929,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4051,6 +4089,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4059,6 +4098,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4428,6 +4468,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4572,6 +4613,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4746,12 +4788,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4789,6 +4834,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4865,11 +4911,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4884,6 +4932,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5266,6 +5315,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5379,6 +5429,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5436,6 +5487,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5479,6 +5531,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5726,6 +5779,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6093,6 +6147,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6103,6 +6158,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6186,6 +6242,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6251,6 +6308,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6309,6 +6367,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6390,6 +6449,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6407,6 +6467,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6506,6 +6567,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6702,6 +6764,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6726,6 +6789,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7496,6 +7560,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7721,6 +7786,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7807,6 +7873,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7954,6 +8021,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8379,6 +8447,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 2a0ccf1d8545a..b529c0c648fe1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -606,6 +606,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -866,6 +867,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1136,6 +1138,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1148,6 +1151,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1255,6 +1259,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1674,6 +1679,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1764,6 +1770,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1838,6 +1845,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1933,6 +1941,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2107,6 +2116,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2313,6 +2323,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2323,6 +2334,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2340,6 +2357,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2362,6 +2380,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2457,6 +2476,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2540,6 +2560,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2622,6 +2643,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2721,6 +2743,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2803,6 +2826,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2836,6 +2860,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2972,6 +2997,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3001,6 +3027,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3081,6 +3108,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3249,16 +3277,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3453,6 +3484,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3471,6 +3503,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3503,6 +3536,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3632,6 +3666,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3703,6 +3738,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3771,6 +3807,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3889,6 +3926,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4048,6 +4086,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4056,6 +4095,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4425,6 +4465,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4569,6 +4610,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4743,12 +4785,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4786,6 +4831,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4862,11 +4908,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4881,6 +4929,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5263,6 +5312,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5376,6 +5426,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5433,6 +5484,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5476,6 +5528,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5723,6 +5776,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6089,6 +6143,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6099,6 +6154,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6182,6 +6238,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6247,6 +6304,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6305,6 +6363,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6386,6 +6445,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6403,6 +6463,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6502,6 +6563,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6698,6 +6760,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6722,6 +6785,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7491,6 +7555,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7716,6 +7781,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7802,6 +7868,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7949,6 +8016,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8374,6 +8442,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index bae9a9efad81c..b89fa70f8b46c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -605,6 +605,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -865,6 +866,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1135,6 +1137,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1147,6 +1150,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1254,6 +1258,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1673,6 +1678,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1763,6 +1769,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1837,6 +1844,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1931,6 +1939,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2102,6 +2111,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2308,6 +2318,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2318,6 +2329,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2335,6 +2352,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2357,6 +2375,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2452,6 +2471,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2535,6 +2555,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2617,6 +2638,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2716,6 +2738,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2798,6 +2821,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2831,6 +2855,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2967,6 +2992,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2996,6 +3022,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3076,6 +3103,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3244,16 +3272,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3447,6 +3478,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3465,6 +3497,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3497,6 +3530,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3626,6 +3660,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3697,6 +3732,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3765,6 +3801,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3883,6 +3920,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4042,6 +4080,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4050,6 +4089,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4419,6 +4459,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4563,6 +4604,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4737,12 +4779,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4780,6 +4825,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4856,11 +4902,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4875,6 +4923,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5257,6 +5306,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5370,6 +5420,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5427,6 +5478,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5470,6 +5522,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5717,6 +5770,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6082,6 +6136,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6092,6 +6147,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6175,6 +6231,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6240,6 +6297,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6298,6 +6356,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6379,6 +6438,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6396,6 +6456,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6495,6 +6556,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6691,6 +6753,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6715,6 +6778,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7483,6 +7547,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7707,6 +7772,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7793,6 +7859,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7940,6 +8007,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8364,6 +8432,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 1c0bfd5e48e31..f6a631e11538e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -605,6 +605,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -865,6 +866,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1135,6 +1137,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1147,6 +1150,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1254,6 +1258,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1673,6 +1678,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1763,6 +1769,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1837,6 +1844,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1931,6 +1939,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2102,6 +2111,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2308,6 +2318,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2318,6 +2329,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2335,6 +2352,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2357,6 +2375,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2452,6 +2471,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2535,6 +2555,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2617,6 +2638,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2716,6 +2738,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2798,6 +2821,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2831,6 +2855,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2967,6 +2992,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2996,6 +3022,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3076,6 +3103,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3244,16 +3272,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3447,6 +3478,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3465,6 +3497,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3497,6 +3530,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3626,6 +3660,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3697,6 +3732,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3765,6 +3801,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3883,6 +3920,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4041,6 +4079,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4049,6 +4088,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4418,6 +4458,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4562,6 +4603,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4736,12 +4778,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4779,6 +4824,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4855,11 +4901,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4874,6 +4922,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5255,6 +5304,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5368,6 +5418,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5425,6 +5476,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5468,6 +5520,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5715,6 +5768,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6079,6 +6133,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6089,6 +6144,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6172,6 +6228,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6237,6 +6294,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6295,6 +6353,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6376,6 +6435,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6393,6 +6453,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6492,6 +6553,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6688,6 +6750,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6712,6 +6775,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7344,6 +7408,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7479,6 +7544,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7703,6 +7769,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7789,6 +7856,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7936,6 +8004,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8359,6 +8428,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 46b637d6e69e1..571045bdc8ff9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -605,6 +605,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -865,6 +866,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1133,6 +1135,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1145,6 +1148,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1252,6 +1256,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1671,6 +1676,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1760,6 +1766,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1834,6 +1841,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1928,6 +1936,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2099,6 +2108,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2304,6 +2314,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2314,6 +2325,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2331,6 +2348,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2353,6 +2371,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2448,6 +2467,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2529,6 +2549,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2611,6 +2632,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2709,6 +2731,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2791,6 +2814,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2824,6 +2848,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2960,6 +2985,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2989,6 +3015,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3069,6 +3096,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3237,16 +3265,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3440,6 +3471,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3458,6 +3490,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3490,6 +3523,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3619,6 +3653,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3690,6 +3725,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3758,6 +3794,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3876,6 +3913,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4034,6 +4072,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4042,6 +4081,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4410,6 +4450,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4554,6 +4595,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4728,12 +4770,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4771,6 +4816,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4847,11 +4893,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4866,6 +4914,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5246,6 +5295,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5359,6 +5409,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5415,6 +5466,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5458,6 +5510,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5705,6 +5758,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6069,6 +6123,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6079,6 +6134,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6162,6 +6218,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6227,6 +6284,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6285,6 +6343,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6366,6 +6425,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6383,6 +6443,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6482,6 +6543,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6678,6 +6740,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6702,6 +6765,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7334,6 +7398,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7469,6 +7534,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7693,6 +7759,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7779,6 +7846,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7926,6 +7994,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8347,6 +8416,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 99fd4d5a0a8fe..cde1bb303ff63 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -605,6 +605,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -865,6 +866,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1133,6 +1135,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1145,6 +1148,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1252,6 +1256,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1671,6 +1676,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1760,6 +1766,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1834,6 +1841,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1928,6 +1936,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2099,6 +2108,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2304,6 +2314,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2314,6 +2325,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2331,6 +2348,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2353,6 +2371,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2448,6 +2467,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2529,6 +2549,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2611,6 +2632,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2709,6 +2731,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2791,6 +2814,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2824,6 +2848,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2960,6 +2985,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2989,6 +3015,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3069,6 +3096,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3236,16 +3264,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3439,6 +3470,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3457,6 +3489,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3489,6 +3522,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3618,6 +3652,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3689,6 +3724,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3756,6 +3792,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3874,6 +3911,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4032,6 +4070,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4040,6 +4079,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4407,6 +4447,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4550,6 +4591,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4724,12 +4766,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4767,6 +4812,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4843,11 +4889,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4862,6 +4910,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5242,6 +5291,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5355,6 +5405,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5411,6 +5462,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5454,6 +5506,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5701,6 +5754,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6065,6 +6119,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6075,6 +6130,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6158,6 +6214,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6223,6 +6280,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6244,6 +6302,7 @@ self: super: {
   "pure-priority-queue" = dontDistribute super."pure-priority-queue";
   "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
   "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6280,6 +6339,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6361,6 +6421,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6378,6 +6439,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6477,6 +6539,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6673,6 +6736,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6697,6 +6761,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7328,6 +7393,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7463,6 +7529,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7687,6 +7754,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7773,6 +7841,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7920,6 +7989,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8341,6 +8411,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index d8fd3a98d386c..d3c3eecf1eaea 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -605,6 +605,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -864,6 +865,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1132,6 +1134,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1144,6 +1147,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1251,6 +1255,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1434,6 +1439,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1669,6 +1675,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1758,6 +1765,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1832,6 +1840,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1926,6 +1935,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2097,6 +2107,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2302,6 +2313,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2312,6 +2324,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2329,6 +2347,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2351,6 +2370,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2446,6 +2466,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2527,6 +2548,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2609,6 +2631,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2707,6 +2730,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2789,6 +2813,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2821,6 +2846,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2957,6 +2983,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2986,6 +3013,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3066,6 +3094,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3233,16 +3262,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3436,6 +3468,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3454,6 +3487,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3486,6 +3520,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3614,6 +3649,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3685,6 +3721,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3752,6 +3789,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3870,6 +3908,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4028,6 +4067,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4036,6 +4076,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4403,6 +4444,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4546,6 +4588,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4720,12 +4763,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4763,6 +4809,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4839,11 +4886,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4858,6 +4907,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5236,6 +5286,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5349,6 +5400,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5405,6 +5457,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5448,6 +5501,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5695,6 +5749,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6058,6 +6113,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6068,6 +6124,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6150,6 +6207,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6215,6 +6273,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6236,6 +6295,7 @@ self: super: {
   "pure-priority-queue" = dontDistribute super."pure-priority-queue";
   "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
   "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6272,6 +6332,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6353,6 +6414,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6370,6 +6432,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6468,6 +6531,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6664,6 +6728,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6687,6 +6752,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7317,6 +7383,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7450,6 +7517,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7673,6 +7741,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7759,6 +7828,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7906,6 +7976,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8327,6 +8398,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index bdc78a3276988..2f0d9ece96b12 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -605,6 +605,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -864,6 +865,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1132,6 +1134,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1144,6 +1147,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1251,6 +1255,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1433,6 +1438,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1668,6 +1674,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1757,6 +1764,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1831,6 +1839,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1924,6 +1933,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2094,6 +2104,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2299,6 +2310,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2309,6 +2321,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2326,6 +2344,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2348,6 +2367,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2443,6 +2463,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2524,6 +2545,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2606,6 +2628,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2704,6 +2727,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2786,6 +2810,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2818,6 +2843,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2954,6 +2980,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2983,6 +3010,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3063,6 +3091,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3230,16 +3259,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3433,6 +3465,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3451,6 +3484,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3483,6 +3517,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3610,6 +3645,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3681,6 +3717,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3748,6 +3785,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3866,6 +3904,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4024,6 +4063,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4032,6 +4072,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4399,6 +4440,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4542,6 +4584,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4715,12 +4758,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4758,6 +4804,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4834,11 +4881,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4853,6 +4902,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5230,6 +5280,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5343,6 +5394,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5398,6 +5450,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5441,6 +5494,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5688,6 +5742,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6051,6 +6106,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6061,6 +6117,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6143,6 +6200,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6208,6 +6266,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6229,6 +6288,7 @@ self: super: {
   "pure-priority-queue" = dontDistribute super."pure-priority-queue";
   "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
   "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6265,6 +6325,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6346,6 +6407,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6363,6 +6425,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6461,6 +6524,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6657,6 +6721,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6680,6 +6745,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7310,6 +7376,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7443,6 +7510,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7666,6 +7734,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7752,6 +7821,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7898,6 +7968,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8318,6 +8389,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 367f95328dc4b..208ba6fedffb0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -605,6 +605,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -864,6 +865,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1132,6 +1134,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1144,6 +1147,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1251,6 +1255,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1433,6 +1438,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1668,6 +1674,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1757,6 +1764,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1830,6 +1838,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1923,6 +1932,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2093,6 +2103,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2298,6 +2309,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2308,6 +2320,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2325,6 +2343,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2347,6 +2366,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2442,6 +2462,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2523,6 +2544,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2605,6 +2627,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2703,6 +2726,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2785,6 +2809,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2817,6 +2842,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2953,6 +2979,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2982,6 +3009,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3062,6 +3090,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3229,16 +3258,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3430,6 +3462,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3448,6 +3481,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3480,6 +3514,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3606,6 +3641,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3677,6 +3713,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3744,6 +3781,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3861,6 +3899,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4018,6 +4057,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4026,6 +4066,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4390,6 +4431,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4533,6 +4575,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4706,12 +4749,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4749,6 +4795,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4825,11 +4872,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4844,6 +4893,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5221,6 +5271,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5334,6 +5385,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5389,6 +5441,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5432,6 +5485,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5679,6 +5733,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6041,6 +6096,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6051,6 +6107,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6133,6 +6190,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6196,6 +6254,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6217,6 +6276,7 @@ self: super: {
   "pure-priority-queue" = dontDistribute super."pure-priority-queue";
   "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
   "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6253,6 +6313,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6334,6 +6395,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6351,6 +6413,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6449,6 +6512,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6645,6 +6709,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6668,6 +6733,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7297,6 +7363,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7429,6 +7496,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7652,6 +7720,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7738,6 +7807,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7883,6 +7953,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8303,6 +8374,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index a14789bb313e8..296a97f41c5aa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -604,6 +604,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -863,6 +864,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1131,6 +1133,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1143,6 +1146,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1250,6 +1254,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1430,6 +1435,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1665,6 +1671,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1752,6 +1759,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1825,6 +1833,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1918,6 +1927,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2087,6 +2097,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2292,6 +2303,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2302,6 +2314,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2319,6 +2337,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2341,6 +2360,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2436,6 +2456,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2517,6 +2538,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2599,6 +2621,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2697,6 +2720,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2779,6 +2803,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2811,6 +2836,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2947,6 +2973,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2976,6 +3003,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3056,6 +3084,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3223,16 +3252,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3424,6 +3456,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3442,6 +3475,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3474,6 +3508,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3600,6 +3635,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3671,6 +3707,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3738,6 +3775,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3855,6 +3893,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4012,6 +4051,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4020,6 +4060,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4381,6 +4422,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4524,6 +4566,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4697,12 +4740,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4739,6 +4785,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4815,11 +4862,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4834,6 +4883,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5210,6 +5260,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5323,6 +5374,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5378,6 +5430,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5421,6 +5474,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5667,6 +5721,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6027,6 +6082,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6037,6 +6093,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6119,6 +6176,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6182,6 +6240,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6203,6 +6262,7 @@ self: super: {
   "pure-priority-queue" = dontDistribute super."pure-priority-queue";
   "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
   "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6239,6 +6299,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6320,6 +6381,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6337,6 +6399,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6435,6 +6498,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6493,6 +6557,7 @@ self: super: {
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6630,6 +6695,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6653,6 +6719,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7281,6 +7348,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7413,6 +7481,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7636,6 +7705,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7722,6 +7792,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7867,6 +7938,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8286,6 +8358,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index f5f538b76fc84..c44009d33c0fc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -609,6 +609,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -870,6 +871,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1140,6 +1142,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1155,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1263,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1688,6 +1693,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1779,6 +1785,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1950,6 +1957,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2124,6 +2132,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2333,6 +2342,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2343,6 +2353,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2360,6 +2376,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2382,6 +2399,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2477,6 +2495,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2649,6 +2668,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2749,6 +2769,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2866,6 +2887,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3004,6 +3026,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3034,6 +3057,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3115,6 +3139,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3283,16 +3308,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3489,6 +3517,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3507,6 +3536,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3539,6 +3569,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3668,6 +3699,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3808,6 +3840,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_1_4";
@@ -3928,6 +3961,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4097,6 +4131,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4468,6 +4503,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4614,6 +4650,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4788,6 +4825,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4795,6 +4833,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4833,6 +4873,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4910,11 +4951,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4929,6 +4972,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5313,6 +5357,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5427,6 +5472,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5485,6 +5531,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_2";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5529,6 +5576,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5779,6 +5827,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6151,6 +6200,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_5";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6161,6 +6211,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6248,6 +6299,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6373,6 +6425,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6456,6 +6509,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6473,6 +6527,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6573,6 +6628,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6794,6 +6850,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7575,6 +7632,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7802,6 +7860,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7888,6 +7947,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8037,6 +8097,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8475,6 +8536,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 6ebc3598ad03b..32cd18e64e3e2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -603,6 +603,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -862,6 +863,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1129,6 +1131,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1141,6 +1144,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1248,6 +1252,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1428,6 +1433,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1663,6 +1669,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1750,6 +1757,8 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
   "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
@@ -1822,6 +1831,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1915,6 +1925,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2084,6 +2095,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2289,6 +2301,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2299,6 +2312,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2316,6 +2335,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2338,6 +2358,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2433,6 +2454,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2514,6 +2536,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2596,6 +2619,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2694,6 +2718,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2776,6 +2801,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2808,6 +2834,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2944,6 +2971,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2973,6 +3001,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3053,6 +3082,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3220,16 +3250,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3421,6 +3454,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3439,6 +3473,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3471,6 +3506,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3597,6 +3633,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3668,6 +3705,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3735,6 +3773,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3852,6 +3891,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4009,6 +4049,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4017,6 +4058,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4378,6 +4420,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4521,6 +4564,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4694,12 +4738,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4736,6 +4783,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4812,11 +4860,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4830,6 +4880,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5206,6 +5257,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5319,6 +5371,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5374,6 +5427,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5417,6 +5471,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5663,6 +5718,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6022,6 +6078,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6032,6 +6089,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6114,6 +6172,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6177,6 +6236,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6198,6 +6258,7 @@ self: super: {
   "pure-priority-queue" = dontDistribute super."pure-priority-queue";
   "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
   "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6234,6 +6295,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6315,6 +6377,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6332,6 +6395,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6429,6 +6493,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6487,6 +6552,7 @@ self: super: {
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6624,6 +6690,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6647,6 +6714,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7274,6 +7342,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7405,6 +7474,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7628,6 +7698,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7714,6 +7785,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7859,6 +7931,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8108,6 +8181,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
@@ -8276,6 +8350,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 40d9bdc82a178..d1ff009a56a32 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -603,6 +603,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -862,6 +863,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1129,6 +1131,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1141,6 +1144,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1248,6 +1252,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1428,6 +1433,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1662,6 +1668,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1749,6 +1756,8 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
   "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
@@ -1821,6 +1830,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1914,6 +1924,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2081,6 +2092,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2286,6 +2298,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2296,6 +2309,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2313,6 +2332,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2335,6 +2355,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2430,6 +2451,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2511,6 +2533,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2593,6 +2616,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2691,6 +2715,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2773,6 +2798,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2805,6 +2831,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2939,6 +2966,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2968,6 +2996,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3048,6 +3077,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3215,16 +3245,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3416,6 +3449,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3434,6 +3468,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3466,6 +3501,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3592,6 +3628,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3662,6 +3699,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3729,6 +3767,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3846,6 +3885,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4003,6 +4043,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4011,6 +4052,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4372,6 +4414,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4513,6 +4556,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4686,12 +4730,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4728,6 +4775,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4804,11 +4852,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4822,6 +4872,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5198,6 +5249,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5311,6 +5363,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5365,6 +5418,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5408,6 +5462,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5654,6 +5709,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6011,6 +6067,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6021,6 +6078,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6103,6 +6161,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6166,6 +6225,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6187,6 +6247,7 @@ self: super: {
   "pure-priority-queue" = dontDistribute super."pure-priority-queue";
   "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
   "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6223,6 +6284,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6304,6 +6366,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6321,6 +6384,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6417,6 +6481,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6474,6 +6539,7 @@ self: super: {
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6610,6 +6676,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6633,6 +6700,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7251,6 +7319,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7382,6 +7451,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7604,6 +7674,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7690,6 +7761,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7835,6 +7907,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8079,6 +8152,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
@@ -8247,6 +8321,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index a4f288d71cf7f..b4f37b347aaa3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -603,6 +603,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -862,6 +863,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1129,6 +1131,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1141,6 +1144,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1248,6 +1252,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1428,6 +1433,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1662,6 +1668,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1749,6 +1756,8 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
   "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
@@ -1821,6 +1830,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1914,6 +1924,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2081,6 +2092,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2286,6 +2298,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2296,6 +2309,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2313,6 +2332,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2335,6 +2355,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2430,6 +2451,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2511,6 +2533,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2593,6 +2616,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2691,6 +2715,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2773,6 +2798,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2805,6 +2831,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2937,6 +2964,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2966,6 +2994,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3046,6 +3075,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3213,16 +3243,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3414,6 +3447,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3432,6 +3466,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3464,6 +3499,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3590,6 +3626,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3660,6 +3697,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3727,6 +3765,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3844,6 +3883,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4000,6 +4040,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4008,6 +4049,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4369,6 +4411,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4509,6 +4552,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4680,12 +4724,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4722,6 +4769,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4798,11 +4846,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4816,6 +4866,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5192,6 +5243,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5305,6 +5357,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5359,6 +5412,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5402,6 +5456,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5648,6 +5703,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6005,6 +6061,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6015,6 +6072,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6097,6 +6155,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6160,6 +6219,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6181,6 +6241,7 @@ self: super: {
   "pure-priority-queue" = dontDistribute super."pure-priority-queue";
   "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
   "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6217,6 +6278,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6298,6 +6360,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6315,6 +6378,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6411,6 +6475,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6468,6 +6533,7 @@ self: super: {
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6604,6 +6670,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6627,6 +6694,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7245,6 +7313,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7376,6 +7445,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7598,6 +7668,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7684,6 +7755,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7829,6 +7901,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8073,6 +8146,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "xml-conduit-parse" = dontDistribute super."xml-conduit-parse";
   "xml-conduit-writer" = dontDistribute super."xml-conduit-writer";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
@@ -8240,6 +8314,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 7637c65cdad49..e7f095bac2d53 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -609,6 +609,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -870,6 +871,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1140,6 +1142,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1155,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1263,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1687,6 +1692,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1778,6 +1784,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1949,6 +1956,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2123,6 +2131,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2330,6 +2339,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2340,6 +2350,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2357,6 +2373,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2379,6 +2396,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2474,6 +2492,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2646,6 +2665,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2746,6 +2766,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2863,6 +2884,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3000,6 +3022,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3030,6 +3053,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3111,6 +3135,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3279,16 +3304,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3485,6 +3513,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3503,6 +3532,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3535,6 +3565,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3664,6 +3695,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3804,6 +3836,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_1_4";
@@ -3924,6 +3957,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4084,6 +4118,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4092,6 +4127,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4462,6 +4498,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4608,6 +4645,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4782,6 +4820,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4789,6 +4828,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4827,6 +4868,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4904,11 +4946,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4923,6 +4967,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5307,6 +5352,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5421,6 +5467,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5479,6 +5526,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_2";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5523,6 +5571,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5773,6 +5822,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6145,6 +6195,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_5";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6155,6 +6206,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6242,6 +6294,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6367,6 +6420,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6450,6 +6504,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6467,6 +6522,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6566,6 +6622,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6787,6 +6844,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7566,6 +7624,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7793,6 +7852,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7879,6 +7939,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8027,6 +8088,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8464,6 +8526,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 970d4c2622a8e..be89c0d27b1d7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -609,6 +609,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -870,6 +871,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1140,6 +1142,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1155,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1263,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1687,6 +1692,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1778,6 +1784,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1949,6 +1956,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2123,6 +2131,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2330,6 +2339,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2340,6 +2350,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2357,6 +2373,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2379,6 +2396,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2474,6 +2492,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2646,6 +2665,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2746,6 +2766,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2863,6 +2884,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -3000,6 +3022,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3030,6 +3053,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3111,6 +3135,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3279,16 +3304,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3485,6 +3513,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3503,6 +3532,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3535,6 +3565,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3664,6 +3695,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3804,6 +3836,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_1_4";
@@ -3924,6 +3957,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4084,6 +4118,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4092,6 +4127,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4462,6 +4498,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4608,6 +4645,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4782,6 +4820,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4789,6 +4828,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4827,6 +4868,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4904,11 +4946,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4923,6 +4967,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5307,6 +5352,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5421,6 +5467,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5479,6 +5526,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_2";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5523,6 +5571,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5773,6 +5822,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6145,6 +6195,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_5";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6155,6 +6206,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6242,6 +6294,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6367,6 +6420,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6450,6 +6504,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6467,6 +6522,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6566,6 +6622,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6762,6 +6819,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6786,6 +6844,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7564,6 +7623,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7791,6 +7851,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7877,6 +7938,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8025,6 +8087,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8461,6 +8524,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 3c37a041e3232..08e7d4607c1f6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -609,6 +609,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -870,6 +871,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1140,6 +1142,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1155,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1263,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1686,6 +1691,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1777,6 +1783,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1851,6 +1858,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1947,6 +1955,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2121,6 +2130,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2328,6 +2338,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2338,6 +2349,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2355,6 +2372,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2377,6 +2395,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2472,6 +2491,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2644,6 +2664,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2744,6 +2765,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2861,6 +2883,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2997,6 +3020,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3027,6 +3051,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3108,6 +3133,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3276,16 +3302,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3482,6 +3511,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3500,6 +3530,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3532,6 +3563,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3661,6 +3693,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3801,6 +3834,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3920,6 +3954,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4079,6 +4114,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4087,6 +4123,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4456,6 +4493,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4600,6 +4638,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4774,6 +4813,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4781,6 +4821,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4819,6 +4861,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4896,11 +4939,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4915,6 +4960,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5299,6 +5345,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5413,6 +5460,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5471,6 +5519,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_2";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5515,6 +5564,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5764,6 +5814,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6134,6 +6185,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_6";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6144,6 +6196,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6230,6 +6283,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6355,6 +6409,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6438,6 +6493,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6455,6 +6511,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6554,6 +6611,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6750,6 +6808,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6774,6 +6833,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7549,6 +7609,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7776,6 +7837,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7862,6 +7924,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8010,6 +8073,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8443,6 +8507,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 67e398551d15c..75234059ec30e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -609,6 +609,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -870,6 +871,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1140,6 +1142,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1155,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1263,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1686,6 +1691,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1777,6 +1783,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1851,6 +1858,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1947,6 +1955,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2121,6 +2130,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2328,6 +2338,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2338,6 +2349,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2355,6 +2372,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2377,6 +2395,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2472,6 +2491,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2644,6 +2664,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2744,6 +2765,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2861,6 +2883,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2997,6 +3020,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3027,6 +3051,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3107,6 +3132,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3275,16 +3301,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3479,6 +3508,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3497,6 +3527,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3529,6 +3560,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3658,6 +3690,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3798,6 +3831,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3917,6 +3951,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4076,6 +4111,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4084,6 +4120,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4453,6 +4490,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4597,6 +4635,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4771,6 +4810,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4778,6 +4818,8 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4815,6 +4857,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4891,11 +4934,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4910,6 +4955,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5293,6 +5339,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5407,6 +5454,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5465,6 +5513,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5508,6 +5557,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5757,6 +5807,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6126,6 +6177,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_6";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6136,6 +6188,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6222,6 +6275,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6347,6 +6401,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6430,6 +6485,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6447,6 +6503,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6546,6 +6603,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6742,6 +6800,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6766,6 +6825,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7541,6 +7601,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7767,6 +7828,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7853,6 +7915,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8001,6 +8064,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8432,6 +8496,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 128ce65ac51f0..01f7fab0ca152 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -609,6 +609,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -870,6 +871,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1140,6 +1142,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1155,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1263,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1683,6 +1688,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1774,6 +1780,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1848,6 +1855,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1944,6 +1952,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2118,6 +2127,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2324,6 +2334,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2334,6 +2345,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2351,6 +2368,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2373,6 +2391,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2468,6 +2487,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2556,6 +2576,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2639,6 +2660,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2739,6 +2761,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2856,6 +2879,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2992,6 +3016,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3022,6 +3047,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3102,6 +3128,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3270,16 +3297,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3474,6 +3504,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3492,6 +3523,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3524,6 +3556,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3653,6 +3686,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3793,6 +3827,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3911,6 +3946,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4070,6 +4106,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4078,6 +4115,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4447,6 +4485,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4591,6 +4630,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4765,12 +4805,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4808,6 +4851,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4884,11 +4928,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4903,6 +4949,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5286,6 +5333,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5400,6 +5448,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5458,6 +5507,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5501,6 +5551,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5750,6 +5801,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6118,6 +6170,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6128,6 +6181,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6213,6 +6267,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6279,6 +6334,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6337,6 +6393,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6419,6 +6476,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6436,6 +6494,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6535,6 +6594,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6731,6 +6791,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6755,6 +6816,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7528,6 +7590,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7753,6 +7816,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7839,6 +7903,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7987,6 +8052,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8416,6 +8482,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 40455e3d2f8d9..6d7df9e59a9a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -609,6 +609,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -870,6 +871,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1140,6 +1142,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1155,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1263,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1681,6 +1686,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1772,6 +1778,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1846,6 +1853,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1941,6 +1949,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2115,6 +2124,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2321,6 +2331,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2331,6 +2342,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2348,6 +2365,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2370,6 +2388,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2465,6 +2484,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2548,6 +2568,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2631,6 +2652,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2731,6 +2753,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2848,6 +2871,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2984,6 +3008,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3014,6 +3039,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3094,6 +3120,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3262,16 +3289,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3466,6 +3496,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3484,6 +3515,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3516,6 +3548,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3645,6 +3678,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3785,6 +3819,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3903,6 +3938,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4062,6 +4098,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4070,6 +4107,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4439,6 +4477,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4583,6 +4622,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4757,12 +4797,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4800,6 +4843,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4876,11 +4920,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4895,6 +4941,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5277,6 +5324,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5390,6 +5438,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5448,6 +5497,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5491,6 +5541,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5740,6 +5791,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6108,6 +6160,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6118,6 +6171,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6202,6 +6256,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6267,6 +6322,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6325,6 +6381,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6406,6 +6463,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6423,6 +6481,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6522,6 +6581,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6718,6 +6778,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6742,6 +6803,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7514,6 +7576,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7739,6 +7802,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7825,6 +7889,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7973,6 +8038,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8402,6 +8468,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 142bdfbec0435..6286cdf3a4295 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -608,6 +608,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -868,6 +869,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1138,6 +1140,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1150,6 +1153,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1257,6 +1261,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1678,6 +1683,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1769,6 +1775,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -1843,6 +1850,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1938,6 +1946,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2112,6 +2121,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2318,6 +2328,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2328,6 +2339,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2345,6 +2362,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2367,6 +2385,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2462,6 +2481,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2545,6 +2565,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2628,6 +2649,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2727,6 +2749,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2844,6 +2867,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2980,6 +3004,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -3009,6 +3034,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3089,6 +3115,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3257,16 +3284,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3461,6 +3491,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3479,6 +3510,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3511,6 +3543,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3640,6 +3673,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3780,6 +3814,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3898,6 +3933,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -4057,6 +4093,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4065,6 +4102,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4434,6 +4472,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4578,6 +4617,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4752,12 +4792,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4795,6 +4838,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4871,11 +4915,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4890,6 +4936,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5272,6 +5319,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5385,6 +5433,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5443,6 +5492,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5486,6 +5536,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5735,6 +5786,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6102,6 +6154,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6112,6 +6165,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -6196,6 +6250,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6261,6 +6316,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6319,6 +6375,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6400,6 +6457,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6417,6 +6475,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6516,6 +6575,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6712,6 +6772,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6736,6 +6797,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7508,6 +7570,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7733,6 +7796,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7819,6 +7883,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -7967,6 +8032,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8396,6 +8462,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index 6076099d26994..a11e485c3f10c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -587,6 +587,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -843,6 +844,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1101,6 +1103,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1113,6 +1116,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = doDistribute super."airship_0_4_1_0";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1157,6 +1161,7 @@ self: super: {
   "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
   "amazon-products" = dontDistribute super."amazon-products";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1197,6 +1202,7 @@ self: super: {
   "applicative-numbers" = dontDistribute super."applicative-numbers";
   "applicative-parsec" = dontDistribute super."applicative-parsec";
   "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
   "apportionment" = dontDistribute super."apportionment";
   "approx-rand-test" = dontDistribute super."approx-rand-test";
   "approximate-equality" = dontDistribute super."approximate-equality";
@@ -1331,6 +1337,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1418,6 +1425,7 @@ self: super: {
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
   "binary-orphans" = doDistribute super."binary-orphans_0_1_3_0";
+  "binary-parser" = doDistribute super."binary-parser_0_5_0_1";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
   "binary-search" = doDistribute super."binary-search_0_1";
@@ -1552,6 +1560,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
   "bot" = dontDistribute super."bot";
@@ -1636,6 +1645,8 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = doDistribute super."cabal-helper_0_6_2_0";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
   "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
@@ -1705,6 +1716,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = doDistribute super."carray_0_1_6_2";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1795,6 +1807,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1950,6 +1963,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2147,6 +2161,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2157,6 +2172,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2174,6 +2195,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2196,6 +2218,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2287,6 +2310,7 @@ self: super: {
   "delta-h" = dontDistribute super."delta-h";
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
+  "dependent-state" = dontDistribute super."dependent-state";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
   "dequeue" = dontDistribute super."dequeue";
@@ -2361,6 +2385,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2439,6 +2464,7 @@ self: super: {
   "dpkg" = dontDistribute super."dpkg";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2532,6 +2558,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = doDistribute super."elm-bridge_0_1_0_0";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2613,6 +2640,7 @@ self: super: {
   "estimators" = dontDistribute super."estimators";
   "estreps" = dontDistribute super."estreps";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2643,6 +2671,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2689,6 +2718,7 @@ self: super: {
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
   "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fasta" = doDistribute super."fasta_0_10_1_0";
   "fastbayes" = dontDistribute super."fastbayes";
   "fastcgi" = dontDistribute super."fastcgi";
   "fastedit" = dontDistribute super."fastedit";
@@ -2770,6 +2800,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2800,6 +2831,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -2877,6 +2909,7 @@ self: super: {
   "friday-juicypixels" = dontDistribute super."friday-juicypixels";
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -2958,6 +2991,7 @@ self: super: {
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
   "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
   "generic-maybe" = dontDistribute super."generic-maybe";
   "generic-pretty" = dontDistribute super."generic-pretty";
@@ -3037,16 +3071,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3232,6 +3269,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3250,6 +3288,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3281,6 +3320,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3404,6 +3444,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3470,6 +3511,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3534,6 +3576,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = dontDistribute super."haskell-names";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3648,6 +3691,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -3801,6 +3845,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -3809,6 +3854,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-irr" = dontDistribute super."hledger-irr";
@@ -3817,6 +3863,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_26";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -4142,6 +4189,7 @@ self: super: {
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4223,6 +4271,7 @@ self: super: {
   "hypher" = dontDistribute super."hypher";
   "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
+  "hzulip" = doDistribute super."hzulip_1_1_1_2";
   "i18n" = dontDistribute super."i18n";
   "iCalendar" = dontDistribute super."iCalendar";
   "iException" = dontDistribute super."iException";
@@ -4273,6 +4322,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4433,12 +4483,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4475,6 +4528,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4559,11 +4613,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4578,6 +4634,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4939,6 +4996,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5031,6 +5089,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5047,6 +5106,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5097,6 +5157,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5140,6 +5201,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5372,6 +5434,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -5702,6 +5765,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -5712,6 +5776,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -5791,6 +5856,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -5848,9 +5914,11 @@ self: super: {
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -5872,6 +5940,7 @@ self: super: {
   "pure-priority-queue" = dontDistribute super."pure-priority-queue";
   "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
   "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -5906,6 +5975,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -5985,6 +6055,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -6001,6 +6072,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6088,6 +6160,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6126,7 +6199,9 @@ self: super: {
   "resource-simple" = dontDistribute super."resource-simple";
   "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6136,6 +6211,7 @@ self: super: {
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_7_0_1";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6267,6 +6343,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6290,6 +6367,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -6336,6 +6414,7 @@ self: super: {
   "semi-iso" = dontDistribute super."semi-iso";
   "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups" = doDistribute super."semigroups_0_18_0_1";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
   "semiring" = dontDistribute super."semiring";
   "semiring-simple" = dontDistribute super."semiring-simple";
@@ -6756,6 +6835,7 @@ self: super: {
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
   "strict-concurrency" = dontDistribute super."strict-concurrency";
   "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
   "strict-identity" = dontDistribute super."strict-identity";
@@ -6786,6 +6866,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_4";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -6793,6 +6874,7 @@ self: super: {
   "subnet" = dontDistribute super."subnet";
   "subtitleParser" = dontDistribute super."subtitleParser";
   "subtitles" = dontDistribute super."subtitles";
+  "success" = doDistribute super."success_0_2_4";
   "suffixarray" = dontDistribute super."suffixarray";
   "suffixtree" = dontDistribute super."suffixtree";
   "sugarhaskell" = dontDistribute super."sugarhaskell";
@@ -6876,6 +6958,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -6998,6 +7081,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7165,6 +7249,7 @@ self: super: {
   "tsparse" = dontDistribute super."tsparse";
   "tst" = dontDistribute super."tst";
   "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
   "tubes" = dontDistribute super."tubes";
   "tuntap" = dontDistribute super."tuntap";
   "tup-functor" = dontDistribute super."tup-functor";
@@ -7211,6 +7296,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7292,6 +7378,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "uniform-io" = dontDistribute super."uniform-io";
@@ -7423,6 +7510,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -7646,6 +7734,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
@@ -7757,6 +7846,7 @@ self: super: {
   "yesod-lucid" = dontDistribute super."yesod-lucid";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
@@ -7776,6 +7866,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
@@ -7801,6 +7892,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 516164aa9eeee..33013dc368a34 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -587,6 +587,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -843,6 +844,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1100,6 +1102,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1112,6 +1115,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = doDistribute super."airship_0_4_2_0";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1155,6 +1159,7 @@ self: super: {
   "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
   "amazon-products" = dontDistribute super."amazon-products";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1195,6 +1200,7 @@ self: super: {
   "applicative-numbers" = dontDistribute super."applicative-numbers";
   "applicative-parsec" = dontDistribute super."applicative-parsec";
   "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
   "apportionment" = dontDistribute super."apportionment";
   "approx-rand-test" = dontDistribute super."approx-rand-test";
   "approximate-equality" = dontDistribute super."approximate-equality";
@@ -1329,6 +1335,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1416,6 +1423,7 @@ self: super: {
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
   "binary-orphans" = doDistribute super."binary-orphans_0_1_3_0";
+  "binary-parser" = doDistribute super."binary-parser_0_5_0_1";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
   "binary-search" = doDistribute super."binary-search_0_1";
@@ -1550,6 +1558,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
   "bot" = dontDistribute super."bot";
@@ -1634,6 +1643,8 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = doDistribute super."cabal-helper_0_6_2_0";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
   "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
@@ -1703,6 +1714,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = doDistribute super."carray_0_1_6_2";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1793,6 +1805,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1948,6 +1961,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2145,6 +2159,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2155,6 +2170,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2172,6 +2193,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2194,6 +2216,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2285,6 +2308,7 @@ self: super: {
   "delta-h" = dontDistribute super."delta-h";
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
+  "dependent-state" = dontDistribute super."dependent-state";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
   "dequeue" = dontDistribute super."dequeue";
@@ -2359,6 +2383,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2437,6 +2462,7 @@ self: super: {
   "dpkg" = dontDistribute super."dpkg";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2529,6 +2555,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = doDistribute super."elm-bridge_0_1_0_0";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2609,6 +2636,7 @@ self: super: {
   "estimators" = dontDistribute super."estimators";
   "estreps" = dontDistribute super."estreps";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2639,6 +2667,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2684,6 +2713,7 @@ self: super: {
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
   "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fasta" = doDistribute super."fasta_0_10_1_0";
   "fastbayes" = dontDistribute super."fastbayes";
   "fastcgi" = dontDistribute super."fastcgi";
   "fastedit" = dontDistribute super."fastedit";
@@ -2764,6 +2794,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2794,6 +2825,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -2871,6 +2903,7 @@ self: super: {
   "friday-juicypixels" = dontDistribute super."friday-juicypixels";
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -2952,6 +2985,7 @@ self: super: {
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
   "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
   "generic-maybe" = dontDistribute super."generic-maybe";
   "generic-pretty" = dontDistribute super."generic-pretty";
@@ -3031,16 +3065,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3226,6 +3263,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3244,6 +3282,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3275,6 +3314,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3398,6 +3438,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3464,6 +3505,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3528,6 +3570,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = dontDistribute super."haskell-names";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3642,6 +3685,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -3794,6 +3838,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -3802,6 +3847,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-irr" = dontDistribute super."hledger-irr";
@@ -3810,6 +3856,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_26";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -4135,6 +4182,7 @@ self: super: {
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4216,6 +4264,7 @@ self: super: {
   "hypher" = dontDistribute super."hypher";
   "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
+  "hzulip" = doDistribute super."hzulip_1_1_1_2";
   "i18n" = dontDistribute super."i18n";
   "iCalendar" = dontDistribute super."iCalendar";
   "iException" = dontDistribute super."iException";
@@ -4263,6 +4312,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4421,12 +4471,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4463,6 +4516,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4547,11 +4601,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4566,6 +4622,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4924,6 +4981,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5016,6 +5074,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5032,6 +5091,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5082,6 +5142,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5125,6 +5186,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5357,6 +5419,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -5685,6 +5748,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -5695,6 +5759,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -5774,6 +5839,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -5831,9 +5897,11 @@ self: super: {
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -5855,6 +5923,7 @@ self: super: {
   "pure-priority-queue" = dontDistribute super."pure-priority-queue";
   "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
   "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -5889,6 +5958,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -5968,6 +6038,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -5984,6 +6055,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6070,6 +6142,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6108,7 +6181,9 @@ self: super: {
   "resource-simple" = dontDistribute super."resource-simple";
   "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6118,6 +6193,7 @@ self: super: {
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_7_0_1";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6249,6 +6325,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6272,6 +6349,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -6318,6 +6396,7 @@ self: super: {
   "semi-iso" = dontDistribute super."semi-iso";
   "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups" = doDistribute super."semigroups_0_18_0_1";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
   "semiring" = dontDistribute super."semiring";
   "semiring-simple" = dontDistribute super."semiring-simple";
@@ -6738,6 +6817,7 @@ self: super: {
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
   "strict-concurrency" = dontDistribute super."strict-concurrency";
   "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
   "strict-identity" = dontDistribute super."strict-identity";
@@ -6768,6 +6848,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_4";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -6775,6 +6856,7 @@ self: super: {
   "subnet" = dontDistribute super."subnet";
   "subtitleParser" = dontDistribute super."subtitleParser";
   "subtitles" = dontDistribute super."subtitles";
+  "success" = doDistribute super."success_0_2_4";
   "suffixarray" = dontDistribute super."suffixarray";
   "suffixtree" = dontDistribute super."suffixtree";
   "sugarhaskell" = dontDistribute super."sugarhaskell";
@@ -6858,6 +6940,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -6980,6 +7063,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7147,6 +7231,7 @@ self: super: {
   "tsparse" = dontDistribute super."tsparse";
   "tst" = dontDistribute super."tst";
   "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
   "tubes" = dontDistribute super."tubes";
   "tuntap" = dontDistribute super."tuntap";
   "tup-functor" = dontDistribute super."tup-functor";
@@ -7192,6 +7277,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7273,6 +7359,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "uniform-io" = dontDistribute super."uniform-io";
@@ -7404,6 +7491,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -7626,6 +7714,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
@@ -7737,6 +7826,7 @@ self: super: {
   "yesod-lucid" = dontDistribute super."yesod-lucid";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
@@ -7756,6 +7846,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
@@ -7781,6 +7872,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index fb60f2f5ac571..05a347b4c9646 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -585,6 +585,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -840,6 +841,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1096,6 +1098,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1107,6 +1110,7 @@ self: super: {
   "air-th" = dontDistribute super."air-th";
   "airbrake" = dontDistribute super."airbrake";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1150,6 +1154,7 @@ self: super: {
   "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
   "amazon-products" = dontDistribute super."amazon-products";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1190,6 +1195,7 @@ self: super: {
   "applicative-numbers" = dontDistribute super."applicative-numbers";
   "applicative-parsec" = dontDistribute super."applicative-parsec";
   "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
   "apportionment" = dontDistribute super."apportionment";
   "approx-rand-test" = dontDistribute super."approx-rand-test";
   "approximate-equality" = dontDistribute super."approximate-equality";
@@ -1324,6 +1330,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1411,6 +1418,7 @@ self: super: {
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
   "binary-orphans" = doDistribute super."binary-orphans_0_1_3_0";
+  "binary-parser" = doDistribute super."binary-parser_0_5_0_1";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
   "binary-search" = doDistribute super."binary-search_0_1";
@@ -1545,6 +1553,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
   "bot" = dontDistribute super."bot";
@@ -1587,6 +1596,7 @@ self: super: {
   "buster" = dontDistribute super."buster";
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
+  "bustle" = doDistribute super."bustle_0_5_3";
   "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
@@ -1627,6 +1637,8 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = doDistribute super."cabal-helper_0_6_3_0";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
   "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
@@ -1694,6 +1706,7 @@ self: super: {
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1783,6 +1796,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1797,7 +1811,12 @@ self: super: {
   "clanki" = dontDistribute super."clanki";
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
+  "clash-ghc" = doDistribute super."clash-ghc_0_6_8";
+  "clash-lib" = doDistribute super."clash-lib_0_6_8";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_4";
+  "clash-verilog" = doDistribute super."clash-verilog_0_6_4";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_5";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1930,6 +1949,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2127,6 +2147,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2137,6 +2158,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2154,6 +2181,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2176,6 +2204,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2266,6 +2295,7 @@ self: super: {
   "delta-h" = dontDistribute super."delta-h";
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
+  "dependent-state" = dontDistribute super."dependent-state";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
   "dequeue" = dontDistribute super."dequeue";
@@ -2337,6 +2367,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2415,6 +2446,7 @@ self: super: {
   "dpkg" = dontDistribute super."dpkg";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2506,6 +2538,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = doDistribute super."elm-bridge_0_1_0_0";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2585,6 +2618,7 @@ self: super: {
   "estimators" = dontDistribute super."estimators";
   "estreps" = dontDistribute super."estreps";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2614,6 +2648,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2658,6 +2693,7 @@ self: super: {
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
   "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fasta" = doDistribute super."fasta_0_10_1_0";
   "fastbayes" = dontDistribute super."fastbayes";
   "fastcgi" = dontDistribute super."fastcgi";
   "fastedit" = dontDistribute super."fastedit";
@@ -2737,6 +2773,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2767,6 +2804,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -2843,6 +2881,7 @@ self: super: {
   "friday-juicypixels" = dontDistribute super."friday-juicypixels";
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -2924,6 +2963,7 @@ self: super: {
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
   "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
   "generic-maybe" = dontDistribute super."generic-maybe";
   "generic-pretty" = dontDistribute super."generic-pretty";
@@ -3002,16 +3042,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -3196,6 +3239,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3214,6 +3258,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3245,6 +3290,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3367,6 +3413,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3431,6 +3478,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3493,6 +3541,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = dontDistribute super."haskell-names";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3606,6 +3655,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -3756,6 +3806,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -3764,6 +3815,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-irr" = dontDistribute super."hledger-irr";
@@ -3771,6 +3823,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_26";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -4092,6 +4145,7 @@ self: super: {
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4173,6 +4227,7 @@ self: super: {
   "hypher" = dontDistribute super."hypher";
   "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
+  "hzulip" = doDistribute super."hzulip_1_1_1_2";
   "i18n" = dontDistribute super."i18n";
   "iCalendar" = dontDistribute super."iCalendar";
   "iException" = dontDistribute super."iException";
@@ -4219,6 +4274,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4374,12 +4430,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4416,6 +4475,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4500,11 +4560,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4519,6 +4581,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4874,6 +4937,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -4960,11 +5024,13 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_5";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -4981,11 +5047,13 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-logger" = doDistribute super."monad-logger_0_3_17";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5028,6 +5096,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5071,6 +5140,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5302,6 +5372,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -5630,6 +5701,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -5640,6 +5712,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -5716,6 +5789,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -5773,9 +5847,11 @@ self: super: {
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -5797,6 +5873,7 @@ self: super: {
   "pure-priority-queue" = dontDistribute super."pure-priority-queue";
   "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
   "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -5831,6 +5908,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -5910,6 +5988,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -5925,6 +6004,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -6011,6 +6091,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6048,7 +6129,9 @@ self: super: {
   "resource-simple" = dontDistribute super."resource-simple";
   "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6056,6 +6139,7 @@ self: super: {
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6187,6 +6271,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6210,6 +6295,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -6255,6 +6341,7 @@ self: super: {
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups" = doDistribute super."semigroups_0_18_0_1";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
   "semiring" = dontDistribute super."semiring";
   "semiring-simple" = dontDistribute super."semiring-simple";
@@ -6669,6 +6756,7 @@ self: super: {
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
   "strict-concurrency" = dontDistribute super."strict-concurrency";
   "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
   "strict-identity" = dontDistribute super."strict-identity";
@@ -6699,6 +6787,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_4";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -6706,6 +6795,7 @@ self: super: {
   "subnet" = dontDistribute super."subnet";
   "subtitleParser" = dontDistribute super."subtitleParser";
   "subtitles" = dontDistribute super."subtitles";
+  "success" = doDistribute super."success_0_2_4";
   "suffixarray" = dontDistribute super."suffixarray";
   "suffixtree" = dontDistribute super."suffixtree";
   "sugarhaskell" = dontDistribute super."sugarhaskell";
@@ -6789,6 +6879,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -6909,6 +7000,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -7076,6 +7168,7 @@ self: super: {
   "tsparse" = dontDistribute super."tsparse";
   "tst" = dontDistribute super."tst";
   "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
   "tubes" = dontDistribute super."tubes";
   "tuntap" = dontDistribute super."tuntap";
   "tup-functor" = dontDistribute super."tup-functor";
@@ -7121,6 +7214,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7202,6 +7296,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "uniform-io" = dontDistribute super."uniform-io";
@@ -7333,6 +7428,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -7551,6 +7647,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
@@ -7661,6 +7758,7 @@ self: super: {
   "yesod-lucid" = dontDistribute super."yesod-lucid";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
@@ -7680,6 +7778,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
@@ -7705,6 +7804,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 7941c97d177a8..7fd213cdf9fd3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -329,6 +329,7 @@ self: super: {
   "GLMatrix" = dontDistribute super."GLMatrix";
   "GLUtil" = dontDistribute super."GLUtil";
   "GPX" = dontDistribute super."GPX";
+  "GPipe" = doDistribute super."GPipe_2_1_6";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
@@ -530,6 +531,7 @@ self: super: {
   "InfixApplicative" = dontDistribute super."InfixApplicative";
   "Interpolation" = dontDistribute super."Interpolation";
   "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "IntervalMap" = doDistribute super."IntervalMap_0_5_0_0";
   "Irc" = dontDistribute super."Irc";
   "IrrHaskell" = dontDistribute super."IrrHaskell";
   "IsNull" = dontDistribute super."IsNull";
@@ -574,6 +576,7 @@ self: super: {
   "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
   "Lastik" = dontDistribute super."Lastik";
   "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
   "LazyVault" = dontDistribute super."LazyVault";
   "Level0" = dontDistribute super."Level0";
   "LibClang" = dontDistribute super."LibClang";
@@ -826,6 +829,7 @@ self: super: {
   "SimpleGL" = dontDistribute super."SimpleGL";
   "SimpleH" = dontDistribute super."SimpleH";
   "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
   "SizeCompare" = dontDistribute super."SizeCompare";
   "Slides" = dontDistribute super."Slides";
   "Smooth" = dontDistribute super."Smooth";
@@ -1079,6 +1083,7 @@ self: super: {
   "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
   "afis" = dontDistribute super."afis";
   "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
   "agda-server" = dontDistribute super."agda-server";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1090,6 +1095,7 @@ self: super: {
   "air-th" = dontDistribute super."air-th";
   "airbrake" = dontDistribute super."airbrake";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1133,6 +1139,7 @@ self: super: {
   "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
   "amazon-products" = dontDistribute super."amazon-products";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1173,6 +1180,7 @@ self: super: {
   "applicative-numbers" = dontDistribute super."applicative-numbers";
   "applicative-parsec" = dontDistribute super."applicative-parsec";
   "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
   "apportionment" = dontDistribute super."apportionment";
   "approx-rand-test" = dontDistribute super."approx-rand-test";
   "approximate-equality" = dontDistribute super."approximate-equality";
@@ -1274,6 +1282,9 @@ self: super: {
   "avahi" = dontDistribute super."avahi";
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
+  "avers" = doDistribute super."avers_0_0_13";
+  "avers-api" = doDistribute super."avers-api_0_0_1";
+  "avers-server" = doDistribute super."avers-server_0_0_1";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1302,6 +1313,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1326,6 +1338,7 @@ self: super: {
   "barrier-monad" = dontDistribute super."barrier-monad";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
+  "base-orphans" = doDistribute super."base-orphans_0_5_0";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1384,6 +1397,7 @@ self: super: {
   "binary-generic" = dontDistribute super."binary-generic";
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-parser" = doDistribute super."binary-parser_0_5_0_1";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
   "binary-shared" = dontDistribute super."binary-shared";
@@ -1516,6 +1530,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
   "bot" = dontDistribute super."bot";
@@ -1557,6 +1572,7 @@ self: super: {
   "buster" = dontDistribute super."buster";
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
+  "bustle" = doDistribute super."bustle_0_5_3";
   "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
@@ -1594,6 +1610,8 @@ self: super: {
   "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
   "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
@@ -1660,6 +1678,7 @@ self: super: {
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1746,6 +1765,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1760,7 +1780,12 @@ self: super: {
   "clanki" = dontDistribute super."clanki";
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
+  "clash-ghc" = doDistribute super."clash-ghc_0_6_8";
+  "clash-lib" = doDistribute super."clash-lib_0_6_8";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_4";
+  "clash-verilog" = doDistribute super."clash-verilog_0_6_4";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_5";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1892,6 +1917,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2060,6 +2086,7 @@ self: super: {
   "damnpacket" = dontDistribute super."damnpacket";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_2";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2082,6 +2109,7 @@ self: super: {
   "data-accessor-template" = dontDistribute super."data-accessor-template";
   "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
   "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
   "data-bword" = dontDistribute super."data-bword";
   "data-carousel" = dontDistribute super."data-carousel";
   "data-category" = dontDistribute super."data-category";
@@ -2092,6 +2120,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
   "data-dispersal" = dontDistribute super."data-dispersal";
   "data-dword" = dontDistribute super."data-dword";
   "data-easy" = dontDistribute super."data-easy";
@@ -2109,6 +2143,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
   "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
   "data-layer" = dontDistribute super."data-layer";
   "data-layout" = dontDistribute super."data-layout";
@@ -2131,6 +2166,7 @@ self: super: {
   "data-ref" = dontDistribute super."data-ref";
   "data-reify-cse" = dontDistribute super."data-reify-cse";
   "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
   "data-rev" = dontDistribute super."data-rev";
   "data-rope" = dontDistribute super."data-rope";
   "data-rtuple" = dontDistribute super."data-rtuple";
@@ -2219,6 +2255,7 @@ self: super: {
   "delta-h" = dontDistribute super."delta-h";
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
+  "dependent-state" = dontDistribute super."dependent-state";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
   "dequeue" = dontDistribute super."dequeue";
@@ -2288,6 +2325,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2362,6 +2400,7 @@ self: super: {
   "dpkg" = dontDistribute super."dpkg";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2451,6 +2490,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2516,6 +2556,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_1_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -2525,6 +2566,7 @@ self: super: {
   "estimators" = dontDistribute super."estimators";
   "estreps" = dontDistribute super."estreps";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2553,6 +2595,7 @@ self: super: {
   "exinst-bytes" = dontDistribute super."exinst-bytes";
   "exinst-deepseq" = dontDistribute super."exinst-deepseq";
   "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
   "exists" = dontDistribute super."exists";
   "exit-codes" = dontDistribute super."exit-codes";
   "exp-extended" = dontDistribute super."exp-extended";
@@ -2596,6 +2639,7 @@ self: super: {
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
   "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fasta" = doDistribute super."fasta_0_10_1_0";
   "fastbayes" = dontDistribute super."fastbayes";
   "fastcgi" = dontDistribute super."fastcgi";
   "fastedit" = dontDistribute super."fastedit";
@@ -2673,6 +2717,7 @@ self: super: {
   "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
   "fixedprec" = dontDistribute super."fixedprec";
   "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
   "fixhs" = dontDistribute super."fixhs";
   "fixplate" = dontDistribute super."fixplate";
   "fixpoint" = dontDistribute super."fixpoint";
@@ -2702,6 +2747,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -2775,6 +2821,7 @@ self: super: {
   "friday-juicypixels" = dontDistribute super."friday-juicypixels";
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -2856,6 +2903,7 @@ self: super: {
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
   "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
   "generic-maybe" = dontDistribute super."generic-maybe";
   "generic-pretty" = dontDistribute super."generic-pretty";
@@ -2910,6 +2958,7 @@ self: super: {
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_4";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -2928,16 +2977,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
   "gi-soup" = dontDistribute super."gi-soup";
   "gi-vte" = dontDistribute super."gi-vte";
   "gi-webkit" = dontDistribute super."gi-webkit";
   "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
@@ -2958,6 +3010,7 @@ self: super: {
   "gitHUD" = dontDistribute super."gitHUD";
   "gitcache" = dontDistribute super."gitcache";
   "gitdo" = dontDistribute super."gitdo";
+  "github" = doDistribute super."github_0_14_0";
   "github-backup" = dontDistribute super."github-backup";
   "github-post-receive" = dontDistribute super."github-post-receive";
   "github-utils" = dontDistribute super."github-utils";
@@ -3119,6 +3172,7 @@ self: super: {
   "gopherbot" = dontDistribute super."gopherbot";
   "gore-and-ash" = dontDistribute super."gore-and-ash";
   "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
   "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
   "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3137,6 +3191,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3167,6 +3222,7 @@ self: super: {
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
   "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
   "grid" = dontDistribute super."grid";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3224,6 +3280,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_1";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
   "hR" = dontDistribute super."hR";
@@ -3286,6 +3343,7 @@ self: super: {
   "haeredes" = dontDistribute super."haeredes";
   "haggis" = dontDistribute super."haggis";
   "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
   "haiji" = dontDistribute super."haiji";
   "hailgun" = dontDistribute super."hailgun";
   "hailgun-send" = dontDistribute super."hailgun-send";
@@ -3350,6 +3408,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3412,6 +3471,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = dontDistribute super."haskell-names";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -3484,6 +3544,7 @@ self: super: {
   "hasloGUI" = dontDistribute super."hasloGUI";
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_19_3_3";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = dontDistribute super."hasql-postgres";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -3524,6 +3585,7 @@ self: super: {
   "hcheat" = dontDistribute super."hcheat";
   "hchesslib" = dontDistribute super."hchesslib";
   "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
   "hcron" = dontDistribute super."hcron";
   "hcube" = dontDistribute super."hcube";
   "hcwiid" = dontDistribute super."hcwiid";
@@ -3674,6 +3736,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -3682,6 +3745,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-irr" = dontDistribute super."hledger-irr";
@@ -3689,6 +3753,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_26";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -4006,6 +4071,7 @@ self: super: {
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4084,6 +4150,7 @@ self: super: {
   "hypher" = dontDistribute super."hypher";
   "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
+  "hzulip" = doDistribute super."hzulip_1_1_1_2";
   "i18n" = dontDistribute super."i18n";
   "iCalendar" = dontDistribute super."iCalendar";
   "iException" = dontDistribute super."iException";
@@ -4130,6 +4197,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "implicit-params" = dontDistribute super."implicit-params";
   "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
@@ -4282,12 +4350,15 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4323,6 +4394,7 @@ self: super: {
   "karakuri" = dontDistribute super."karakuri";
   "karver" = dontDistribute super."karver";
   "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
   "kbq-gu" = dontDistribute super."kbq-gu";
   "kd-tree" = dontDistribute super."kd-tree";
   "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
@@ -4406,11 +4478,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "lambdacube-core" = dontDistribute super."lambdacube-core";
   "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
   "lambdacube-engine" = dontDistribute super."lambdacube-engine";
   "lambdacube-examples" = dontDistribute super."lambdacube-examples";
   "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4425,6 +4499,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4777,6 +4852,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -4852,11 +4928,13 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_5";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -4873,11 +4951,13 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-logger" = doDistribute super."monad-logger_0_3_17";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -4919,6 +4999,7 @@ self: super: {
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -4962,6 +5043,7 @@ self: super: {
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
   "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5190,6 +5272,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -5349,6 +5432,7 @@ self: super: {
   "pasty" = dontDistribute super."pasty";
   "patch-combinators" = dontDistribute super."patch-combinators";
   "patch-image" = dontDistribute super."patch-image";
+  "path-io" = doDistribute super."path-io_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -5507,6 +5591,7 @@ self: super: {
   "polh-lexicon" = dontDistribute super."polh-lexicon";
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -5517,6 +5602,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
   "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
   "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
   "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
@@ -5544,6 +5630,7 @@ self: super: {
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
   "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_7_5_1";
   "postgresql-config" = dontDistribute super."postgresql-config";
   "postgresql-connector" = dontDistribute super."postgresql-connector";
   "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
@@ -5591,6 +5678,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -5603,6 +5691,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_7";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -5645,9 +5734,11 @@ self: super: {
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -5668,6 +5759,7 @@ self: super: {
   "pure-priority-queue" = dontDistribute super."pure-priority-queue";
   "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
   "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -5701,6 +5793,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -5778,6 +5871,7 @@ self: super: {
   "reactive-balsa" = dontDistribute super."reactive-balsa";
   "reactive-banana" = dontDistribute super."reactive-banana";
   "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
   "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
   "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
   "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
@@ -5792,6 +5886,7 @@ self: super: {
   "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
   "reasonable-lens" = dontDistribute super."reasonable-lens";
   "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
   "recaptcha" = dontDistribute super."recaptcha";
   "record" = dontDistribute super."record";
   "record-aeson" = dontDistribute super."record-aeson";
@@ -5877,6 +5972,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -5914,7 +6010,9 @@ self: super: {
   "resource-simple" = dontDistribute super."resource-simple";
   "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -5922,6 +6020,7 @@ self: super: {
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6050,6 +6149,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6073,6 +6173,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -6117,6 +6218,7 @@ self: super: {
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups" = doDistribute super."semigroups_0_18_0_1";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
   "semiring" = dontDistribute super."semiring";
   "semiring-simple" = dontDistribute super."semiring-simple";
@@ -6149,6 +6251,7 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_1";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
@@ -6522,6 +6625,7 @@ self: super: {
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
   "strict-concurrency" = dontDistribute super."strict-concurrency";
   "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
   "strict-identity" = dontDistribute super."strict-identity";
@@ -6549,6 +6653,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_4";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -6556,6 +6661,7 @@ self: super: {
   "subnet" = dontDistribute super."subnet";
   "subtitleParser" = dontDistribute super."subtitleParser";
   "subtitles" = dontDistribute super."subtitles";
+  "success" = doDistribute super."success_0_2_4";
   "suffixarray" = dontDistribute super."suffixarray";
   "suffixtree" = dontDistribute super."suffixtree";
   "sugarhaskell" = dontDistribute super."sugarhaskell";
@@ -6580,6 +6686,7 @@ self: super: {
   "svm-light-utils" = dontDistribute super."svm-light-utils";
   "svm-simple" = dontDistribute super."svm-simple";
   "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_1_2_1";
   "swapper" = dontDistribute super."swapper";
   "swearjure" = dontDistribute super."swearjure";
   "swf" = dontDistribute super."swf";
@@ -6638,6 +6745,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -6753,6 +6861,7 @@ self: super: {
   "textmatetags" = dontDistribute super."textmatetags";
   "textocat-api" = dontDistribute super."textocat-api";
   "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
   "tfp" = dontDistribute super."tfp";
   "tfp-th" = dontDistribute super."tfp-th";
   "tftp" = dontDistribute super."tftp";
@@ -6916,6 +7025,7 @@ self: super: {
   "tsparse" = dontDistribute super."tsparse";
   "tst" = dontDistribute super."tst";
   "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
   "tubes" = dontDistribute super."tubes";
   "tuntap" = dontDistribute super."tuntap";
   "tup-functor" = dontDistribute super."tup-functor";
@@ -6957,6 +7067,7 @@ self: super: {
   "ty" = dontDistribute super."ty";
   "typalyze" = dontDistribute super."typalyze";
   "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
   "type-cereal" = dontDistribute super."type-cereal";
   "type-combinators" = dontDistribute super."type-combinators";
   "type-combinators-quote" = dontDistribute super."type-combinators-quote";
@@ -7036,6 +7147,7 @@ self: super: {
   "unicode-normalization" = dontDistribute super."unicode-normalization";
   "unicode-prelude" = dontDistribute super."unicode-prelude";
   "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
   "unicode-symbols" = dontDistribute super."unicode-symbols";
   "unicoder" = dontDistribute super."unicoder";
   "uniform-io" = dontDistribute super."uniform-io";
@@ -7162,6 +7274,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-space-points" = dontDistribute super."vector-space-points";
@@ -7376,6 +7489,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
@@ -7482,6 +7596,7 @@ self: super: {
   "yesod-lucid" = dontDistribute super."yesod-lucid";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
@@ -7501,6 +7616,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
@@ -7526,6 +7642,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
new file mode 100644
index 0000000000000..b9e13567f85d7
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -0,0 +1,7658 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # core libraries provided by the compiler
+  Cabal = null;
+  array = null;
+  base = null;
+  bin-package-db = null;
+  binary = null;
+  bytestring = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  time = null;
+  transformers = null;
+  unix = null;
+
+  # lts-5.1 packages
+  "3d-graphics-examples" = dontDistribute super."3d-graphics-examples";
+  "3dmodels" = dontDistribute super."3dmodels";
+  "4Blocks" = dontDistribute super."4Blocks";
+  "AAI" = dontDistribute super."AAI";
+  "ABList" = dontDistribute super."ABList";
+  "AC-Angle" = dontDistribute super."AC-Angle";
+  "AC-Boolean" = dontDistribute super."AC-Boolean";
+  "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform";
+  "AC-Colour" = dontDistribute super."AC-Colour";
+  "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK";
+  "AC-HalfInteger" = dontDistribute super."AC-HalfInteger";
+  "AC-MiniTest" = dontDistribute super."AC-MiniTest";
+  "AC-PPM" = dontDistribute super."AC-PPM";
+  "AC-Random" = dontDistribute super."AC-Random";
+  "AC-Terminal" = dontDistribute super."AC-Terminal";
+  "AC-VanillaArray" = dontDistribute super."AC-VanillaArray";
+  "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy";
+  "ACME" = dontDistribute super."ACME";
+  "ADPfusion" = dontDistribute super."ADPfusion";
+  "AERN-Basics" = dontDistribute super."AERN-Basics";
+  "AERN-Net" = dontDistribute super."AERN-Net";
+  "AERN-Real" = dontDistribute super."AERN-Real";
+  "AERN-Real-Double" = dontDistribute super."AERN-Real-Double";
+  "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval";
+  "AERN-RnToRm" = dontDistribute super."AERN-RnToRm";
+  "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot";
+  "AES" = dontDistribute super."AES";
+  "AGI" = dontDistribute super."AGI";
+  "ALUT" = dontDistribute super."ALUT";
+  "AMI" = dontDistribute super."AMI";
+  "ANum" = dontDistribute super."ANum";
+  "ASN1" = dontDistribute super."ASN1";
+  "AVar" = dontDistribute super."AVar";
+  "AWin32Console" = dontDistribute super."AWin32Console";
+  "AbortT-monadstf" = dontDistribute super."AbortT-monadstf";
+  "AbortT-mtl" = dontDistribute super."AbortT-mtl";
+  "AbortT-transformers" = dontDistribute super."AbortT-transformers";
+  "ActionKid" = dontDistribute super."ActionKid";
+  "Adaptive" = dontDistribute super."Adaptive";
+  "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade";
+  "Advgame" = dontDistribute super."Advgame";
+  "AesonBson" = dontDistribute super."AesonBson";
+  "Agata" = dontDistribute super."Agata";
+  "Agda-executable" = dontDistribute super."Agda-executable";
+  "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlgorithmW" = dontDistribute super."AlgorithmW";
+  "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
+  "Allure" = dontDistribute super."Allure";
+  "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter";
+  "Animas" = dontDistribute super."Animas";
+  "Annotations" = dontDistribute super."Annotations";
+  "Ansi2Html" = dontDistribute super."Ansi2Html";
+  "ApplePush" = dontDistribute super."ApplePush";
+  "AppleScript" = dontDistribute super."AppleScript";
+  "ApproxFun-hs" = dontDistribute super."ApproxFun-hs";
+  "ArrayRef" = dontDistribute super."ArrayRef";
+  "ArrowVHDL" = dontDistribute super."ArrowVHDL";
+  "AspectAG" = dontDistribute super."AspectAG";
+  "AttoBencode" = dontDistribute super."AttoBencode";
+  "AttoJson" = dontDistribute super."AttoJson";
+  "Attrac" = dontDistribute super."Attrac";
+  "Aurochs" = dontDistribute super."Aurochs";
+  "AutoForms" = dontDistribute super."AutoForms";
+  "AvlTree" = dontDistribute super."AvlTree";
+  "BASIC" = dontDistribute super."BASIC";
+  "BCMtools" = dontDistribute super."BCMtools";
+  "BNFC" = dontDistribute super."BNFC";
+  "BNFC-meta" = dontDistribute super."BNFC-meta";
+  "Baggins" = dontDistribute super."Baggins";
+  "Bang" = dontDistribute super."Bang";
+  "Barracuda" = dontDistribute super."Barracuda";
+  "Befunge93" = dontDistribute super."Befunge93";
+  "BenchmarkHistory" = dontDistribute super."BenchmarkHistory";
+  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
+  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
+  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BigPixel" = dontDistribute super."BigPixel";
+  "Binpack" = dontDistribute super."Binpack";
+  "Biobase" = dontDistribute super."Biobase";
+  "BiobaseBlast" = dontDistribute super."BiobaseBlast";
+  "BiobaseDotP" = dontDistribute super."BiobaseDotP";
+  "BiobaseFR3D" = dontDistribute super."BiobaseFR3D";
+  "BiobaseFasta" = dontDistribute super."BiobaseFasta";
+  "BiobaseInfernal" = dontDistribute super."BiobaseInfernal";
+  "BiobaseMAF" = dontDistribute super."BiobaseMAF";
+  "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData";
+  "BiobaseTurner" = dontDistribute super."BiobaseTurner";
+  "BiobaseTypes" = dontDistribute super."BiobaseTypes";
+  "BiobaseVienna" = dontDistribute super."BiobaseVienna";
+  "BiobaseXNA" = dontDistribute super."BiobaseXNA";
+  "BirdPP" = dontDistribute super."BirdPP";
+  "BitSyntax" = dontDistribute super."BitSyntax";
+  "Bitly" = dontDistribute super."Bitly";
+  "Blobs" = dontDistribute super."Blobs";
+  "BluePrintCSS" = dontDistribute super."BluePrintCSS";
+  "Blueprint" = dontDistribute super."Blueprint";
+  "Bookshelf" = dontDistribute super."Bookshelf";
+  "Bravo" = dontDistribute super."Bravo";
+  "BufferedSocket" = dontDistribute super."BufferedSocket";
+  "Buster" = dontDistribute super."Buster";
+  "CBOR" = dontDistribute super."CBOR";
+  "CC-delcont" = dontDistribute super."CC-delcont";
+  "CC-delcont-alt" = dontDistribute super."CC-delcont-alt";
+  "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe";
+  "CC-delcont-exc" = dontDistribute super."CC-delcont-exc";
+  "CC-delcont-ref" = dontDistribute super."CC-delcont-ref";
+  "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf";
+  "CCA" = dontDistribute super."CCA";
+  "CHXHtml" = dontDistribute super."CHXHtml";
+  "CLASE" = dontDistribute super."CLASE";
+  "CLI" = dontDistribute super."CLI";
+  "CMCompare" = dontDistribute super."CMCompare";
+  "CMQ" = dontDistribute super."CMQ";
+  "COrdering" = dontDistribute super."COrdering";
+  "CPBrainfuck" = dontDistribute super."CPBrainfuck";
+  "CPL" = dontDistribute super."CPL";
+  "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage";
+  "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules";
+  "CSPM-Frontend" = dontDistribute super."CSPM-Frontend";
+  "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter";
+  "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog";
+  "CSPM-cspm" = dontDistribute super."CSPM-cspm";
+  "CTRex" = dontDistribute super."CTRex";
+  "CV" = dontDistribute super."CV";
+  "CabalSearch" = dontDistribute super."CabalSearch";
+  "Capabilities" = dontDistribute super."Capabilities";
+  "Cardinality" = dontDistribute super."Cardinality";
+  "CarneadesDSL" = dontDistribute super."CarneadesDSL";
+  "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung";
+  "Cartesian" = dontDistribute super."Cartesian";
+  "Cascade" = dontDistribute super."Cascade";
+  "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "Chart-gtk" = dontDistribute super."Chart-gtk";
+  "Chart-simple" = dontDistribute super."Chart-simple";
+  "CheatSheet" = dontDistribute super."CheatSheet";
+  "Checked" = dontDistribute super."Checked";
+  "Chitra" = dontDistribute super."Chitra";
+  "ChristmasTree" = dontDistribute super."ChristmasTree";
+  "CirruParser" = dontDistribute super."CirruParser";
+  "ClassLaws" = dontDistribute super."ClassLaws";
+  "ClassyPrelude" = dontDistribute super."ClassyPrelude";
+  "Clean" = dontDistribute super."Clean";
+  "Clipboard" = dontDistribute super."Clipboard";
+  "Coadjute" = dontDistribute super."Coadjute";
+  "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF";
+  "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL";
+  "Combinatorrent" = dontDistribute super."Combinatorrent";
+  "Command" = dontDistribute super."Command";
+  "Commando" = dontDistribute super."Commando";
+  "ComonadSheet" = dontDistribute super."ComonadSheet";
+  "ConcurrentUtils" = dontDistribute super."ConcurrentUtils";
+  "Concurrential" = dontDistribute super."Concurrential";
+  "Condor" = dontDistribute super."Condor";
+  "ConfigFileTH" = dontDistribute super."ConfigFileTH";
+  "Configger" = dontDistribute super."Configger";
+  "Configurable" = dontDistribute super."Configurable";
+  "ConsStream" = dontDistribute super."ConsStream";
+  "Conscript" = dontDistribute super."Conscript";
+  "ConstraintKinds" = dontDistribute super."ConstraintKinds";
+  "Consumer" = dontDistribute super."Consumer";
+  "ContArrow" = dontDistribute super."ContArrow";
+  "ContextAlgebra" = dontDistribute super."ContextAlgebra";
+  "Contract" = dontDistribute super."Contract";
+  "Control-Engine" = dontDistribute super."Control-Engine";
+  "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass";
+  "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2";
+  "CoreDump" = dontDistribute super."CoreDump";
+  "CoreErlang" = dontDistribute super."CoreErlang";
+  "CoreFoundation" = dontDistribute super."CoreFoundation";
+  "Coroutine" = dontDistribute super."Coroutine";
+  "CouchDB" = dontDistribute super."CouchDB";
+  "Craft3e" = dontDistribute super."Craft3e";
+  "Crypto" = dontDistribute super."Crypto";
+  "CurryDB" = dontDistribute super."CurryDB";
+  "DAG-Tournament" = dontDistribute super."DAG-Tournament";
+  "DBlimited" = dontDistribute super."DBlimited";
+  "DBus" = dontDistribute super."DBus";
+  "DCFL" = dontDistribute super."DCFL";
+  "DMuCheck" = dontDistribute super."DMuCheck";
+  "DOM" = dontDistribute super."DOM";
+  "DP" = dontDistribute super."DP";
+  "DPM" = dontDistribute super."DPM";
+  "DSA" = dontDistribute super."DSA";
+  "DSH" = dontDistribute super."DSH";
+  "DSTM" = dontDistribute super."DSTM";
+  "DTC" = dontDistribute super."DTC";
+  "Dangerous" = dontDistribute super."Dangerous";
+  "Dao" = dontDistribute super."Dao";
+  "DarcsHelpers" = dontDistribute super."DarcsHelpers";
+  "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent";
+  "Data-Rope" = dontDistribute super."Data-Rope";
+  "DataTreeView" = dontDistribute super."DataTreeView";
+  "Deadpan-DDP" = dontDistribute super."Deadpan-DDP";
+  "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers";
+  "DecisionTree" = dontDistribute super."DecisionTree";
+  "DeepArrow" = dontDistribute super."DeepArrow";
+  "DefendTheKing" = dontDistribute super."DefendTheKing";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "DifferenceLogic" = dontDistribute super."DifferenceLogic";
+  "DifferentialEvolution" = dontDistribute super."DifferentialEvolution";
+  "Digit" = dontDistribute super."Digit";
+  "DigitalOcean" = dontDistribute super."DigitalOcean";
+  "DimensionalHash" = dontDistribute super."DimensionalHash";
+  "DirectSound" = dontDistribute super."DirectSound";
+  "DisTract" = dontDistribute super."DisTract";
+  "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem";
+  "Dish" = dontDistribute super."Dish";
+  "Dist" = dontDistribute super."Dist";
+  "DistanceTransform" = dontDistribute super."DistanceTransform";
+  "DistanceUnits" = dontDistribute super."DistanceUnits";
+  "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment";
+  "DocTest" = dontDistribute super."DocTest";
+  "Docs" = dontDistribute super."Docs";
+  "DrHylo" = dontDistribute super."DrHylo";
+  "DrIFT" = dontDistribute super."DrIFT";
+  "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized";
+  "Dung" = dontDistribute super."Dung";
+  "Dust" = dontDistribute super."Dust";
+  "Dust-crypto" = dontDistribute super."Dust-crypto";
+  "Dust-tools" = dontDistribute super."Dust-tools";
+  "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap";
+  "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp";
+  "DysFRP" = dontDistribute super."DysFRP";
+  "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
+  "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
+  "EEConfig" = dontDistribute super."EEConfig";
+  "EdisonAPI" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "EditTimeReport" = dontDistribute super."EditTimeReport";
+  "EitherT" = dontDistribute super."EitherT";
+  "Elm" = dontDistribute super."Elm";
+  "Emping" = dontDistribute super."Emping";
+  "Encode" = dontDistribute super."Encode";
+  "EnumContainers" = dontDistribute super."EnumContainers";
+  "EnumMap" = dontDistribute super."EnumMap";
+  "Eq" = dontDistribute super."Eq";
+  "EqualitySolver" = dontDistribute super."EqualitySolver";
+  "EsounD" = dontDistribute super."EsounD";
+  "EstProgress" = dontDistribute super."EstProgress";
+  "EtaMOO" = dontDistribute super."EtaMOO";
+  "Etage" = dontDistribute super."Etage";
+  "Etage-Graph" = dontDistribute super."Etage-Graph";
+  "Eternal10Seconds" = dontDistribute super."Eternal10Seconds";
+  "Etherbunny" = dontDistribute super."Etherbunny";
+  "EuroIT" = dontDistribute super."EuroIT";
+  "Euterpea" = dontDistribute super."Euterpea";
+  "EventSocket" = dontDistribute super."EventSocket";
+  "Extra" = dontDistribute super."Extra";
+  "FComp" = dontDistribute super."FComp";
+  "FM-SBLEX" = dontDistribute super."FM-SBLEX";
+  "FModExRaw" = dontDistribute super."FModExRaw";
+  "FPretty" = dontDistribute super."FPretty";
+  "FTGL" = dontDistribute super."FTGL";
+  "FTGL-bytestring" = dontDistribute super."FTGL-bytestring";
+  "FTPLine" = dontDistribute super."FTPLine";
+  "Facts" = dontDistribute super."Facts";
+  "FailureT" = dontDistribute super."FailureT";
+  "FastxPipe" = dontDistribute super."FastxPipe";
+  "FermatsLastMargin" = dontDistribute super."FermatsLastMargin";
+  "FerryCore" = dontDistribute super."FerryCore";
+  "Feval" = dontDistribute super."Feval";
+  "FieldTrip" = dontDistribute super."FieldTrip";
+  "FileManip" = dontDistribute super."FileManip";
+  "FileManipCompat" = dontDistribute super."FileManipCompat";
+  "FilePather" = dontDistribute super."FilePather";
+  "FileSystem" = dontDistribute super."FileSystem";
+  "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo";
+  "Finance-Treasury" = dontDistribute super."Finance-Treasury";
+  "FiniteMap" = dontDistribute super."FiniteMap";
+  "FirstOrderTheory" = dontDistribute super."FirstOrderTheory";
+  "FixedPoint-simple" = dontDistribute super."FixedPoint-simple";
+  "Flippi" = dontDistribute super."Flippi";
+  "Focus" = dontDistribute super."Focus";
+  "Folly" = dontDistribute super."Folly";
+  "ForSyDe" = dontDistribute super."ForSyDe";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frank" = dontDistribute super."Frank";
+  "FreeTypeGL" = dontDistribute super."FreeTypeGL";
+  "FunGEn" = dontDistribute super."FunGEn";
+  "Fungi" = dontDistribute super."Fungi";
+  "GA" = dontDistribute super."GA";
+  "GGg" = dontDistribute super."GGg";
+  "GHood" = dontDistribute super."GHood";
+  "GLFW" = dontDistribute super."GLFW";
+  "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
+  "GLFW-task" = dontDistribute super."GLFW-task";
+  "GLHUI" = dontDistribute super."GLHUI";
+  "GLM" = dontDistribute super."GLM";
+  "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
+  "GTALib" = dontDistribute super."GTALib";
+  "Gamgine" = dontDistribute super."Gamgine";
+  "Ganymede" = dontDistribute super."Ganymede";
+  "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration";
+  "GeBoP" = dontDistribute super."GeBoP";
+  "GenI" = dontDistribute super."GenI";
+  "GenSmsPdu" = dontDistribute super."GenSmsPdu";
+  "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe";
+  "GenussFold" = dontDistribute super."GenussFold";
+  "GeoIp" = dontDistribute super."GeoIp";
+  "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage";
+  "Geodetic" = dontDistribute super."Geodetic";
+  "GeomPredicates" = dontDistribute super."GeomPredicates";
+  "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
+  "GiST" = dontDistribute super."GiST";
+  "Gifcurry" = dontDistribute super."Gifcurry";
+  "GiveYouAHead" = dontDistribute super."GiveYouAHead";
+  "GlomeTrace" = dontDistribute super."GlomeTrace";
+  "GlomeVec" = dontDistribute super."GlomeVec";
+  "GlomeView" = dontDistribute super."GlomeView";
+  "GoogleChart" = dontDistribute super."GoogleChart";
+  "GoogleDirections" = dontDistribute super."GoogleDirections";
+  "GoogleSB" = dontDistribute super."GoogleSB";
+  "GoogleSuggest" = dontDistribute super."GoogleSuggest";
+  "GoogleTranslate" = dontDistribute super."GoogleTranslate";
+  "GotoT-transformers" = dontDistribute super."GotoT-transformers";
+  "GrammarProducts" = dontDistribute super."GrammarProducts";
+  "Graph500" = dontDistribute super."Graph500";
+  "GraphHammer" = dontDistribute super."GraphHammer";
+  "GraphHammer-examples" = dontDistribute super."GraphHammer-examples";
+  "Graphalyze" = dontDistribute super."Graphalyze";
+  "Grempa" = dontDistribute super."Grempa";
+  "GroteTrap" = dontDistribute super."GroteTrap";
+  "Grow" = dontDistribute super."Grow";
+  "GrowlNotify" = dontDistribute super."GrowlNotify";
+  "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics";
+  "GtkGLTV" = dontDistribute super."GtkGLTV";
+  "GtkTV" = dontDistribute super."GtkTV";
+  "GuiHaskell" = dontDistribute super."GuiHaskell";
+  "GuiTV" = dontDistribute super."GuiTV";
+  "HARM" = dontDistribute super."HARM";
+  "HAppS-Data" = dontDistribute super."HAppS-Data";
+  "HAppS-IxSet" = dontDistribute super."HAppS-IxSet";
+  "HAppS-Server" = dontDistribute super."HAppS-Server";
+  "HAppS-State" = dontDistribute super."HAppS-State";
+  "HAppS-Util" = dontDistribute super."HAppS-Util";
+  "HAppSHelpers" = dontDistribute super."HAppSHelpers";
+  "HCL" = dontDistribute super."HCL";
+  "HCard" = dontDistribute super."HCard";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "HDRUtils" = dontDistribute super."HDRUtils";
+  "HERA" = dontDistribute super."HERA";
+  "HFrequencyQueue" = dontDistribute super."HFrequencyQueue";
+  "HFuse" = dontDistribute super."HFuse";
+  "HGL" = dontDistribute super."HGL";
+  "HGamer3D" = dontDistribute super."HGamer3D";
+  "HGamer3D-API" = dontDistribute super."HGamer3D-API";
+  "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio";
+  "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding";
+  "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding";
+  "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding";
+  "HGamer3D-Common" = dontDistribute super."HGamer3D-Common";
+  "HGamer3D-Data" = dontDistribute super."HGamer3D-Data";
+  "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding";
+  "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI";
+  "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D";
+  "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem";
+  "HGamer3D-Network" = dontDistribute super."HGamer3D-Network";
+  "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding";
+  "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding";
+  "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding";
+  "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding";
+  "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent";
+  "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire";
+  "HGraphStorage" = dontDistribute super."HGraphStorage";
+  "HHDL" = dontDistribute super."HHDL";
+  "HJScript" = dontDistribute super."HJScript";
+  "HJVM" = dontDistribute super."HJVM";
+  "HJavaScript" = dontDistribute super."HJavaScript";
+  "HLearn-algebra" = dontDistribute super."HLearn-algebra";
+  "HLearn-approximation" = dontDistribute super."HLearn-approximation";
+  "HLearn-classification" = dontDistribute super."HLearn-classification";
+  "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
+  "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HListPP" = dontDistribute super."HListPP";
+  "HLogger" = dontDistribute super."HLogger";
+  "HMM" = dontDistribute super."HMM";
+  "HMap" = dontDistribute super."HMap";
+  "HNM" = dontDistribute super."HNM";
+  "HODE" = dontDistribute super."HODE";
+  "HOpenCV" = dontDistribute super."HOpenCV";
+  "HPath" = dontDistribute super."HPath";
+  "HPi" = dontDistribute super."HPi";
+  "HPlot" = dontDistribute super."HPlot";
+  "HPong" = dontDistribute super."HPong";
+  "HROOT" = dontDistribute super."HROOT";
+  "HROOT-core" = dontDistribute super."HROOT-core";
+  "HROOT-graf" = dontDistribute super."HROOT-graf";
+  "HROOT-hist" = dontDistribute super."HROOT-hist";
+  "HROOT-io" = dontDistribute super."HROOT-io";
+  "HROOT-math" = dontDistribute super."HROOT-math";
+  "HRay" = dontDistribute super."HRay";
+  "HSFFIG" = dontDistribute super."HSFFIG";
+  "HSGEP" = dontDistribute super."HSGEP";
+  "HSH" = dontDistribute super."HSH";
+  "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSlippyMap" = dontDistribute super."HSlippyMap";
+  "HSmarty" = dontDistribute super."HSmarty";
+  "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
+  "HSvm" = dontDistribute super."HSvm";
+  "HTTP-Simple" = dontDistribute super."HTTP-Simple";
+  "HTab" = dontDistribute super."HTab";
+  "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit-Diff" = dontDistribute super."HUnit-Diff";
+  "HUnit-Plus" = dontDistribute super."HUnit-Plus";
+  "HUnit-approx" = dontDistribute super."HUnit-approx";
+  "HXMPP" = dontDistribute super."HXMPP";
+  "HXQ" = dontDistribute super."HXQ";
+  "HaLeX" = dontDistribute super."HaLeX";
+  "HaMinitel" = dontDistribute super."HaMinitel";
+  "HaPy" = dontDistribute super."HaPy";
+  "HaTeX-meta" = dontDistribute super."HaTeX-meta";
+  "HaTeX-qq" = dontDistribute super."HaTeX-qq";
+  "HaVSA" = dontDistribute super."HaVSA";
+  "Hach" = dontDistribute super."Hach";
+  "HackMail" = dontDistribute super."HackMail";
+  "Haggressive" = dontDistribute super."Haggressive";
+  "HandlerSocketClient" = dontDistribute super."HandlerSocketClient";
+  "Hangman" = dontDistribute super."Hangman";
+  "HarmTrace" = dontDistribute super."HarmTrace";
+  "HarmTrace-Base" = dontDistribute super."HarmTrace-Base";
+  "HasGP" = dontDistribute super."HasGP";
+  "Haschoo" = dontDistribute super."Haschoo";
+  "Hashell" = dontDistribute super."Hashell";
+  "HaskRel" = dontDistribute super."HaskRel";
+  "HaskellForMaths" = dontDistribute super."HaskellForMaths";
+  "HaskellLM" = dontDistribute super."HaskellLM";
+  "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellTorrent" = dontDistribute super."HaskellTorrent";
+  "HaskellTutorials" = dontDistribute super."HaskellTutorials";
+  "Haskelloids" = dontDistribute super."Haskelloids";
+  "Hate" = dontDistribute super."Hate";
+  "Hawk" = dontDistribute super."Hawk";
+  "Hayoo" = dontDistribute super."Hayoo";
+  "Hclip" = dontDistribute super."Hclip";
+  "Hedi" = dontDistribute super."Hedi";
+  "HerbiePlugin" = dontDistribute super."HerbiePlugin";
+  "Hermes" = dontDistribute super."Hermes";
+  "Hieroglyph" = dontDistribute super."Hieroglyph";
+  "HiggsSet" = dontDistribute super."HiggsSet";
+  "Hipmunk" = dontDistribute super."Hipmunk";
+  "HipmunkPlayground" = dontDistribute super."HipmunkPlayground";
+  "Hish" = dontDistribute super."Hish";
+  "Histogram" = dontDistribute super."Histogram";
+  "Hmpf" = dontDistribute super."Hmpf";
+  "Hoed" = dontDistribute super."Hoed";
+  "HoleyMonoid" = dontDistribute super."HoleyMonoid";
+  "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution";
+  "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce";
+  "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine";
+  "Holumbus-Storage" = dontDistribute super."Holumbus-Storage";
+  "Homology" = dontDistribute super."Homology";
+  "HongoDB" = dontDistribute super."HongoDB";
+  "HostAndPort" = dontDistribute super."HostAndPort";
+  "Hricket" = dontDistribute super."Hricket";
+  "Hs2lib" = dontDistribute super."Hs2lib";
+  "HsASA" = dontDistribute super."HsASA";
+  "HsHaruPDF" = dontDistribute super."HsHaruPDF";
+  "HsHyperEstraier" = dontDistribute super."HsHyperEstraier";
+  "HsJudy" = dontDistribute super."HsJudy";
+  "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system";
+  "HsParrot" = dontDistribute super."HsParrot";
+  "HsPerl5" = dontDistribute super."HsPerl5";
+  "HsSVN" = dontDistribute super."HsSVN";
+  "HsTools" = dontDistribute super."HsTools";
+  "Hsed" = dontDistribute super."Hsed";
+  "Hsmtlib" = dontDistribute super."Hsmtlib";
+  "HueAPI" = dontDistribute super."HueAPI";
+  "HulkImport" = dontDistribute super."HulkImport";
+  "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres";
+  "IDynamic" = dontDistribute super."IDynamic";
+  "IFS" = dontDistribute super."IFS";
+  "INblobs" = dontDistribute super."INblobs";
+  "IOR" = dontDistribute super."IOR";
+  "IORefCAS" = dontDistribute super."IORefCAS";
+  "IOSpec" = dontDistribute super."IOSpec";
+  "IcoGrid" = dontDistribute super."IcoGrid";
+  "Imlib" = dontDistribute super."Imlib";
+  "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
+  "IndentParser" = dontDistribute super."IndentParser";
+  "IndexedList" = dontDistribute super."IndexedList";
+  "InfixApplicative" = dontDistribute super."InfixApplicative";
+  "Interpolation" = dontDistribute super."Interpolation";
+  "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "IntervalMap" = doDistribute super."IntervalMap_0_5_0_0";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JunkDB" = dontDistribute super."JunkDB";
+  "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
+  "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables";
+  "JustParse" = dontDistribute super."JustParse";
+  "KMP" = dontDistribute super."KMP";
+  "KSP" = dontDistribute super."KSP";
+  "Kalman" = dontDistribute super."Kalman";
+  "KdTree" = dontDistribute super."KdTree";
+  "Ketchup" = dontDistribute super."Ketchup";
+  "KiCS" = dontDistribute super."KiCS";
+  "KiCS-debugger" = dontDistribute super."KiCS-debugger";
+  "KiCS-prophecy" = dontDistribute super."KiCS-prophecy";
+  "Kleislify" = dontDistribute super."Kleislify";
+  "Konf" = dontDistribute super."Konf";
+  "Kriens" = dontDistribute super."Kriens";
+  "KyotoCabinet" = dontDistribute super."KyotoCabinet";
+  "L-seed" = dontDistribute super."L-seed";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "LambdaHack" = dontDistribute super."LambdaHack";
+  "LambdaINet" = dontDistribute super."LambdaINet";
+  "LambdaNet" = dontDistribute super."LambdaNet";
+  "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote";
+  "LambdaShell" = dontDistribute super."LambdaShell";
+  "Lambdajudge" = dontDistribute super."Lambdajudge";
+  "Lambdaya" = dontDistribute super."Lambdaya";
+  "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
+  "Lastik" = dontDistribute super."Lastik";
+  "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "Limit" = dontDistribute super."Limit";
+  "LinearSplit" = dontDistribute super."LinearSplit";
+  "LinguisticsTypes" = dontDistribute super."LinguisticsTypes";
+  "LinkChecker" = dontDistribute super."LinkChecker";
+  "ListTree" = dontDistribute super."ListTree";
+  "ListWriter" = dontDistribute super."ListWriter";
+  "ListZipper" = dontDistribute super."ListZipper";
+  "Logic" = dontDistribute super."Logic";
+  "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees";
+  "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI";
+  "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network";
+  "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
+  "LslPlus" = dontDistribute super."LslPlus";
+  "Lucu" = dontDistribute super."Lucu";
+  "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
+  "MHask" = dontDistribute super."MHask";
+  "MSQueue" = dontDistribute super."MSQueue";
+  "MTGBuilder" = dontDistribute super."MTGBuilder";
+  "MagicHaskeller" = dontDistribute super."MagicHaskeller";
+  "MailchimpSimple" = dontDistribute super."MailchimpSimple";
+  "MaybeT" = dontDistribute super."MaybeT";
+  "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf";
+  "MaybeT-transformers" = dontDistribute super."MaybeT-transformers";
+  "MazesOfMonad" = dontDistribute super."MazesOfMonad";
+  "MeanShift" = dontDistribute super."MeanShift";
+  "Measure" = dontDistribute super."Measure";
+  "MetaHDBC" = dontDistribute super."MetaHDBC";
+  "MetaObject" = dontDistribute super."MetaObject";
+  "Metrics" = dontDistribute super."Metrics";
+  "Mhailist" = dontDistribute super."Mhailist";
+  "Michelangelo" = dontDistribute super."Michelangelo";
+  "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator";
+  "MiniAgda" = dontDistribute super."MiniAgda";
+  "MissingK" = dontDistribute super."MissingK";
+  "MissingM" = dontDistribute super."MissingM";
+  "MissingPy" = dontDistribute super."MissingPy";
+  "Modulo" = dontDistribute super."Modulo";
+  "Moe" = dontDistribute super."Moe";
+  "MoeDict" = dontDistribute super."MoeDict";
+  "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl";
+  "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign";
+  "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
+  "MonadCompose" = dontDistribute super."MonadCompose";
+  "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
+  "MonadStack" = dontDistribute super."MonadStack";
+  "Monadius" = dontDistribute super."Monadius";
+  "Monaris" = dontDistribute super."Monaris";
+  "Monatron" = dontDistribute super."Monatron";
+  "Monatron-IO" = dontDistribute super."Monatron-IO";
+  "Monocle" = dontDistribute super."Monocle";
+  "MorseCode" = dontDistribute super."MorseCode";
+  "MuCheck" = dontDistribute super."MuCheck";
+  "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit";
+  "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec";
+  "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck";
+  "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck";
+  "Munkres" = dontDistribute super."Munkres";
+  "Munkres-simple" = dontDistribute super."Munkres-simple";
+  "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid";
+  "MyPrimes" = dontDistribute super."MyPrimes";
+  "NGrams" = dontDistribute super."NGrams";
+  "NTRU" = dontDistribute super."NTRU";
+  "NXT" = dontDistribute super."NXT";
+  "NXTDSL" = dontDistribute super."NXTDSL";
+  "NanoProlog" = dontDistribute super."NanoProlog";
+  "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets";
+  "NaturalSort" = dontDistribute super."NaturalSort";
+  "NearContextAlgebra" = dontDistribute super."NearContextAlgebra";
+  "Neks" = dontDistribute super."Neks";
+  "NestedFunctor" = dontDistribute super."NestedFunctor";
+  "NestedSampling" = dontDistribute super."NestedSampling";
+  "NetSNMP" = dontDistribute super."NetSNMP";
+  "NewBinary" = dontDistribute super."NewBinary";
+  "Ninjas" = dontDistribute super."Ninjas";
+  "NoSlow" = dontDistribute super."NoSlow";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "Noise" = dontDistribute super."Noise";
+  "Nomyx" = dontDistribute super."Nomyx";
+  "Nomyx-Core" = dontDistribute super."Nomyx-Core";
+  "Nomyx-Language" = dontDistribute super."Nomyx-Language";
+  "Nomyx-Rules" = dontDistribute super."Nomyx-Rules";
+  "Nomyx-Web" = dontDistribute super."Nomyx-Web";
+  "NonEmpty" = dontDistribute super."NonEmpty";
+  "NonEmptyList" = dontDistribute super."NonEmptyList";
+  "NumLazyByteString" = dontDistribute super."NumLazyByteString";
+  "NumberSieves" = dontDistribute super."NumberSieves";
+  "Numbers" = dontDistribute super."Numbers";
+  "Nussinov78" = dontDistribute super."Nussinov78";
+  "Nutri" = dontDistribute super."Nutri";
+  "OGL" = dontDistribute super."OGL";
+  "OSM" = dontDistribute super."OSM";
+  "OTP" = dontDistribute super."OTP";
+  "Object" = dontDistribute super."Object";
+  "ObjectIO" = dontDistribute super."ObjectIO";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
+  "OpenSCAD" = dontDistribute super."OpenSCAD";
+  "OpenVG" = dontDistribute super."OpenVG";
+  "OpenVGRaw" = dontDistribute super."OpenVGRaw";
+  "Operads" = dontDistribute super."Operads";
+  "OptDir" = dontDistribute super."OptDir";
+  "OrPatterns" = dontDistribute super."OrPatterns";
+  "OrchestrateDB" = dontDistribute super."OrchestrateDB";
+  "OrderedBits" = dontDistribute super."OrderedBits";
+  "Ordinals" = dontDistribute super."Ordinals";
+  "PArrows" = dontDistribute super."PArrows";
+  "PBKDF2" = dontDistribute super."PBKDF2";
+  "PCLT" = dontDistribute super."PCLT";
+  "PCLT-DB" = dontDistribute super."PCLT-DB";
+  "PDBtools" = dontDistribute super."PDBtools";
+  "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
+  "PageIO" = dontDistribute super."PageIO";
+  "Paillier" = dontDistribute super."Paillier";
+  "PandocAgda" = dontDistribute super."PandocAgda";
+  "Paraiso" = dontDistribute super."Paraiso";
+  "Parry" = dontDistribute super."Parry";
+  "ParsecTools" = dontDistribute super."ParsecTools";
+  "ParserFunction" = dontDistribute super."ParserFunction";
+  "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures";
+  "PasswordGenerator" = dontDistribute super."PasswordGenerator";
+  "PastePipe" = dontDistribute super."PastePipe";
+  "Pathfinder" = dontDistribute super."Pathfinder";
+  "Peano" = dontDistribute super."Peano";
+  "PeanoWitnesses" = dontDistribute super."PeanoWitnesses";
+  "PerfectHash" = dontDistribute super."PerfectHash";
+  "PermuteEffects" = dontDistribute super."PermuteEffects";
+  "Phsu" = dontDistribute super."Phsu";
+  "Pipe" = dontDistribute super."Pipe";
+  "Piso" = dontDistribute super."Piso";
+  "PlayHangmanGame" = dontDistribute super."PlayHangmanGame";
+  "PlayingCards" = dontDistribute super."PlayingCards";
+  "Plot-ho-matic" = dontDistribute super."Plot-ho-matic";
+  "PlslTools" = dontDistribute super."PlslTools";
+  "Plural" = dontDistribute super."Plural";
+  "Pollutocracy" = dontDistribute super."Pollutocracy";
+  "PortFusion" = dontDistribute super."PortFusion";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "Printf-TH" = dontDistribute super."Printf-TH";
+  "PriorityChansConverger" = dontDistribute super."PriorityChansConverger";
+  "ProbabilityMonads" = dontDistribute super."ProbabilityMonads";
+  "PropLogic" = dontDistribute super."PropLogic";
+  "Proper" = dontDistribute super."Proper";
+  "ProxN" = dontDistribute super."ProxN";
+  "Pugs" = dontDistribute super."Pugs";
+  "Pup-Events" = dontDistribute super."Pup-Events";
+  "Pup-Events-Client" = dontDistribute super."Pup-Events-Client";
+  "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo";
+  "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
+  "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
+  "QIO" = dontDistribute super."QIO";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickCheck-safe" = dontDistribute super."QuickCheck-safe";
+  "Quickson" = dontDistribute super."Quickson";
+  "R-pandoc" = dontDistribute super."R-pandoc";
+  "RANSAC" = dontDistribute super."RANSAC";
+  "RBTree" = dontDistribute super."RBTree";
+  "RESTng" = dontDistribute super."RESTng";
+  "RFC1751" = dontDistribute super."RFC1751";
+  "RJson" = dontDistribute super."RJson";
+  "RMP" = dontDistribute super."RMP";
+  "RNAFold" = dontDistribute super."RNAFold";
+  "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
+  "RNAdesign" = dontDistribute super."RNAdesign";
+  "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "Semantique" = dontDistribute super."Semantique";
+  "Semigroup" = dontDistribute super."Semigroup";
+  "SeqAlign" = dontDistribute super."SeqAlign";
+  "SessionLogger" = dontDistribute super."SessionLogger";
+  "ShellCheck" = dontDistribute super."ShellCheck";
+  "Shellac" = dontDistribute super."Shellac";
+  "Shellac-compatline" = dontDistribute super."Shellac-compatline";
+  "Shellac-editline" = dontDistribute super."Shellac-editline";
+  "Shellac-haskeline" = dontDistribute super."Shellac-haskeline";
+  "Shellac-readline" = dontDistribute super."Shellac-readline";
+  "ShowF" = dontDistribute super."ShowF";
+  "Shrub" = dontDistribute super."Shrub";
+  "Shu-thing" = dontDistribute super."Shu-thing";
+  "SimpleAES" = dontDistribute super."SimpleAES";
+  "SimpleEA" = dontDistribute super."SimpleEA";
+  "SimpleGL" = dontDistribute super."SimpleGL";
+  "SimpleH" = dontDistribute super."SimpleH";
+  "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
+  "SizeCompare" = dontDistribute super."SizeCompare";
+  "Slides" = dontDistribute super."Slides";
+  "Smooth" = dontDistribute super."Smooth";
+  "SmtLib" = dontDistribute super."SmtLib";
+  "Snusmumrik" = dontDistribute super."Snusmumrik";
+  "SoOSiM" = dontDistribute super."SoOSiM";
+  "SoccerFun" = dontDistribute super."SoccerFun";
+  "SoccerFunGL" = dontDistribute super."SoccerFunGL";
+  "Sonnex" = dontDistribute super."Sonnex";
+  "SourceGraph" = dontDistribute super."SourceGraph";
+  "Southpaw" = dontDistribute super."Southpaw";
+  "SpaceInvaders" = dontDistribute super."SpaceInvaders";
+  "SpacePrivateers" = dontDistribute super."SpacePrivateers";
+  "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "SpreadsheetML" = dontDistribute super."SpreadsheetML";
+  "Sprig" = dontDistribute super."Sprig";
+  "Stasis" = dontDistribute super."Stasis";
+  "StateVar-transformer" = dontDistribute super."StateVar-transformer";
+  "StatisticalMethods" = dontDistribute super."StatisticalMethods";
+  "Stomp" = dontDistribute super."Stomp";
+  "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib";
+  "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "Stream" = dontDistribute super."Stream";
+  "StrictBench" = dontDistribute super."StrictBench";
+  "SuffixStructures" = dontDistribute super."SuffixStructures";
+  "SybWidget" = dontDistribute super."SybWidget";
+  "SyntaxMacros" = dontDistribute super."SyntaxMacros";
+  "Sysmon" = dontDistribute super."Sysmon";
+  "TBC" = dontDistribute super."TBC";
+  "TBit" = dontDistribute super."TBit";
+  "THEff" = dontDistribute super."THEff";
+  "TTTAS" = dontDistribute super."TTTAS";
+  "TV" = dontDistribute super."TV";
+  "TYB" = dontDistribute super."TYB";
+  "TableAlgebra" = dontDistribute super."TableAlgebra";
+  "Tables" = dontDistribute super."Tables";
+  "Tablify" = dontDistribute super."Tablify";
+  "Tainted" = dontDistribute super."Tainted";
+  "Takusen" = dontDistribute super."Takusen";
+  "Tape" = dontDistribute super."Tape";
+  "TeaHS" = dontDistribute super."TeaHS";
+  "Tensor" = dontDistribute super."Tensor";
+  "TernaryTrees" = dontDistribute super."TernaryTrees";
+  "TestExplode" = dontDistribute super."TestExplode";
+  "Theora" = dontDistribute super."Theora";
+  "Thingie" = dontDistribute super."Thingie";
+  "ThreadObjects" = dontDistribute super."ThreadObjects";
+  "Thrift" = dontDistribute super."Thrift";
+  "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe";
+  "TicTacToe" = dontDistribute super."TicTacToe";
+  "TigerHash" = dontDistribute super."TigerHash";
+  "TimePiece" = dontDistribute super."TimePiece";
+  "TinyLaunchbury" = dontDistribute super."TinyLaunchbury";
+  "TinyURL" = dontDistribute super."TinyURL";
+  "Titim" = dontDistribute super."Titim";
+  "Top" = dontDistribute super."Top";
+  "Tournament" = dontDistribute super."Tournament";
+  "TraceUtils" = dontDistribute super."TraceUtils";
+  "TransformersStepByStep" = dontDistribute super."TransformersStepByStep";
+  "Transhare" = dontDistribute super."Transhare";
+  "TreeCounter" = dontDistribute super."TreeCounter";
+  "TreeStructures" = dontDistribute super."TreeStructures";
+  "TreeT" = dontDistribute super."TreeT";
+  "Treiber" = dontDistribute super."Treiber";
+  "TrendGraph" = dontDistribute super."TrendGraph";
+  "TrieMap" = dontDistribute super."TrieMap";
+  "Twofish" = dontDistribute super."Twofish";
+  "TypeClass" = dontDistribute super."TypeClass";
+  "TypeCompose" = dontDistribute super."TypeCompose";
+  "TypeIlluminator" = dontDistribute super."TypeIlluminator";
+  "TypeNat" = dontDistribute super."TypeNat";
+  "TypingTester" = dontDistribute super."TypingTester";
+  "UISF" = dontDistribute super."UISF";
+  "UMM" = dontDistribute super."UMM";
+  "URLT" = dontDistribute super."URLT";
+  "URLb" = dontDistribute super."URLb";
+  "UTFTConverter" = dontDistribute super."UTFTConverter";
+  "Unique" = dontDistribute super."Unique";
+  "Unixutils-shadow" = dontDistribute super."Unixutils-shadow";
+  "Updater" = dontDistribute super."Updater";
+  "UrlDisp" = dontDistribute super."UrlDisp";
+  "Useful" = dontDistribute super."Useful";
+  "UtilityTM" = dontDistribute super."UtilityTM";
+  "VKHS" = dontDistribute super."VKHS";
+  "Validation" = dontDistribute super."Validation";
+  "Vec" = dontDistribute super."Vec";
+  "Vec-Boolean" = dontDistribute super."Vec-Boolean";
+  "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
+  "Vec-Transform" = dontDistribute super."Vec-Transform";
+  "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "Vulkan" = dontDistribute super."Vulkan";
+  "WAVE" = dontDistribute super."WAVE";
+  "WL500gPControl" = dontDistribute super."WL500gPControl";
+  "WL500gPLib" = dontDistribute super."WL500gPLib";
+  "WMSigner" = dontDistribute super."WMSigner";
+  "WURFL" = dontDistribute super."WURFL";
+  "WXDiffCtrl" = dontDistribute super."WXDiffCtrl";
+  "WashNGo" = dontDistribute super."WashNGo";
+  "WaveFront" = dontDistribute super."WaveFront";
+  "Weather" = dontDistribute super."Weather";
+  "WebBits" = dontDistribute super."WebBits";
+  "WebBits-Html" = dontDistribute super."WebBits-Html";
+  "WebBits-multiplate" = dontDistribute super."WebBits-multiplate";
+  "WebCont" = dontDistribute super."WebCont";
+  "WeberLogic" = dontDistribute super."WeberLogic";
+  "Webrexp" = dontDistribute super."Webrexp";
+  "Wheb" = dontDistribute super."Wheb";
+  "WikimediaParser" = dontDistribute super."WikimediaParser";
+  "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server";
+  "Win32-errors" = dontDistribute super."Win32-errors";
+  "Win32-junction-point" = dontDistribute super."Win32-junction-point";
+  "Win32-security" = dontDistribute super."Win32-security";
+  "Win32-services" = dontDistribute super."Win32-services";
+  "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper";
+  "Wired" = dontDistribute super."Wired";
+  "WordAlignment" = dontDistribute super."WordAlignment";
+  "WordNet" = dontDistribute super."WordNet";
+  "WordNet-ghc74" = dontDistribute super."WordNet-ghc74";
+  "Wordlint" = dontDistribute super."Wordlint";
+  "WxGeneric" = dontDistribute super."WxGeneric";
+  "X11-extras" = dontDistribute super."X11-extras";
+  "X11-rm" = dontDistribute super."X11-rm";
+  "X11-xdamage" = dontDistribute super."X11-xdamage";
+  "X11-xfixes" = dontDistribute super."X11-xfixes";
+  "X11-xft" = dontDistribute super."X11-xft";
+  "X11-xshape" = dontDistribute super."X11-xshape";
+  "XAttr" = dontDistribute super."XAttr";
+  "XInput" = dontDistribute super."XInput";
+  "XMMS" = dontDistribute super."XMMS";
+  "XMPP" = dontDistribute super."XMPP";
+  "XSaiga" = dontDistribute super."XSaiga";
+  "Xec" = dontDistribute super."Xec";
+  "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter";
+  "Xorshift128Plus" = dontDistribute super."Xorshift128Plus";
+  "YACPong" = dontDistribute super."YACPong";
+  "YFrob" = dontDistribute super."YFrob";
+  "Yablog" = dontDistribute super."Yablog";
+  "YamlReference" = dontDistribute super."YamlReference";
+  "Yampa-core" = dontDistribute super."Yampa-core";
+  "Yocto" = dontDistribute super."Yocto";
+  "Yogurt" = dontDistribute super."Yogurt";
+  "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone";
+  "ZEBEDDE" = dontDistribute super."ZEBEDDE";
+  "ZFS" = dontDistribute super."ZFS";
+  "ZMachine" = dontDistribute super."ZMachine";
+  "ZipFold" = dontDistribute super."ZipFold";
+  "ZipperAG" = dontDistribute super."ZipperAG";
+  "Zora" = dontDistribute super."Zora";
+  "Zwaluw" = dontDistribute super."Zwaluw";
+  "a50" = dontDistribute super."a50";
+  "abacate" = dontDistribute super."abacate";
+  "abc-puzzle" = dontDistribute super."abc-puzzle";
+  "abcBridge" = dontDistribute super."abcBridge";
+  "abcnotation" = dontDistribute super."abcnotation";
+  "abeson" = dontDistribute super."abeson";
+  "abstract-deque-tests" = dontDistribute super."abstract-deque-tests";
+  "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate";
+  "abt" = dontDistribute super."abt";
+  "ac-machine" = dontDistribute super."ac-machine";
+  "ac-machine-conduit" = dontDistribute super."ac-machine-conduit";
+  "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic";
+  "accelerate-cublas" = dontDistribute super."accelerate-cublas";
+  "accelerate-cuda" = dontDistribute super."accelerate-cuda";
+  "accelerate-cufft" = dontDistribute super."accelerate-cufft";
+  "accelerate-examples" = dontDistribute super."accelerate-examples";
+  "accelerate-fft" = dontDistribute super."accelerate-fft";
+  "accelerate-fftw" = dontDistribute super."accelerate-fftw";
+  "accelerate-fourier" = dontDistribute super."accelerate-fourier";
+  "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark";
+  "accelerate-io" = dontDistribute super."accelerate-io";
+  "accelerate-random" = dontDistribute super."accelerate-random";
+  "accelerate-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "acid-state-dist" = dontDistribute super."acid-state-dist";
+  "acid-state-tls" = dontDistribute super."acid-state-tls";
+  "acl2" = dontDistribute super."acl2";
+  "acme-all-monad" = dontDistribute super."acme-all-monad";
+  "acme-box" = dontDistribute super."acme-box";
+  "acme-cadre" = dontDistribute super."acme-cadre";
+  "acme-cofunctor" = dontDistribute super."acme-cofunctor";
+  "acme-colosson" = dontDistribute super."acme-colosson";
+  "acme-comonad" = dontDistribute super."acme-comonad";
+  "acme-cutegirl" = dontDistribute super."acme-cutegirl";
+  "acme-dont" = dontDistribute super."acme-dont";
+  "acme-flipping-tables" = dontDistribute super."acme-flipping-tables";
+  "acme-grawlix" = dontDistribute super."acme-grawlix";
+  "acme-hq9plus" = dontDistribute super."acme-hq9plus";
+  "acme-http" = dontDistribute super."acme-http";
+  "acme-inator" = dontDistribute super."acme-inator";
+  "acme-io" = dontDistribute super."acme-io";
+  "acme-lolcat" = dontDistribute super."acme-lolcat";
+  "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
+  "acme-memorandom" = dontDistribute super."acme-memorandom";
+  "acme-microwave" = dontDistribute super."acme-microwave";
+  "acme-miscorder" = dontDistribute super."acme-miscorder";
+  "acme-missiles" = dontDistribute super."acme-missiles";
+  "acme-now" = dontDistribute super."acme-now";
+  "acme-numbersystem" = dontDistribute super."acme-numbersystem";
+  "acme-omitted" = dontDistribute super."acme-omitted";
+  "acme-one" = dontDistribute super."acme-one";
+  "acme-operators" = dontDistribute super."acme-operators";
+  "acme-php" = dontDistribute super."acme-php";
+  "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers";
+  "acme-realworld" = dontDistribute super."acme-realworld";
+  "acme-safe" = dontDistribute super."acme-safe";
+  "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel";
+  "acme-strfry" = dontDistribute super."acme-strfry";
+  "acme-stringly-typed" = dontDistribute super."acme-stringly-typed";
+  "acme-strtok" = dontDistribute super."acme-strtok";
+  "acme-timemachine" = dontDistribute super."acme-timemachine";
+  "acme-year" = dontDistribute super."acme-year";
+  "acme-zero" = dontDistribute super."acme-zero";
+  "activehs" = dontDistribute super."activehs";
+  "activehs-base" = dontDistribute super."activehs-base";
+  "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
+  "actor" = dontDistribute super."actor";
+  "adaptive-containers" = dontDistribute super."adaptive-containers";
+  "adaptive-tuple" = dontDistribute super."adaptive-tuple";
+  "adb" = dontDistribute super."adb";
+  "adblock2privoxy" = dontDistribute super."adblock2privoxy";
+  "addLicenseInfo" = dontDistribute super."addLicenseInfo";
+  "adhoc-network" = dontDistribute super."adhoc-network";
+  "adict" = dontDistribute super."adict";
+  "adler32" = dontDistribute super."adler32";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "aeson-schema" = dontDistribute super."aeson-schema";
+  "aeson-serialize" = dontDistribute super."aeson-serialize";
+  "aeson-smart" = dontDistribute super."aeson-smart";
+  "aeson-streams" = dontDistribute super."aeson-streams";
+  "aeson-t" = dontDistribute super."aeson-t";
+  "aeson-toolkit" = dontDistribute super."aeson-toolkit";
+  "aeson-value-parser" = dontDistribute super."aeson-value-parser";
+  "aeson-yak" = dontDistribute super."aeson-yak";
+  "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
+  "afis" = dontDistribute super."afis";
+  "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "agum" = dontDistribute super."agum";
+  "aig" = dontDistribute super."aig";
+  "air" = dontDistribute super."air";
+  "air-extra" = dontDistribute super."air-extra";
+  "air-spec" = dontDistribute super."air-spec";
+  "air-th" = dontDistribute super."air-th";
+  "airbrake" = dontDistribute super."airbrake";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-experiment" = dontDistribute super."aivika-experiment";
+  "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
+  "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
+  "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-transformers" = dontDistribute super."aivika-transformers";
+  "ajhc" = dontDistribute super."ajhc";
+  "al" = dontDistribute super."al";
+  "alea" = dontDistribute super."alea";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "ampersand" = dontDistribute super."ampersand";
+  "amqp-conduit" = dontDistribute super."amqp-conduit";
+  "amrun" = dontDistribute super."amrun";
+  "analyze-client" = dontDistribute super."analyze-client";
+  "anansi" = dontDistribute super."anansi";
+  "anansi-hscolour" = dontDistribute super."anansi-hscolour";
+  "anansi-pandoc" = dontDistribute super."anansi-pandoc";
+  "anatomy" = dontDistribute super."anatomy";
+  "android" = dontDistribute super."android";
+  "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "animalcase" = dontDistribute super."animalcase";
+  "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
+  "ansi-pretty" = dontDistribute super."ansi-pretty";
+  "ansigraph" = dontDistribute super."ansigraph";
+  "antagonist" = dontDistribute super."antagonist";
+  "antfarm" = dontDistribute super."antfarm";
+  "anticiv" = dontDistribute super."anticiv";
+  "antigate" = dontDistribute super."antigate";
+  "antimirov" = dontDistribute super."antimirov";
+  "antiquoter" = dontDistribute super."antiquoter";
+  "antisplice" = dontDistribute super."antisplice";
+  "antlrc" = dontDistribute super."antlrc";
+  "anydbm" = dontDistribute super."anydbm";
+  "aosd" = dontDistribute super."aosd";
+  "ap-reflect" = dontDistribute super."ap-reflect";
+  "apache-md5" = dontDistribute super."apache-md5";
+  "apelsin" = dontDistribute super."apelsin";
+  "api-builder" = dontDistribute super."api-builder";
+  "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
+  "api-tools" = dontDistribute super."api-tools";
+  "apiary-helics" = dontDistribute super."apiary-helics";
+  "apiary-purescript" = dontDistribute super."apiary-purescript";
+  "apis" = dontDistribute super."apis";
+  "apotiki" = dontDistribute super."apotiki";
+  "app-lens" = dontDistribute super."app-lens";
+  "appc" = dontDistribute super."appc";
+  "applicative-extras" = dontDistribute super."applicative-extras";
+  "applicative-fail" = dontDistribute super."applicative-fail";
+  "applicative-numbers" = dontDistribute super."applicative-numbers";
+  "applicative-parsec" = dontDistribute super."applicative-parsec";
+  "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
+  "apportionment" = dontDistribute super."apportionment";
+  "approx-rand-test" = dontDistribute super."approx-rand-test";
+  "approximate-equality" = dontDistribute super."approximate-equality";
+  "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
+  "arb-fft" = dontDistribute super."arb-fft";
+  "arbb-vm" = dontDistribute super."arbb-vm";
+  "archive" = dontDistribute super."archive";
+  "archiver" = dontDistribute super."archiver";
+  "archlinux" = dontDistribute super."archlinux";
+  "archlinux-web" = dontDistribute super."archlinux-web";
+  "archnews" = dontDistribute super."archnews";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon2" = dontDistribute super."argon2";
+  "argparser" = dontDistribute super."argparser";
+  "arguedit" = dontDistribute super."arguedit";
+  "ariadne" = dontDistribute super."ariadne";
+  "arion" = dontDistribute super."arion";
+  "arith-encode" = dontDistribute super."arith-encode";
+  "arithmatic" = dontDistribute super."arithmatic";
+  "arithmetic" = dontDistribute super."arithmetic";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "armada" = dontDistribute super."armada";
+  "arpa" = dontDistribute super."arpa";
+  "array-forth" = dontDistribute super."array-forth";
+  "array-memoize" = dontDistribute super."array-memoize";
+  "array-primops" = dontDistribute super."array-primops";
+  "array-utils" = dontDistribute super."array-utils";
+  "arrow-improve" = dontDistribute super."arrow-improve";
+  "arrowapply-utils" = dontDistribute super."arrowapply-utils";
+  "arrowp" = dontDistribute super."arrowp";
+  "arrows" = dontDistribute super."arrows";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asic" = dontDistribute super."asic";
+  "asil" = dontDistribute super."asil";
+  "asn1-data" = dontDistribute super."asn1-data";
+  "asn1dump" = dontDistribute super."asn1dump";
+  "assembler" = dontDistribute super."assembler";
+  "assert" = dontDistribute super."assert";
+  "assert-failure" = dontDistribute super."assert-failure";
+  "assertions" = dontDistribute super."assertions";
+  "assimp" = dontDistribute super."assimp";
+  "astar" = dontDistribute super."astar";
+  "astrds" = dontDistribute super."astrds";
+  "astview" = dontDistribute super."astview";
+  "astview-utils" = dontDistribute super."astview-utils";
+  "async-extras" = dontDistribute super."async-extras";
+  "async-manager" = dontDistribute super."async-manager";
+  "async-pool" = dontDistribute super."async-pool";
+  "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions";
+  "aterm" = dontDistribute super."aterm";
+  "aterm-utils" = dontDistribute super."aterm-utils";
+  "atl" = dontDistribute super."atl";
+  "atlassian-connect-core" = dontDistribute super."atlassian-connect-core";
+  "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor";
+  "atmos" = dontDistribute super."atmos";
+  "atmos-dimensional" = dontDistribute super."atmos-dimensional";
+  "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atom" = dontDistribute super."atom";
+  "atom-basic" = dontDistribute super."atom-basic";
+  "atom-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "atomo" = dontDistribute super."atomo";
+  "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec-arff" = dontDistribute super."attoparsec-arff";
+  "attoparsec-binary" = dontDistribute super."attoparsec-binary";
+  "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
+  "attoparsec-csv" = dontDistribute super."attoparsec-csv";
+  "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee";
+  "attoparsec-parsec" = dontDistribute super."attoparsec-parsec";
+  "attoparsec-text" = dontDistribute super."attoparsec-text";
+  "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator";
+  "attosplit" = dontDistribute super."attosplit";
+  "atuin" = dontDistribute super."atuin";
+  "audacity" = dontDistribute super."audacity";
+  "audiovisual" = dontDistribute super."audiovisual";
+  "augeas" = dontDistribute super."augeas";
+  "augur" = dontDistribute super."augur";
+  "aur" = dontDistribute super."aur";
+  "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
+  "authenticate-ldap" = dontDistribute super."authenticate-ldap";
+  "authinfo-hs" = dontDistribute super."authinfo-hs";
+  "authoring" = dontDistribute super."authoring";
+  "autonix-deps" = dontDistribute super."autonix-deps";
+  "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
+  "autoproc" = dontDistribute super."autoproc";
+  "avahi" = dontDistribute super."avahi";
+  "avatar-generator" = dontDistribute super."avatar-generator";
+  "average" = dontDistribute super."average";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer";
+  "aws-configuration-tools" = dontDistribute super."aws-configuration-tools";
+  "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit";
+  "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams";
+  "aws-ec2" = dontDistribute super."aws-ec2";
+  "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder";
+  "aws-general" = dontDistribute super."aws-general";
+  "aws-kinesis" = dontDistribute super."aws-kinesis";
+  "aws-kinesis-client" = dontDistribute super."aws-kinesis-client";
+  "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard";
+  "aws-lambda" = dontDistribute super."aws-lambda";
+  "aws-performance-tests" = dontDistribute super."aws-performance-tests";
+  "aws-route53" = dontDistribute super."aws-route53";
+  "aws-sdk" = dontDistribute super."aws-sdk";
+  "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter";
+  "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered";
+  "aws-sign4" = dontDistribute super."aws-sign4";
+  "aws-sns" = dontDistribute super."aws-sns";
+  "azure-acs" = dontDistribute super."azure-acs";
+  "azure-service-api" = dontDistribute super."azure-service-api";
+  "azure-servicebus" = dontDistribute super."azure-servicebus";
+  "azurify" = dontDistribute super."azurify";
+  "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
+  "babylon" = dontDistribute super."babylon";
+  "backdropper" = dontDistribute super."backdropper";
+  "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
+  "backward-state" = dontDistribute super."backward-state";
+  "bacteria" = dontDistribute super."bacteria";
+  "bag" = dontDistribute super."bag";
+  "bamboo" = dontDistribute super."bamboo";
+  "bamboo-launcher" = dontDistribute super."bamboo-launcher";
+  "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight";
+  "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo";
+  "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint";
+  "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
+  "bamse" = dontDistribute super."bamse";
+  "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
+  "banwords" = dontDistribute super."banwords";
+  "barchart" = dontDistribute super."barchart";
+  "barcodes-code128" = dontDistribute super."barcodes-code128";
+  "barecheck" = dontDistribute super."barecheck";
+  "barley" = dontDistribute super."barley";
+  "barrie" = dontDistribute super."barrie";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base-orphans" = doDistribute super."base-orphans_0_5_0";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "benchmark-function" = dontDistribute super."benchmark-function";
+  "bencoding" = dontDistribute super."bencoding";
+  "berkeleydb" = dontDistribute super."berkeleydb";
+  "berp" = dontDistribute super."berp";
+  "bert" = dontDistribute super."bert";
+  "besout" = dontDistribute super."besout";
+  "bet" = dontDistribute super."bet";
+  "betacode" = dontDistribute super."betacode";
+  "between" = dontDistribute super."between";
+  "bf-cata" = dontDistribute super."bf-cata";
+  "bff" = dontDistribute super."bff";
+  "bff-mono" = dontDistribute super."bff-mono";
+  "bgmax" = dontDistribute super."bgmax";
+  "bgzf" = dontDistribute super."bgzf";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
+  "billboard-parser" = dontDistribute super."billboard-parser";
+  "billeksah-forms" = dontDistribute super."billeksah-forms";
+  "billeksah-main" = dontDistribute super."billeksah-main";
+  "billeksah-main-static" = dontDistribute super."billeksah-main-static";
+  "billeksah-pane" = dontDistribute super."billeksah-pane";
+  "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-bits" = dontDistribute super."binary-bits";
+  "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-derive" = dontDistribute super."binary-derive";
+  "binary-enum" = dontDistribute super."binary-enum";
+  "binary-file" = dontDistribute super."binary-file";
+  "binary-generic" = dontDistribute super."binary-generic";
+  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
+  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-protocol" = dontDistribute super."binary-protocol";
+  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-shared" = dontDistribute super."binary-shared";
+  "binary-state" = dontDistribute super."binary-state";
+  "binary-store" = dontDistribute super."binary-store";
+  "binary-streams" = dontDistribute super."binary-streams";
+  "binary-strict" = dontDistribute super."binary-strict";
+  "binarydefer" = dontDistribute super."binarydefer";
+  "bind-marshal" = dontDistribute super."bind-marshal";
+  "binding-core" = dontDistribute super."binding-core";
+  "binding-gtk" = dontDistribute super."binding-gtk";
+  "binding-wx" = dontDistribute super."binding-wx";
+  "bindings" = dontDistribute super."bindings";
+  "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-K8055" = dontDistribute super."bindings-K8055";
+  "bindings-apr" = dontDistribute super."bindings-apr";
+  "bindings-apr-util" = dontDistribute super."bindings-apr-util";
+  "bindings-audiofile" = dontDistribute super."bindings-audiofile";
+  "bindings-bfd" = dontDistribute super."bindings-bfd";
+  "bindings-cctools" = dontDistribute super."bindings-cctools";
+  "bindings-codec2" = dontDistribute super."bindings-codec2";
+  "bindings-common" = dontDistribute super."bindings-common";
+  "bindings-dc1394" = dontDistribute super."bindings-dc1394";
+  "bindings-directfb" = dontDistribute super."bindings-directfb";
+  "bindings-eskit" = dontDistribute super."bindings-eskit";
+  "bindings-fann" = dontDistribute super."bindings-fann";
+  "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth";
+  "bindings-friso" = dontDistribute super."bindings-friso";
+  "bindings-glib" = dontDistribute super."bindings-glib";
+  "bindings-gobject" = dontDistribute super."bindings-gobject";
+  "bindings-gpgme" = dontDistribute super."bindings-gpgme";
+  "bindings-gsl" = dontDistribute super."bindings-gsl";
+  "bindings-gts" = dontDistribute super."bindings-gts";
+  "bindings-hamlib" = dontDistribute super."bindings-hamlib";
+  "bindings-hdf5" = dontDistribute super."bindings-hdf5";
+  "bindings-levmar" = dontDistribute super."bindings-levmar";
+  "bindings-libcddb" = dontDistribute super."bindings-libcddb";
+  "bindings-libffi" = dontDistribute super."bindings-libffi";
+  "bindings-libftdi" = dontDistribute super."bindings-libftdi";
+  "bindings-librrd" = dontDistribute super."bindings-librrd";
+  "bindings-libstemmer" = dontDistribute super."bindings-libstemmer";
+  "bindings-libusb" = dontDistribute super."bindings-libusb";
+  "bindings-libv4l2" = dontDistribute super."bindings-libv4l2";
+  "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2";
+  "bindings-lxc" = dontDistribute super."bindings-lxc";
+  "bindings-mmap" = dontDistribute super."bindings-mmap";
+  "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal";
+  "bindings-nettle" = dontDistribute super."bindings-nettle";
+  "bindings-parport" = dontDistribute super."bindings-parport";
+  "bindings-portaudio" = dontDistribute super."bindings-portaudio";
+  "bindings-potrace" = dontDistribute super."bindings-potrace";
+  "bindings-ppdev" = dontDistribute super."bindings-ppdev";
+  "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd";
+  "bindings-sane" = dontDistribute super."bindings-sane";
+  "bindings-sc3" = dontDistribute super."bindings-sc3";
+  "bindings-sipc" = dontDistribute super."bindings-sipc";
+  "bindings-sophia" = dontDistribute super."bindings-sophia";
+  "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
+  "bindings-svm" = dontDistribute super."bindings-svm";
+  "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-yices" = dontDistribute super."bindings-yices";
+  "bindynamic" = dontDistribute super."bindynamic";
+  "binembed" = dontDistribute super."binembed";
+  "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
+  "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biosff" = dontDistribute super."biosff";
+  "biostockholm" = dontDistribute super."biostockholm";
+  "bird" = dontDistribute super."bird";
+  "bit-array" = dontDistribute super."bit-array";
+  "bit-vector" = dontDistribute super."bit-vector";
+  "bitarray" = dontDistribute super."bitarray";
+  "bitcoin-rpc" = dontDistribute super."bitcoin-rpc";
+  "bitly-cli" = dontDistribute super."bitly-cli";
+  "bitmap" = dontDistribute super."bitmap";
+  "bitmap-opengl" = dontDistribute super."bitmap-opengl";
+  "bitmaps" = dontDistribute super."bitmaps";
+  "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-conduit" = dontDistribute super."bits-conduit";
+  "bits-extras" = dontDistribute super."bits-extras";
+  "bitset" = dontDistribute super."bitset";
+  "bitspeak" = dontDistribute super."bitspeak";
+  "bitstream" = dontDistribute super."bitstream";
+  "bitstring" = dontDistribute super."bitstring";
+  "bittorrent" = dontDistribute super."bittorrent";
+  "bitvec" = dontDistribute super."bitvec";
+  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
+  "bk-tree" = dontDistribute super."bk-tree";
+  "bkr" = dontDistribute super."bkr";
+  "bktrees" = dontDistribute super."bktrees";
+  "bla" = dontDistribute super."bla";
+  "black-jewel" = dontDistribute super."black-jewel";
+  "blacktip" = dontDistribute super."blacktip";
+  "blakesum" = dontDistribute super."blakesum";
+  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blas" = dontDistribute super."blas";
+  "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
+  "blaze-from-html" = dontDistribute super."blaze-from-html";
+  "blaze-html-contrib" = dontDistribute super."blaze-html-contrib";
+  "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat";
+  "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
+  "blaze-json" = dontDistribute super."blaze-json";
+  "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-textual-native" = dontDistribute super."blaze-textual-native";
+  "blazeMarker" = dontDistribute super."blazeMarker";
+  "blink1" = dontDistribute super."blink1";
+  "blip" = dontDistribute super."blip";
+  "bliplib" = dontDistribute super."bliplib";
+  "blocking-transactions" = dontDistribute super."blocking-transactions";
+  "blogination" = dontDistribute super."blogination";
+  "bloodhound" = dontDistribute super."bloodhound";
+  "bloxorz" = dontDistribute super."bloxorz";
+  "blubber" = dontDistribute super."blubber";
+  "blubber-server" = dontDistribute super."blubber-server";
+  "bluetile" = dontDistribute super."bluetile";
+  "bluetileutils" = dontDistribute super."bluetileutils";
+  "blunt" = dontDistribute super."blunt";
+  "board-games" = dontDistribute super."board-games";
+  "bogre-banana" = dontDistribute super."bogre-banana";
+  "bond" = dontDistribute super."bond";
+  "boolean-list" = dontDistribute super."boolean-list";
+  "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
+  "boolexpr" = dontDistribute super."boolexpr";
+  "bools" = dontDistribute super."bools";
+  "boolsimplifier" = dontDistribute super."boolsimplifier";
+  "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "botpp" = dontDistribute super."botpp";
+  "bound-gen" = dontDistribute super."bound-gen";
+  "bounded-tchan" = dontDistribute super."bounded-tchan";
+  "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
+  "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
+  "brainfuck" = dontDistribute super."brainfuck";
+  "brainfuck-monad" = dontDistribute super."brainfuck-monad";
+  "brainfuck-tut" = dontDistribute super."brainfuck-tut";
+  "break" = dontDistribute super."break";
+  "breakout" = dontDistribute super."breakout";
+  "breve" = dontDistribute super."breve";
+  "brians-brain" = dontDistribute super."brians-brain";
+  "brillig" = dontDistribute super."brillig";
+  "broccoli" = dontDistribute super."broccoli";
+  "broker-haskell" = dontDistribute super."broker-haskell";
+  "bsd-sysctl" = dontDistribute super."bsd-sysctl";
+  "bson-generic" = dontDistribute super."bson-generic";
+  "bson-generics" = dontDistribute super."bson-generics";
+  "bson-mapping" = dontDistribute super."bson-mapping";
+  "bspack" = dontDistribute super."bspack";
+  "bsparse" = dontDistribute super."bsparse";
+  "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
+  "buffon" = dontDistribute super."buffon";
+  "bugzilla" = dontDistribute super."bugzilla";
+  "buildable" = dontDistribute super."buildable";
+  "buildbox" = dontDistribute super."buildbox";
+  "buildbox-tools" = dontDistribute super."buildbox-tools";
+  "buildwrapper" = dontDistribute super."buildwrapper";
+  "bullet" = dontDistribute super."bullet";
+  "burst-detection" = dontDistribute super."burst-detection";
+  "bus-pirate" = dontDistribute super."bus-pirate";
+  "buster" = dontDistribute super."buster";
+  "buster-gtk" = dontDistribute super."buster-gtk";
+  "buster-network" = dontDistribute super."buster-network";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
+  "bytestring-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-nums" = dontDistribute super."bytestring-nums";
+  "bytestring-plain" = dontDistribute super."bytestring-plain";
+  "bytestring-rematch" = dontDistribute super."bytestring-rematch";
+  "bytestring-short" = dontDistribute super."bytestring-short";
+  "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "c-dsl" = dontDistribute super."c-dsl";
+  "c-io" = dontDistribute super."c-io";
+  "c-storable-deriving" = dontDistribute super."c-storable-deriving";
+  "c0check" = dontDistribute super."c0check";
+  "c0parser" = dontDistribute super."c0parser";
+  "c10k" = dontDistribute super."c10k";
+  "c2hsc" = dontDistribute super."c2hsc";
+  "cab" = dontDistribute super."cab";
+  "cabal-audit" = dontDistribute super."cabal-audit";
+  "cabal-bounds" = dontDistribute super."cabal-bounds";
+  "cabal-cargs" = dontDistribute super."cabal-cargs";
+  "cabal-constraints" = dontDistribute super."cabal-constraints";
+  "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "cabal-dev" = dontDistribute super."cabal-dev";
+  "cabal-dir" = dontDistribute super."cabal-dir";
+  "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
+  "cabal-ghci" = dontDistribute super."cabal-ghci";
+  "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
+  "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
+  "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
+  "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
+  "cabal-lenses" = dontDistribute super."cabal-lenses";
+  "cabal-macosx" = dontDistribute super."cabal-macosx";
+  "cabal-meta" = dontDistribute super."cabal-meta";
+  "cabal-mon" = dontDistribute super."cabal-mon";
+  "cabal-nirvana" = dontDistribute super."cabal-nirvana";
+  "cabal-progdeps" = dontDistribute super."cabal-progdeps";
+  "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-scripts" = dontDistribute super."cabal-scripts";
+  "cabal-setup" = dontDistribute super."cabal-setup";
+  "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-test" = dontDistribute super."cabal-test";
+  "cabal-test-bin" = dontDistribute super."cabal-test-bin";
+  "cabal-test-compat" = dontDistribute super."cabal-test-compat";
+  "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck";
+  "cabal-uninstall" = dontDistribute super."cabal-uninstall";
+  "cabal-upload" = dontDistribute super."cabal-upload";
+  "cabal2arch" = dontDistribute super."cabal2arch";
+  "cabal2doap" = dontDistribute super."cabal2doap";
+  "cabal2ebuild" = dontDistribute super."cabal2ebuild";
+  "cabal2ghci" = dontDistribute super."cabal2ghci";
+  "cabal2nix" = dontDistribute super."cabal2nix";
+  "cabal2spec" = dontDistribute super."cabal2spec";
+  "cabalQuery" = dontDistribute super."cabalQuery";
+  "cabalg" = dontDistribute super."cabalg";
+  "cabalgraph" = dontDistribute super."cabalgraph";
+  "cabalmdvrpm" = dontDistribute super."cabalmdvrpm";
+  "cabalrpmdeps" = dontDistribute super."cabalrpmdeps";
+  "cabalvchk" = dontDistribute super."cabalvchk";
+  "cabin" = dontDistribute super."cabin";
+  "cabocha" = dontDistribute super."cabocha";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "cairo-appbase" = dontDistribute super."cairo-appbase";
+  "cake" = dontDistribute super."cake";
+  "cake3" = dontDistribute super."cake3";
+  "cakyrespa" = dontDistribute super."cakyrespa";
+  "cal3d" = dontDistribute super."cal3d";
+  "cal3d-examples" = dontDistribute super."cal3d-examples";
+  "cal3d-opengl" = dontDistribute super."cal3d-opengl";
+  "calc" = dontDistribute super."calc";
+  "caldims" = dontDistribute super."caldims";
+  "caledon" = dontDistribute super."caledon";
+  "call" = dontDistribute super."call";
+  "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything";
+  "camh" = dontDistribute super."camh";
+  "campfire" = dontDistribute super."campfire";
+  "canonical-filepath" = dontDistribute super."canonical-filepath";
+  "canteven-config" = dontDistribute super."canteven-config";
+  "canteven-listen-http" = dontDistribute super."canteven-listen-http";
+  "canteven-log" = dontDistribute super."canteven-log";
+  "canteven-template" = dontDistribute super."canteven-template";
+  "cantor" = dontDistribute super."cantor";
+  "cao" = dontDistribute super."cao";
+  "cap" = dontDistribute super."cap";
+  "capped-list" = dontDistribute super."capped-list";
+  "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
+  "caramia" = dontDistribute super."caramia";
+  "carboncopy" = dontDistribute super."carboncopy";
+  "carettah" = dontDistribute super."carettah";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
+  "casadi-bindings" = dontDistribute super."casadi-bindings";
+  "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
+  "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
+  "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal";
+  "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface";
+  "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
+  "cascading" = dontDistribute super."cascading";
+  "case-conversion" = dontDistribute super."case-conversion";
+  "cash" = dontDistribute super."cash";
+  "casing" = dontDistribute super."casing";
+  "cassandra-cql" = dontDistribute super."cassandra-cql";
+  "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava-conduit" = dontDistribute super."cassava-conduit";
+  "cassava-streams" = dontDistribute super."cassava-streams";
+  "cassette" = dontDistribute super."cassette";
+  "cassy" = dontDistribute super."cassy";
+  "castle" = dontDistribute super."castle";
+  "casui" = dontDistribute super."casui";
+  "catamorphism" = dontDistribute super."catamorphism";
+  "catch-fd" = dontDistribute super."catch-fd";
+  "categorical-algebra" = dontDistribute super."categorical-algebra";
+  "categories" = dontDistribute super."categories";
+  "category-extras" = dontDistribute super."category-extras";
+  "cayley-dickson" = dontDistribute super."cayley-dickson";
+  "cblrepo" = dontDistribute super."cblrepo";
+  "cci" = dontDistribute super."cci";
+  "ccnx" = dontDistribute super."ccnx";
+  "cctools-workqueue" = dontDistribute super."cctools-workqueue";
+  "cedict" = dontDistribute super."cedict";
+  "cef" = dontDistribute super."cef";
+  "ceilometer-common" = dontDistribute super."ceilometer-common";
+  "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
+  "cerberus" = dontDistribute super."cerberus";
+  "cereal-derive" = dontDistribute super."cereal-derive";
+  "cereal-enumerator" = dontDistribute super."cereal-enumerator";
+  "cereal-ieee754" = dontDistribute super."cereal-ieee754";
+  "cereal-plus" = dontDistribute super."cereal-plus";
+  "cereal-text" = dontDistribute super."cereal-text";
+  "certificate" = dontDistribute super."certificate";
+  "cf" = dontDistribute super."cf";
+  "cfipu" = dontDistribute super."cfipu";
+  "cflp" = dontDistribute super."cflp";
+  "cfopu" = dontDistribute super."cfopu";
+  "cg" = dontDistribute super."cg";
+  "cgen" = dontDistribute super."cgen";
+  "cgi-undecidable" = dontDistribute super."cgi-undecidable";
+  "cgi-utils" = dontDistribute super."cgi-utils";
+  "cgrep" = dontDistribute super."cgrep";
+  "chain-codes" = dontDistribute super."chain-codes";
+  "chalk" = dontDistribute super."chalk";
+  "chalkboard" = dontDistribute super."chalkboard";
+  "chalkboard-viewer" = dontDistribute super."chalkboard-viewer";
+  "chalmers-lava2000" = dontDistribute super."chalmers-lava2000";
+  "chan-split" = dontDistribute super."chan-split";
+  "change-monger" = dontDistribute super."change-monger";
+  "charade" = dontDistribute super."charade";
+  "charsetdetect" = dontDistribute super."charsetdetect";
+  "chart-histogram" = dontDistribute super."chart-histogram";
+  "chaselev-deque" = dontDistribute super."chaselev-deque";
+  "chatter" = dontDistribute super."chatter";
+  "chatty" = dontDistribute super."chatty";
+  "chatty-text" = dontDistribute super."chatty-text";
+  "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
+  "check-pvp" = dontDistribute super."check-pvp";
+  "checked" = dontDistribute super."checked";
+  "chell-hunit" = dontDistribute super."chell-hunit";
+  "chesshs" = dontDistribute super."chesshs";
+  "chevalier-common" = dontDistribute super."chevalier-common";
+  "chp" = dontDistribute super."chp";
+  "chp-mtl" = dontDistribute super."chp-mtl";
+  "chp-plus" = dontDistribute super."chp-plus";
+  "chp-spec" = dontDistribute super."chp-spec";
+  "chp-transformers" = dontDistribute super."chp-transformers";
+  "chronograph" = dontDistribute super."chronograph";
+  "chu2" = dontDistribute super."chu2";
+  "chuchu" = dontDistribute super."chuchu";
+  "chunks" = dontDistribute super."chunks";
+  "chunky" = dontDistribute super."chunky";
+  "church-list" = dontDistribute super."church-list";
+  "cil" = dontDistribute super."cil";
+  "cinvoke" = dontDistribute super."cinvoke";
+  "cio" = dontDistribute super."cio";
+  "cipher-rc5" = dontDistribute super."cipher-rc5";
+  "ciphersaber2" = dontDistribute super."ciphersaber2";
+  "circ" = dontDistribute super."circ";
+  "cirru-parser" = dontDistribute super."cirru-parser";
+  "citation-resolve" = dontDistribute super."citation-resolve";
+  "citeproc-hs" = dontDistribute super."citeproc-hs";
+  "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter";
+  "cityhash" = dontDistribute super."cityhash";
+  "cjk" = dontDistribute super."cjk";
+  "clac" = dontDistribute super."clac";
+  "clafer" = dontDistribute super."clafer";
+  "claferIG" = dontDistribute super."claferIG";
+  "claferwiki" = dontDistribute super."claferwiki";
+  "clang-pure" = dontDistribute super."clang-pure";
+  "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
+  "clash" = dontDistribute super."clash";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
+  "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
+  "cld2" = dontDistribute super."cld2";
+  "clean-home" = dontDistribute super."clean-home";
+  "clean-unions" = dontDistribute super."clean-unions";
+  "cless" = dontDistribute super."cless";
+  "clevercss" = dontDistribute super."clevercss";
+  "cli" = dontDistribute super."cli";
+  "click-clack" = dontDistribute super."click-clack";
+  "clifford" = dontDistribute super."clifford";
+  "clippard" = dontDistribute super."clippard";
+  "clipper" = dontDistribute super."clipper";
+  "clippings" = dontDistribute super."clippings";
+  "clist" = dontDistribute super."clist";
+  "clocked" = dontDistribute super."clocked";
+  "clogparse" = dontDistribute super."clogparse";
+  "clone-all" = dontDistribute super."clone-all";
+  "closure" = dontDistribute super."closure";
+  "cloud-haskell" = dontDistribute super."cloud-haskell";
+  "cloudfront-signer" = dontDistribute super."cloudfront-signer";
+  "cloudyfs" = dontDistribute super."cloudyfs";
+  "cltw" = dontDistribute super."cltw";
+  "clua" = dontDistribute super."clua";
+  "cluss" = dontDistribute super."cluss";
+  "clustertools" = dontDistribute super."clustertools";
+  "clutterhs" = dontDistribute super."clutterhs";
+  "cmaes" = dontDistribute super."cmaes";
+  "cmath" = dontDistribute super."cmath";
+  "cmathml3" = dontDistribute super."cmathml3";
+  "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "cmu" = dontDistribute super."cmu";
+  "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
+  "cndict" = dontDistribute super."cndict";
+  "codec" = dontDistribute super."codec";
+  "codec-libevent" = dontDistribute super."codec-libevent";
+  "codec-mbox" = dontDistribute super."codec-mbox";
+  "codecov-haskell" = dontDistribute super."codecov-haskell";
+  "codemonitor" = dontDistribute super."codemonitor";
+  "codepad" = dontDistribute super."codepad";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "coinbase-exchange" = dontDistribute super."coinbase-exchange";
+  "colada" = dontDistribute super."colada";
+  "colchis" = dontDistribute super."colchis";
+  "collada-output" = dontDistribute super."collada-output";
+  "collada-types" = dontDistribute super."collada-types";
+  "collapse-util" = dontDistribute super."collapse-util";
+  "collection-json" = dontDistribute super."collection-json";
+  "collections" = dontDistribute super."collections";
+  "collections-api" = dontDistribute super."collections-api";
+  "collections-base-instances" = dontDistribute super."collections-base-instances";
+  "colock" = dontDistribute super."colock";
+  "colorize-haskell" = dontDistribute super."colorize-haskell";
+  "colors" = dontDistribute super."colors";
+  "coltrane" = dontDistribute super."coltrane";
+  "com" = dontDistribute super."com";
+  "combinat" = dontDistribute super."combinat";
+  "combinat-diagrams" = dontDistribute super."combinat-diagrams";
+  "combinator-interactive" = dontDistribute super."combinator-interactive";
+  "combinatorial-problems" = dontDistribute super."combinatorial-problems";
+  "combinatorics" = dontDistribute super."combinatorics";
+  "combobuffer" = dontDistribute super."combobuffer";
+  "comfort-graph" = dontDistribute super."comfort-graph";
+  "command" = dontDistribute super."command";
+  "command-qq" = dontDistribute super."command-qq";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "comonad-extras" = dontDistribute super."comonad-extras";
+  "comonad-random" = dontDistribute super."comonad-random";
+  "compact-map" = dontDistribute super."compact-map";
+  "compact-socket" = dontDistribute super."compact-socket";
+  "compact-string" = dontDistribute super."compact-string";
+  "compact-string-fix" = dontDistribute super."compact-string-fix";
+  "compare-type" = dontDistribute super."compare-type";
+  "compdata-automata" = dontDistribute super."compdata-automata";
+  "compdata-dags" = dontDistribute super."compdata-dags";
+  "compdata-param" = dontDistribute super."compdata-param";
+  "compensated" = dontDistribute super."compensated";
+  "competition" = dontDistribute super."competition";
+  "compilation" = dontDistribute super."compilation";
+  "complex-generic" = dontDistribute super."complex-generic";
+  "complex-integrate" = dontDistribute super."complex-integrate";
+  "complexity" = dontDistribute super."complexity";
+  "compose-ltr" = dontDistribute super."compose-ltr";
+  "compose-trans" = dontDistribute super."compose-trans";
+  "compression" = dontDistribute super."compression";
+  "compstrat" = dontDistribute super."compstrat";
+  "comptrans" = dontDistribute super."comptrans";
+  "computational-algebra" = dontDistribute super."computational-algebra";
+  "computations" = dontDistribute super."computations";
+  "conceit" = dontDistribute super."conceit";
+  "concorde" = dontDistribute super."concorde";
+  "concraft" = dontDistribute super."concraft";
+  "concraft-hr" = dontDistribute super."concraft-hr";
+  "concraft-pl" = dontDistribute super."concraft-pl";
+  "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser";
+  "concrete-typerep" = dontDistribute super."concrete-typerep";
+  "concurrent-barrier" = dontDistribute super."concurrent-barrier";
+  "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
+  "concurrent-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-sa" = dontDistribute super."concurrent-sa";
+  "concurrent-split" = dontDistribute super."concurrent-split";
+  "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-utilities" = dontDistribute super."concurrent-utilities";
+  "concurrentoutput" = dontDistribute super."concurrentoutput";
+  "cond" = dontDistribute super."cond";
+  "condor" = dontDistribute super."condor";
+  "condorcet" = dontDistribute super."condorcet";
+  "conductive-base" = dontDistribute super."conductive-base";
+  "conductive-clock" = dontDistribute super."conductive-clock";
+  "conductive-hsc3" = dontDistribute super."conductive-hsc3";
+  "conductive-song" = dontDistribute super."conductive-song";
+  "conduit-audio" = dontDistribute super."conduit-audio";
+  "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
+  "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
+  "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
+  "conf" = dontDistribute super."conf";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "confsolve" = dontDistribute super."confsolve";
+  "congruence-relation" = dontDistribute super."congruence-relation";
+  "conjugateGradient" = dontDistribute super."conjugateGradient";
+  "conjure" = dontDistribute super."conjure";
+  "conlogger" = dontDistribute super."conlogger";
+  "connection-pool" = dontDistribute super."connection-pool";
+  "consistent" = dontDistribute super."consistent";
+  "console-program" = dontDistribute super."console-program";
+  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
+  "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "container-classes" = dontDistribute super."container-classes";
+  "containers-benchmark" = dontDistribute super."containers-benchmark";
+  "containers-deepseq" = dontDistribute super."containers-deepseq";
+  "context-free-grammar" = dontDistribute super."context-free-grammar";
+  "context-stack" = dontDistribute super."context-stack";
+  "continue" = dontDistribute super."continue";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "continuum" = dontDistribute super."continuum";
+  "continuum-client" = dontDistribute super."continuum-client";
+  "control-event" = dontDistribute super."control-event";
+  "control-monad-attempt" = dontDistribute super."control-monad-attempt";
+  "control-monad-exception" = dontDistribute super."control-monad-exception";
+  "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd";
+  "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf";
+  "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl";
+  "control-monad-failure" = dontDistribute super."control-monad-failure";
+  "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl";
+  "control-monad-omega" = dontDistribute super."control-monad-omega";
+  "control-monad-queue" = dontDistribute super."control-monad-queue";
+  "control-timeout" = dontDistribute super."control-timeout";
+  "contstuff" = dontDistribute super."contstuff";
+  "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf";
+  "contstuff-transformers" = dontDistribute super."contstuff-transformers";
+  "converge" = dontDistribute super."converge";
+  "conversion" = dontDistribute super."conversion";
+  "conversion-bytestring" = dontDistribute super."conversion-bytestring";
+  "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive";
+  "conversion-text" = dontDistribute super."conversion-text";
+  "convert" = dontDistribute super."convert";
+  "convertible-ascii" = dontDistribute super."convertible-ascii";
+  "convertible-text" = dontDistribute super."convertible-text";
+  "cookbook" = dontDistribute super."cookbook";
+  "coordinate" = dontDistribute super."coordinate";
+  "copilot" = dontDistribute super."copilot";
+  "copilot-c99" = dontDistribute super."copilot-c99";
+  "copilot-cbmc" = dontDistribute super."copilot-cbmc";
+  "copilot-core" = dontDistribute super."copilot-core";
+  "copilot-language" = dontDistribute super."copilot-language";
+  "copilot-libraries" = dontDistribute super."copilot-libraries";
+  "copilot-sbv" = dontDistribute super."copilot-sbv";
+  "copilot-theorem" = dontDistribute super."copilot-theorem";
+  "copr" = dontDistribute super."copr";
+  "core" = dontDistribute super."core";
+  "core-haskell" = dontDistribute super."core-haskell";
+  "corebot-bliki" = dontDistribute super."corebot-bliki";
+  "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
+  "coroutine-iteratee" = dontDistribute super."coroutine-iteratee";
+  "coroutine-object" = dontDistribute super."coroutine-object";
+  "couch-hs" = dontDistribute super."couch-hs";
+  "couch-simple" = dontDistribute super."couch-simple";
+  "couchdb-conduit" = dontDistribute super."couchdb-conduit";
+  "couchdb-enumerator" = dontDistribute super."couchdb-enumerator";
+  "count" = dontDistribute super."count";
+  "countable" = dontDistribute super."countable";
+  "counter" = dontDistribute super."counter";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "cplusplus-th" = dontDistribute super."cplusplus-th";
+  "cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
+  "cpsa" = dontDistribute super."cpsa";
+  "cpuid" = dontDistribute super."cpuid";
+  "cpuperf" = dontDistribute super."cpuperf";
+  "cpython" = dontDistribute super."cpython";
+  "cqrs" = dontDistribute super."cqrs";
+  "cqrs-core" = dontDistribute super."cqrs-core";
+  "cqrs-example" = dontDistribute super."cqrs-example";
+  "cqrs-memory" = dontDistribute super."cqrs-memory";
+  "cqrs-postgresql" = dontDistribute super."cqrs-postgresql";
+  "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3";
+  "cqrs-test" = dontDistribute super."cqrs-test";
+  "cqrs-testkit" = dontDistribute super."cqrs-testkit";
+  "cqrs-types" = dontDistribute super."cqrs-types";
+  "cr" = dontDistribute super."cr";
+  "crack" = dontDistribute super."crack";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "crc16" = dontDistribute super."crc16";
+  "crc16-table" = dontDistribute super."crc16-table";
+  "creatur" = dontDistribute super."creatur";
+  "crf-chain1" = dontDistribute super."crf-chain1";
+  "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained";
+  "crf-chain2-generic" = dontDistribute super."crf-chain2-generic";
+  "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers";
+  "critbit" = dontDistribute super."critbit";
+  "criterion-plus" = dontDistribute super."criterion-plus";
+  "criterion-to-html" = dontDistribute super."criterion-to-html";
+  "crockford" = dontDistribute super."crockford";
+  "crocodile" = dontDistribute super."crocodile";
+  "cron-compat" = dontDistribute super."cron-compat";
+  "cruncher-types" = dontDistribute super."cruncher-types";
+  "crunghc" = dontDistribute super."crunghc";
+  "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks";
+  "crypto-classical" = dontDistribute super."crypto-classical";
+  "crypto-conduit" = dontDistribute super."crypto-conduit";
+  "crypto-enigma" = dontDistribute super."crypto-enigma";
+  "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
+  "crypto-random-effect" = dontDistribute super."crypto-random-effect";
+  "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptsy-api" = dontDistribute super."cryptsy-api";
+  "crystalfontz" = dontDistribute super."crystalfontz";
+  "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
+  "csound-catalog" = dontDistribute super."csound-catalog";
+  "csound-expression" = dontDistribute super."csound-expression";
+  "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic";
+  "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes";
+  "csound-expression-typed" = dontDistribute super."csound-expression-typed";
+  "csound-sampler" = dontDistribute super."csound-sampler";
+  "csp" = dontDistribute super."csp";
+  "cspmchecker" = dontDistribute super."cspmchecker";
+  "css" = dontDistribute super."css";
+  "csv-enumerator" = dontDistribute super."csv-enumerator";
+  "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-to-qif" = dontDistribute super."csv-to-qif";
+  "ctemplate" = dontDistribute super."ctemplate";
+  "ctkl" = dontDistribute super."ctkl";
+  "ctpl" = dontDistribute super."ctpl";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cublas" = dontDistribute super."cublas";
+  "cuboid" = dontDistribute super."cuboid";
+  "cuda" = dontDistribute super."cuda";
+  "cudd" = dontDistribute super."cudd";
+  "cufft" = dontDistribute super."cufft";
+  "curl-aeson" = dontDistribute super."curl-aeson";
+  "curlhs" = dontDistribute super."curlhs";
+  "currency" = dontDistribute super."currency";
+  "current-locale" = dontDistribute super."current-locale";
+  "curry-base" = dontDistribute super."curry-base";
+  "curry-frontend" = dontDistribute super."curry-frontend";
+  "cursedcsv" = dontDistribute super."cursedcsv";
+  "curve25519" = dontDistribute super."curve25519";
+  "curves" = dontDistribute super."curves";
+  "custom-prelude" = dontDistribute super."custom-prelude";
+  "cv-combinators" = dontDistribute super."cv-combinators";
+  "cyclotomic" = dontDistribute super."cyclotomic";
+  "cypher" = dontDistribute super."cypher";
+  "d-bus" = dontDistribute super."d-bus";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs-benchmark" = dontDistribute super."darcs-benchmark";
+  "darcs-beta" = dontDistribute super."darcs-beta";
+  "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
+  "darcs-cabalized" = dontDistribute super."darcs-cabalized";
+  "darcs-fastconvert" = dontDistribute super."darcs-fastconvert";
+  "darcs-graph" = dontDistribute super."darcs-graph";
+  "darcs-monitor" = dontDistribute super."darcs-monitor";
+  "darcs-scripts" = dontDistribute super."darcs-scripts";
+  "darcs2dot" = dontDistribute super."darcs2dot";
+  "darcsden" = dontDistribute super."darcsden";
+  "darcswatch" = dontDistribute super."darcswatch";
+  "darkplaces-demo" = dontDistribute super."darkplaces-demo";
+  "darkplaces-rcon" = dontDistribute super."darkplaces-rcon";
+  "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
+  "darkplaces-text" = dontDistribute super."darkplaces-text";
+  "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
+  "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
+  "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
+  "data-accessor-template" = dontDistribute super."data-accessor-template";
+  "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
+  "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
+  "data-bword" = dontDistribute super."data-bword";
+  "data-carousel" = dontDistribute super."data-carousel";
+  "data-category" = dontDistribute super."data-category";
+  "data-cell" = dontDistribute super."data-cell";
+  "data-checked" = dontDistribute super."data-checked";
+  "data-clist" = dontDistribute super."data-clist";
+  "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
+  "data-construction" = dontDistribute super."data-construction";
+  "data-cycle" = dontDistribute super."data-cycle";
+  "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
+  "data-dispersal" = dontDistribute super."data-dispersal";
+  "data-dword" = dontDistribute super."data-dword";
+  "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
+  "data-endian" = dontDistribute super."data-endian";
+  "data-extend-generic" = dontDistribute super."data-extend-generic";
+  "data-extra" = dontDistribute super."data-extra";
+  "data-filepath" = dontDistribute super."data-filepath";
+  "data-fin" = dontDistribute super."data-fin";
+  "data-fin-simple" = dontDistribute super."data-fin-simple";
+  "data-fix" = dontDistribute super."data-fix";
+  "data-fix-cse" = dontDistribute super."data-fix-cse";
+  "data-flags" = dontDistribute super."data-flags";
+  "data-flagset" = dontDistribute super."data-flagset";
+  "data-fresh" = dontDistribute super."data-fresh";
+  "data-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
+  "data-kiln" = dontDistribute super."data-kiln";
+  "data-layer" = dontDistribute super."data-layer";
+  "data-layout" = dontDistribute super."data-layout";
+  "data-lens" = dontDistribute super."data-lens";
+  "data-lens-fd" = dontDistribute super."data-lens-fd";
+  "data-lens-ixset" = dontDistribute super."data-lens-ixset";
+  "data-lens-template" = dontDistribute super."data-lens-template";
+  "data-list-sequences" = dontDistribute super."data-list-sequences";
+  "data-map-multikey" = dontDistribute super."data-map-multikey";
+  "data-named" = dontDistribute super."data-named";
+  "data-nat" = dontDistribute super."data-nat";
+  "data-object" = dontDistribute super."data-object";
+  "data-object-json" = dontDistribute super."data-object-json";
+  "data-object-yaml" = dontDistribute super."data-object-yaml";
+  "data-or" = dontDistribute super."data-or";
+  "data-partition" = dontDistribute super."data-partition";
+  "data-pprint" = dontDistribute super."data-pprint";
+  "data-quotientref" = dontDistribute super."data-quotientref";
+  "data-r-tree" = dontDistribute super."data-r-tree";
+  "data-ref" = dontDistribute super."data-ref";
+  "data-reify-cse" = dontDistribute super."data-reify-cse";
+  "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
+  "data-rev" = dontDistribute super."data-rev";
+  "data-rope" = dontDistribute super."data-rope";
+  "data-rtuple" = dontDistribute super."data-rtuple";
+  "data-size" = dontDistribute super."data-size";
+  "data-spacepart" = dontDistribute super."data-spacepart";
+  "data-store" = dontDistribute super."data-store";
+  "data-stringmap" = dontDistribute super."data-stringmap";
+  "data-structure-inferrer" = dontDistribute super."data-structure-inferrer";
+  "data-tensor" = dontDistribute super."data-tensor";
+  "data-textual" = dontDistribute super."data-textual";
+  "data-timeout" = dontDistribute super."data-timeout";
+  "data-transform" = dontDistribute super."data-transform";
+  "data-treify" = dontDistribute super."data-treify";
+  "data-type" = dontDistribute super."data-type";
+  "data-util" = dontDistribute super."data-util";
+  "data-variant" = dontDistribute super."data-variant";
+  "database-migrate" = dontDistribute super."database-migrate";
+  "database-study" = dontDistribute super."database-study";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "date-cache" = dontDistribute super."date-cache";
+  "dates" = dontDistribute super."dates";
+  "datetime" = dontDistribute super."datetime";
+  "datetime-sb" = dontDistribute super."datetime-sb";
+  "dawdle" = dontDistribute super."dawdle";
+  "dawg" = dontDistribute super."dawg";
+  "dbcleaner" = dontDistribute super."dbcleaner";
+  "dbf" = dontDistribute super."dbf";
+  "dbjava" = dontDistribute super."dbjava";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "dclabel" = dontDistribute super."dclabel";
+  "dclabel-eci11" = dontDistribute super."dclabel-eci11";
+  "ddc-base" = dontDistribute super."ddc-base";
+  "ddc-build" = dontDistribute super."ddc-build";
+  "ddc-code" = dontDistribute super."ddc-code";
+  "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-eval" = dontDistribute super."ddc-core-eval";
+  "ddc-core-flow" = dontDistribute super."ddc-core-flow";
+  "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
+  "ddc-core-salt" = dontDistribute super."ddc-core-salt";
+  "ddc-core-simpl" = dontDistribute super."ddc-core-simpl";
+  "ddc-core-tetra" = dontDistribute super."ddc-core-tetra";
+  "ddc-driver" = dontDistribute super."ddc-driver";
+  "ddc-interface" = dontDistribute super."ddc-interface";
+  "ddc-source-tetra" = dontDistribute super."ddc-source-tetra";
+  "ddc-tools" = dontDistribute super."ddc-tools";
+  "ddc-war" = dontDistribute super."ddc-war";
+  "ddci-core" = dontDistribute super."ddci-core";
+  "dead-code-detection" = dontDistribute super."dead-code-detection";
+  "dead-simple-json" = dontDistribute super."dead-simple-json";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "decode-utf8" = dontDistribute super."decode-utf8";
+  "decoder-conduit" = dontDistribute super."decoder-conduit";
+  "dedukti" = dontDistribute super."dedukti";
+  "deepcontrol" = dontDistribute super."deepcontrol";
+  "deeplearning-hs" = dontDistribute super."deeplearning-hs";
+  "deepseq-bounded" = dontDistribute super."deepseq-bounded";
+  "deepseq-magic" = dontDistribute super."deepseq-magic";
+  "deepseq-th" = dontDistribute super."deepseq-th";
+  "deepzoom" = dontDistribute super."deepzoom";
+  "defargs" = dontDistribute super."defargs";
+  "definitive-base" = dontDistribute super."definitive-base";
+  "definitive-filesystem" = dontDistribute super."definitive-filesystem";
+  "definitive-graphics" = dontDistribute super."definitive-graphics";
+  "definitive-parser" = dontDistribute super."definitive-parser";
+  "definitive-reactive" = dontDistribute super."definitive-reactive";
+  "definitive-sound" = dontDistribute super."definitive-sound";
+  "deiko-config" = dontDistribute super."deiko-config";
+  "deka" = dontDistribute super."deka";
+  "deka-tests" = dontDistribute super."deka-tests";
+  "delaunay" = dontDistribute super."delaunay";
+  "delicious" = dontDistribute super."delicious";
+  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
+  "delta" = dontDistribute super."delta";
+  "delta-h" = dontDistribute super."delta-h";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "dependent-state" = dontDistribute super."dependent-state";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "derive-monoid" = dontDistribute super."derive-monoid";
+  "derive-topdown" = dontDistribute super."derive-topdown";
+  "derive-trie" = dontDistribute super."derive-trie";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "derp" = dontDistribute super."derp";
+  "derp-lib" = dontDistribute super."derp-lib";
+  "descrilo" = dontDistribute super."descrilo";
+  "despair" = dontDistribute super."despair";
+  "deterministic-game-engine" = dontDistribute super."deterministic-game-engine";
+  "detrospector" = dontDistribute super."detrospector";
+  "deunicode" = dontDistribute super."deunicode";
+  "devil" = dontDistribute super."devil";
+  "dewdrop" = dontDistribute super."dewdrop";
+  "dfrac" = dontDistribute super."dfrac";
+  "dfsbuild" = dontDistribute super."dfsbuild";
+  "dgim" = dontDistribute super."dgim";
+  "dgs" = dontDistribute super."dgs";
+  "dia-base" = dontDistribute super."dia-base";
+  "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
+  "diagrams-pdf" = dontDistribute super."diagrams-pdf";
+  "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "dictparser" = dontDistribute super."dictparser";
+  "diet" = dontDistribute super."diet";
+  "diff-gestalt" = dontDistribute super."diff-gestalt";
+  "diff-parse" = dontDistribute super."diff-parse";
+  "diffarray" = dontDistribute super."diffarray";
+  "diffcabal" = dontDistribute super."diffcabal";
+  "diffdump" = dontDistribute super."diffdump";
+  "digamma" = dontDistribute super."digamma";
+  "digest-pure" = dontDistribute super."digest-pure";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
+  "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
+  "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
+  "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty";
+  "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
+  "digit" = dontDistribute super."digit";
+  "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
+  "dimensional-tf" = dontDistribute super."dimensional-tf";
+  "dingo-core" = dontDistribute super."dingo-core";
+  "dingo-example" = dontDistribute super."dingo-example";
+  "dingo-widgets" = dontDistribute super."dingo-widgets";
+  "diophantine" = dontDistribute super."diophantine";
+  "diplomacy" = dontDistribute super."diplomacy";
+  "diplomacy-server" = dontDistribute super."diplomacy-server";
+  "direct-binary-files" = dontDistribute super."direct-binary-files";
+  "direct-daemonize" = dontDistribute super."direct-daemonize";
+  "direct-fastcgi" = dontDistribute super."direct-fastcgi";
+  "direct-http" = dontDistribute super."direct-http";
+  "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
+  "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "discrete-space-map" = dontDistribute super."discrete-space-map";
+  "discrimination" = dontDistribute super."discrimination";
+  "disjoint-set" = dontDistribute super."disjoint-set";
+  "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
+  "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
+  "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
+  "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
+  "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "djembe" = dontDistribute super."djembe";
+  "djinn" = dontDistribute super."djinn";
+  "djinn-th" = dontDistribute super."djinn-th";
+  "dnscache" = dontDistribute super."dnscache";
+  "dnsrbl" = dontDistribute super."dnsrbl";
+  "dnssd" = dontDistribute super."dnssd";
+  "doc-review" = dontDistribute super."doc-review";
+  "doccheck" = dontDistribute super."doccheck";
+  "docidx" = dontDistribute super."docidx";
+  "docker" = dontDistribute super."docker";
+  "dockercook" = dontDistribute super."dockercook";
+  "doctest-discover" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
+  "dom-selector" = dontDistribute super."dom-selector";
+  "domain-auth" = dontDistribute super."domain-auth";
+  "dominion" = dontDistribute super."dominion";
+  "domplate" = dontDistribute super."domplate";
+  "dot2graphml" = dontDistribute super."dot2graphml";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download" = dontDistribute super."download";
+  "download-curl" = dontDistribute super."download-curl";
+  "download-media-content" = dontDistribute super."download-media-content";
+  "dozenal" = dontDistribute super."dozenal";
+  "dozens" = dontDistribute super."dozens";
+  "dph-base" = dontDistribute super."dph-base";
+  "dph-examples" = dontDistribute super."dph-examples";
+  "dph-lifted-base" = dontDistribute super."dph-lifted-base";
+  "dph-lifted-copy" = dontDistribute super."dph-lifted-copy";
+  "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg";
+  "dph-par" = dontDistribute super."dph-par";
+  "dph-prim-interface" = dontDistribute super."dph-prim-interface";
+  "dph-prim-par" = dontDistribute super."dph-prim-par";
+  "dph-prim-seq" = dontDistribute super."dph-prim-seq";
+  "dph-seq" = dontDistribute super."dph-seq";
+  "dpkg" = dontDistribute super."dpkg";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "dropbox-sdk" = dontDistribute super."dropbox-sdk";
+  "dropsolve" = dontDistribute super."dropsolve";
+  "ds-kanren" = dontDistribute super."ds-kanren";
+  "dsh-sql" = dontDistribute super."dsh-sql";
+  "dsmc" = dontDistribute super."dsmc";
+  "dsmc-tools" = dontDistribute super."dsmc-tools";
+  "dson" = dontDistribute super."dson";
+  "dson-parsec" = dontDistribute super."dson-parsec";
+  "dsp" = dontDistribute super."dsp";
+  "dstring" = dontDistribute super."dstring";
+  "dtab" = dontDistribute super."dtab";
+  "dtd" = dontDistribute super."dtd";
+  "dtd-text" = dontDistribute super."dtd-text";
+  "dtd-types" = dontDistribute super."dtd-types";
+  "dtrace" = dontDistribute super."dtrace";
+  "dtw" = dontDistribute super."dtw";
+  "dump" = dontDistribute super."dump";
+  "duplo" = dontDistribute super."duplo";
+  "dvda" = dontDistribute super."dvda";
+  "dvdread" = dontDistribute super."dvdread";
+  "dvi-processing" = dontDistribute super."dvi-processing";
+  "dvorak" = dontDistribute super."dvorak";
+  "dwarf" = dontDistribute super."dwarf";
+  "dwarf-el" = dontDistribute super."dwarf-el";
+  "dwarfadt" = dontDistribute super."dwarfadt";
+  "dx9base" = dontDistribute super."dx9base";
+  "dx9d3d" = dontDistribute super."dx9d3d";
+  "dx9d3dx" = dontDistribute super."dx9d3dx";
+  "dynamic-cabal" = dontDistribute super."dynamic-cabal";
+  "dynamic-graph" = dontDistribute super."dynamic-graph";
+  "dynamic-linker-template" = dontDistribute super."dynamic-linker-template";
+  "dynamic-loader" = dontDistribute super."dynamic-loader";
+  "dynamic-mvector" = dontDistribute super."dynamic-mvector";
+  "dynamic-object" = dontDistribute super."dynamic-object";
+  "dynamic-plot" = dontDistribute super."dynamic-plot";
+  "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynobud" = dontDistribute super."dynobud";
+  "dywapitchtrack" = dontDistribute super."dywapitchtrack";
+  "dzen-utils" = dontDistribute super."dzen-utils";
+  "eager-sockets" = dontDistribute super."eager-sockets";
+  "easy-api" = dontDistribute super."easy-api";
+  "easy-bitcoin" = dontDistribute super."easy-bitcoin";
+  "easyjson" = dontDistribute super."easyjson";
+  "easyplot" = dontDistribute super."easyplot";
+  "easyrender" = dontDistribute super."easyrender";
+  "ebeats" = dontDistribute super."ebeats";
+  "ebnf-bff" = dontDistribute super."ebnf-bff";
+  "ec2-signature" = dontDistribute super."ec2-signature";
+  "ecdsa" = dontDistribute super."ecdsa";
+  "ecma262" = dontDistribute super."ecma262";
+  "ecu" = dontDistribute super."ecu";
+  "ed25519" = dontDistribute super."ed25519";
+  "ed25519-donna" = dontDistribute super."ed25519-donna";
+  "eddie" = dontDistribute super."eddie";
+  "edenmodules" = dontDistribute super."edenmodules";
+  "edenskel" = dontDistribute super."edenskel";
+  "edentv" = dontDistribute super."edentv";
+  "edge" = dontDistribute super."edge";
+  "edis" = dontDistribute super."edis";
+  "edit-lenses" = dontDistribute super."edit-lenses";
+  "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
+  "editable" = dontDistribute super."editable";
+  "editline" = dontDistribute super."editline";
+  "effect-monad" = dontDistribute super."effect-monad";
+  "effective-aspects" = dontDistribute super."effective-aspects";
+  "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
+  "effects" = dontDistribute super."effects";
+  "effects-parser" = dontDistribute super."effects-parser";
+  "effin" = dontDistribute super."effin";
+  "egison" = dontDistribute super."egison";
+  "egison-quote" = dontDistribute super."egison-quote";
+  "egison-tutorial" = dontDistribute super."egison-tutorial";
+  "ehaskell" = dontDistribute super."ehaskell";
+  "ehs" = dontDistribute super."ehs";
+  "eibd-client-simple" = dontDistribute super."eibd-client-simple";
+  "eigen" = dontDistribute super."eigen";
+  "eithers" = dontDistribute super."eithers";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-log" = dontDistribute super."ekg-log";
+  "ekg-push" = dontDistribute super."ekg-push";
+  "ekg-rrd" = dontDistribute super."ekg-rrd";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "electrum-mnemonic" = dontDistribute super."electrum-mnemonic";
+  "elerea" = dontDistribute super."elerea";
+  "elerea-examples" = dontDistribute super."elerea-examples";
+  "elerea-sdl" = dontDistribute super."elerea-sdl";
+  "elevator" = dontDistribute super."elevator";
+  "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "elm-init" = dontDistribute super."elm-init";
+  "elm-make" = dontDistribute super."elm-make";
+  "elm-package" = dontDistribute super."elm-package";
+  "elm-reactor" = dontDistribute super."elm-reactor";
+  "elm-repl" = dontDistribute super."elm-repl";
+  "elm-server" = dontDistribute super."elm-server";
+  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
+  "elocrypt" = dontDistribute super."elocrypt";
+  "emacs-keys" = dontDistribute super."emacs-keys";
+  "email" = dontDistribute super."email";
+  "email-header" = dontDistribute super."email-header";
+  "email-postmark" = dontDistribute super."email-postmark";
+  "email-validator" = dontDistribute super."email-validator";
+  "embeddock" = dontDistribute super."embeddock";
+  "embeddock-example" = dontDistribute super."embeddock-example";
+  "embroidery" = dontDistribute super."embroidery";
+  "emgm" = dontDistribute super."emgm";
+  "empty" = dontDistribute super."empty";
+  "encoding" = dontDistribute super."encoding";
+  "endo" = dontDistribute super."endo";
+  "engine-io-growler" = dontDistribute super."engine-io-growler";
+  "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engineering-units" = dontDistribute super."engineering-units";
+  "enumerable" = dontDistribute super."enumerable";
+  "enumerate" = dontDistribute super."enumerate";
+  "enumeration" = dontDistribute super."enumeration";
+  "enumerator-fd" = dontDistribute super."enumerator-fd";
+  "enumerator-tf" = dontDistribute super."enumerator-tf";
+  "enumfun" = dontDistribute super."enumfun";
+  "enummapmap" = dontDistribute super."enummapmap";
+  "enummapset" = dontDistribute super."enummapset";
+  "enummapset-th" = dontDistribute super."enummapset-th";
+  "enumset" = dontDistribute super."enumset";
+  "env-parser" = dontDistribute super."env-parser";
+  "envparse" = dontDistribute super."envparse";
+  "epanet-haskell" = dontDistribute super."epanet-haskell";
+  "epass" = dontDistribute super."epass";
+  "epic" = dontDistribute super."epic";
+  "epoll" = dontDistribute super."epoll";
+  "eprocess" = dontDistribute super."eprocess";
+  "epub" = dontDistribute super."epub";
+  "epub-metadata" = dontDistribute super."epub-metadata";
+  "epub-tools" = dontDistribute super."epub-tools";
+  "epubname" = dontDistribute super."epubname";
+  "equal-files" = dontDistribute super."equal-files";
+  "equational-reasoning" = dontDistribute super."equational-reasoning";
+  "erd" = dontDistribute super."erd";
+  "erf-native" = dontDistribute super."erf-native";
+  "erlang" = dontDistribute super."erlang";
+  "eros" = dontDistribute super."eros";
+  "eros-client" = dontDistribute super."eros-client";
+  "eros-http" = dontDistribute super."eros-http";
+  "errno" = dontDistribute super."errno";
+  "error-analyze" = dontDistribute super."error-analyze";
+  "error-continuations" = dontDistribute super."error-continuations";
+  "error-list" = dontDistribute super."error-list";
+  "error-loc" = dontDistribute super."error-loc";
+  "error-location" = dontDistribute super."error-location";
+  "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
+  "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_1_1";
+  "ersatz" = dontDistribute super."ersatz";
+  "ersatz-toysat" = dontDistribute super."ersatz-toysat";
+  "ert" = dontDistribute super."ert";
+  "esotericbot" = dontDistribute super."esotericbot";
+  "ess" = dontDistribute super."ess";
+  "estimator" = dontDistribute super."estimator";
+  "estimators" = dontDistribute super."estimators";
+  "estreps" = dontDistribute super."estreps";
+  "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
+  "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
+  "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
+  "ethereum-rlp" = dontDistribute super."ethereum-rlp";
+  "ety" = dontDistribute super."ety";
+  "euler" = dontDistribute super."euler";
+  "euphoria" = dontDistribute super."euphoria";
+  "eurofxref" = dontDistribute super."eurofxref";
+  "event-driven" = dontDistribute super."event-driven";
+  "event-handlers" = dontDistribute super."event-handlers";
+  "event-list" = dontDistribute super."event-list";
+  "event-monad" = dontDistribute super."event-monad";
+  "eventloop" = dontDistribute super."eventloop";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
+  "exists" = dontDistribute super."exists";
+  "exit-codes" = dontDistribute super."exit-codes";
+  "exp-extended" = dontDistribute super."exp-extended";
+  "exp-pairs" = dontDistribute super."exp-pairs";
+  "expand" = dontDistribute super."expand";
+  "expat-enumerator" = dontDistribute super."expat-enumerator";
+  "expiring-mvar" = dontDistribute super."expiring-mvar";
+  "explain" = dontDistribute super."explain";
+  "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-iomodes" = dontDistribute super."explicit-iomodes";
+  "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
+  "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
+  "explicit-sharing" = dontDistribute super."explicit-sharing";
+  "explore" = dontDistribute super."explore";
+  "exposed-containers" = dontDistribute super."exposed-containers";
+  "expression-parser" = dontDistribute super."expression-parser";
+  "extcore" = dontDistribute super."extcore";
+  "extemp" = dontDistribute super."extemp";
+  "extended-categories" = dontDistribute super."extended-categories";
+  "extended-reals" = dontDistribute super."extended-reals";
+  "extensible" = dontDistribute super."extensible";
+  "extensible-data" = dontDistribute super."extensible-data";
+  "external-sort" = dontDistribute super."external-sort";
+  "extractelf" = dontDistribute super."extractelf";
+  "ez-couch" = dontDistribute super."ez-couch";
+  "faceted" = dontDistribute super."faceted";
+  "factory" = dontDistribute super."factory";
+  "factual-api" = dontDistribute super."factual-api";
+  "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "fair-predicates" = dontDistribute super."fair-predicates";
+  "fake-type" = dontDistribute super."fake-type";
+  "faker" = dontDistribute super."faker";
+  "falling-turnip" = dontDistribute super."falling-turnip";
+  "fallingblocks" = dontDistribute super."fallingblocks";
+  "family-tree" = dontDistribute super."family-tree";
+  "fast-digits" = dontDistribute super."fast-digits";
+  "fast-math" = dontDistribute super."fast-math";
+  "fast-tags" = dontDistribute super."fast-tags";
+  "fast-tagsoup" = dontDistribute super."fast-tagsoup";
+  "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fasta" = doDistribute super."fasta_0_10_1_0";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
+  "fdo-trash" = dontDistribute super."fdo-trash";
+  "fec" = dontDistribute super."fec";
+  "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed-cli" = dontDistribute super."feed-cli";
+  "feed-collect" = dontDistribute super."feed-collect";
+  "feed-crawl" = dontDistribute super."feed-crawl";
+  "feed-translator" = dontDistribute super."feed-translator";
+  "feed2lj" = dontDistribute super."feed2lj";
+  "feed2twitter" = dontDistribute super."feed2twitter";
+  "feldspar-compiler" = dontDistribute super."feldspar-compiler";
+  "feldspar-language" = dontDistribute super."feldspar-language";
+  "feldspar-signal" = dontDistribute super."feldspar-signal";
+  "fen2s" = dontDistribute super."fen2s";
+  "fences" = dontDistribute super."fences";
+  "fenfire" = dontDistribute super."fenfire";
+  "fez-conf" = dontDistribute super."fez-conf";
+  "ffeed" = dontDistribute super."ffeed";
+  "fficxx" = dontDistribute super."fficxx";
+  "fficxx-runtime" = dontDistribute super."fficxx-runtime";
+  "ffmpeg-light" = dontDistribute super."ffmpeg-light";
+  "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
+  "fgl-visualize" = dontDistribute super."fgl-visualize";
+  "fibon" = dontDistribute super."fibon";
+  "fibonacci" = dontDistribute super."fibonacci";
+  "fields" = dontDistribute super."fields";
+  "fields-json" = dontDistribute super."fields-json";
+  "fieldwise" = dontDistribute super."fieldwise";
+  "fig" = dontDistribute super."fig";
+  "file-collection" = dontDistribute super."file-collection";
+  "file-command-qq" = dontDistribute super."file-command-qq";
+  "filediff" = dontDistribute super."filediff";
+  "filepath-io-access" = dontDistribute super."filepath-io-access";
+  "filepather" = dontDistribute super."filepather";
+  "filestore" = dontDistribute super."filestore";
+  "filesystem-conduit" = dontDistribute super."filesystem-conduit";
+  "filesystem-enumerator" = dontDistribute super."filesystem-enumerator";
+  "filesystem-trees" = dontDistribute super."filesystem-trees";
+  "filtrable" = dontDistribute super."filtrable";
+  "final" = dontDistribute super."final";
+  "find-conduit" = dontDistribute super."find-conduit";
+  "fingertree-tf" = dontDistribute super."fingertree-tf";
+  "finite-field" = dontDistribute super."finite-field";
+  "finite-typelits" = dontDistribute super."finite-typelits";
+  "first-and-last" = dontDistribute super."first-and-last";
+  "first-class-patterns" = dontDistribute super."first-class-patterns";
+  "firstify" = dontDistribute super."firstify";
+  "fishfood" = dontDistribute super."fishfood";
+  "fit" = dontDistribute super."fit";
+  "fitsio" = dontDistribute super."fitsio";
+  "fix-imports" = dontDistribute super."fix-imports";
+  "fix-parser-simple" = dontDistribute super."fix-parser-simple";
+  "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit";
+  "fixed-length" = dontDistribute super."fixed-length";
+  "fixed-point" = dontDistribute super."fixed-point";
+  "fixed-point-vector" = dontDistribute super."fixed-point-vector";
+  "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space";
+  "fixed-precision" = dontDistribute super."fixed-precision";
+  "fixed-storable-array" = dontDistribute super."fixed-storable-array";
+  "fixed-vector-binary" = dontDistribute super."fixed-vector-binary";
+  "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
+  "fixedprec" = dontDistribute super."fixedprec";
+  "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
+  "fixhs" = dontDistribute super."fixhs";
+  "fixplate" = dontDistribute super."fixplate";
+  "fixpoint" = dontDistribute super."fixpoint";
+  "fixtime" = dontDistribute super."fixtime";
+  "fizz-buzz" = dontDistribute super."fizz-buzz";
+  "flaccuraterip" = dontDistribute super."flaccuraterip";
+  "flamethrower" = dontDistribute super."flamethrower";
+  "flamingra" = dontDistribute super."flamingra";
+  "flat-maybe" = dontDistribute super."flat-maybe";
+  "flat-mcmc" = dontDistribute super."flat-mcmc";
+  "flat-tex" = dontDistribute super."flat-tex";
+  "flexible-time" = dontDistribute super."flexible-time";
+  "flexible-unlit" = dontDistribute super."flexible-unlit";
+  "flexiwrap" = dontDistribute super."flexiwrap";
+  "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck";
+  "flickr" = dontDistribute super."flickr";
+  "flippers" = dontDistribute super."flippers";
+  "flite" = dontDistribute super."flite";
+  "flo" = dontDistribute super."flo";
+  "float-binstring" = dontDistribute super."float-binstring";
+  "floating-bits" = dontDistribute super."floating-bits";
+  "floatshow" = dontDistribute super."floatshow";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "flowdock-api" = dontDistribute super."flowdock-api";
+  "flowdock-rest" = dontDistribute super."flowdock-rest";
+  "flower" = dontDistribute super."flower";
+  "flowlocks-framework" = dontDistribute super."flowlocks-framework";
+  "flowsim" = dontDistribute super."flowsim";
+  "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl-incremental" = dontDistribute super."foldl-incremental";
+  "foldl-transduce" = dontDistribute super."foldl-transduce";
+  "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
+  "folds" = dontDistribute super."folds";
+  "folds-common" = dontDistribute super."folds-common";
+  "follower" = dontDistribute super."follower";
+  "foma" = dontDistribute super."foma";
+  "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6";
+  "foo" = dontDistribute super."foo";
+  "for-free" = dontDistribute super."for-free";
+  "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "fordo" = dontDistribute super."fordo";
+  "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
+  "foreign-var" = dontDistribute super."foreign-var";
+  "forger" = dontDistribute super."forger";
+  "forkable-monad" = dontDistribute super."forkable-monad";
+  "formal" = dontDistribute super."formal";
+  "format" = dontDistribute super."format";
+  "format-status" = dontDistribute super."format-status";
+  "formattable" = dontDistribute super."formattable";
+  "forml" = dontDistribute super."forml";
+  "formlets" = dontDistribute super."formlets";
+  "formlets-hsp" = dontDistribute super."formlets-hsp";
+  "formura" = dontDistribute super."formura";
+  "forth-hll" = dontDistribute super."forth-hll";
+  "foscam-directory" = dontDistribute super."foscam-directory";
+  "foscam-filename" = dontDistribute super."foscam-filename";
+  "foscam-sort" = dontDistribute super."foscam-sort";
+  "fountain" = dontDistribute super."fountain";
+  "fpco-api" = dontDistribute super."fpco-api";
+  "fpipe" = dontDistribute super."fpipe";
+  "fpnla" = dontDistribute super."fpnla";
+  "fpnla-examples" = dontDistribute super."fpnla-examples";
+  "fptest" = dontDistribute super."fptest";
+  "fquery" = dontDistribute super."fquery";
+  "fractal" = dontDistribute super."fractal";
+  "fractals" = dontDistribute super."fractals";
+  "fraction" = dontDistribute super."fraction";
+  "frag" = dontDistribute super."frag";
+  "frame" = dontDistribute super."frame";
+  "frame-markdown" = dontDistribute super."frame-markdown";
+  "franchise" = dontDistribute super."franchise";
+  "free-concurrent" = dontDistribute super."free-concurrent";
+  "free-functors" = dontDistribute super."free-functors";
+  "free-game" = dontDistribute super."free-game";
+  "free-http" = dontDistribute super."free-http";
+  "free-operational" = dontDistribute super."free-operational";
+  "free-theorems" = dontDistribute super."free-theorems";
+  "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples";
+  "free-theorems-seq" = dontDistribute super."free-theorems-seq";
+  "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
+  "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
+  "freekick2" = dontDistribute super."freekick2";
+  "freer" = dontDistribute super."freer";
+  "freesect" = dontDistribute super."freesect";
+  "freesound" = dontDistribute super."freesound";
+  "freetype-simple" = dontDistribute super."freetype-simple";
+  "freetype2" = dontDistribute super."freetype2";
+  "fresh" = dontDistribute super."fresh";
+  "friday" = dontDistribute super."friday";
+  "friday-devil" = dontDistribute super."friday-devil";
+  "friday-juicypixels" = dontDistribute super."friday-juicypixels";
+  "friday-scale-dct" = dontDistribute super."friday-scale-dct";
+  "friendly-time" = dontDistribute super."friendly-time";
+  "frown" = dontDistribute super."frown";
+  "frp-arduino" = dontDistribute super."frp-arduino";
+  "frpnow" = dontDistribute super."frpnow";
+  "frpnow-gloss" = dontDistribute super."frpnow-gloss";
+  "frpnow-gtk" = dontDistribute super."frpnow-gtk";
+  "frquotes" = dontDistribute super."frquotes";
+  "fs-events" = dontDistribute super."fs-events";
+  "fsharp" = dontDistribute super."fsharp";
+  "fsmActions" = dontDistribute super."fsmActions";
+  "fst" = dontDistribute super."fst";
+  "fsutils" = dontDistribute super."fsutils";
+  "fswatcher" = dontDistribute super."fswatcher";
+  "ftdi" = dontDistribute super."ftdi";
+  "ftp-conduit" = dontDistribute super."ftp-conduit";
+  "ftphs" = dontDistribute super."ftphs";
+  "ftree" = dontDistribute super."ftree";
+  "ftshell" = dontDistribute super."ftshell";
+  "fugue" = dontDistribute super."fugue";
+  "full-sessions" = dontDistribute super."full-sessions";
+  "full-text-search" = dontDistribute super."full-text-search";
+  "fullstop" = dontDistribute super."fullstop";
+  "funbot" = dontDistribute super."funbot";
+  "funbot-client" = dontDistribute super."funbot-client";
+  "funbot-ext-events" = dontDistribute super."funbot-ext-events";
+  "funbot-git-hook" = dontDistribute super."funbot-git-hook";
+  "function-combine" = dontDistribute super."function-combine";
+  "function-instances-algebra" = dontDistribute super."function-instances-algebra";
+  "functional-arrow" = dontDistribute super."functional-arrow";
+  "functional-kmp" = dontDistribute super."functional-kmp";
+  "functor-apply" = dontDistribute super."functor-apply";
+  "functor-combo" = dontDistribute super."functor-combo";
+  "functor-infix" = dontDistribute super."functor-infix";
+  "functor-monadic" = dontDistribute super."functor-monadic";
+  "functor-utils" = dontDistribute super."functor-utils";
+  "functorm" = dontDistribute super."functorm";
+  "functors" = dontDistribute super."functors";
+  "funion" = dontDistribute super."funion";
+  "funpat" = dontDistribute super."funpat";
+  "funsat" = dontDistribute super."funsat";
+  "fusion" = dontDistribute super."fusion";
+  "futun" = dontDistribute super."futun";
+  "future" = dontDistribute super."future";
+  "future-resource" = dontDistribute super."future-resource";
+  "fuzzy" = dontDistribute super."fuzzy";
+  "fuzzy-timings" = dontDistribute super."fuzzy-timings";
+  "fuzzytime" = dontDistribute super."fuzzytime";
+  "fwgl" = dontDistribute super."fwgl";
+  "fwgl-glfw" = dontDistribute super."fwgl-glfw";
+  "fwgl-javascript" = dontDistribute super."fwgl-javascript";
+  "g-npm" = dontDistribute super."g-npm";
+  "gact" = dontDistribute super."gact";
+  "game-of-life" = dontDistribute super."game-of-life";
+  "game-probability" = dontDistribute super."game-probability";
+  "game-tree" = dontDistribute super."game-tree";
+  "gameclock" = dontDistribute super."gameclock";
+  "gamma" = dontDistribute super."gamma";
+  "gang-of-threads" = dontDistribute super."gang-of-threads";
+  "garepinoh" = dontDistribute super."garepinoh";
+  "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gbu" = dontDistribute super."gbu";
+  "gc" = dontDistribute super."gc";
+  "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
+  "gconf" = dontDistribute super."gconf";
+  "gdiff" = dontDistribute super."gdiff";
+  "gdiff-ig" = dontDistribute super."gdiff-ig";
+  "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
+  "gearbox" = dontDistribute super."gearbox";
+  "geek" = dontDistribute super."geek";
+  "geek-server" = dontDistribute super."geek-server";
+  "gelatin" = dontDistribute super."gelatin";
+  "gemstone" = dontDistribute super."gemstone";
+  "gencheck" = dontDistribute super."gencheck";
+  "gender" = dontDistribute super."gender";
+  "genders" = dontDistribute super."genders";
+  "general-prelude" = dontDistribute super."general-prelude";
+  "generator" = dontDistribute super."generator";
+  "generators" = dontDistribute super."generators";
+  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "genericserialize" = dontDistribute super."genericserialize";
+  "genetics" = dontDistribute super."genetics";
+  "geni-gui" = dontDistribute super."geni-gui";
+  "geni-util" = dontDistribute super."geni-util";
+  "geniconvert" = dontDistribute super."geniconvert";
+  "genifunctors" = dontDistribute super."genifunctors";
+  "geniplate" = dontDistribute super."geniplate";
+  "geniserver" = dontDistribute super."geniserver";
+  "genprog" = dontDistribute super."genprog";
+  "gentlemark" = dontDistribute super."gentlemark";
+  "geo-resolver" = dontDistribute super."geo-resolver";
+  "geo-uk" = dontDistribute super."geo-uk";
+  "geocalc" = dontDistribute super."geocalc";
+  "geocode-google" = dontDistribute super."geocode-google";
+  "geodetic" = dontDistribute super."geodetic";
+  "geodetics" = dontDistribute super."geodetics";
+  "geohash" = dontDistribute super."geohash";
+  "geoip2" = dontDistribute super."geoip2";
+  "geojson" = dontDistribute super."geojson";
+  "geom2d" = dontDistribute super."geom2d";
+  "getemx" = dontDistribute super."getemx";
+  "getflag" = dontDistribute super."getflag";
+  "getopt-simple" = dontDistribute super."getopt-simple";
+  "gf" = dontDistribute super."gf";
+  "ggtsTC" = dontDistribute super."ggtsTC";
+  "ghc-core" = dontDistribute super."ghc-core";
+  "ghc-core-html" = dontDistribute super."ghc-core-html";
+  "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
+  "ghc-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-imported-from" = dontDistribute super."ghc-imported-from";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-options" = dontDistribute super."ghc-options";
+  "ghc-parmake" = dontDistribute super."ghc-parmake";
+  "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
+  "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
+  "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-simple" = dontDistribute super."ghc-simple";
+  "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
+  "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_4";
+  "ghc-vis" = dontDistribute super."ghc-vis";
+  "ghci-diagrams" = dontDistribute super."ghci-diagrams";
+  "ghci-haskeline" = dontDistribute super."ghci-haskeline";
+  "ghci-lib" = dontDistribute super."ghci-lib";
+  "ghci-ng" = dontDistribute super."ghci-ng";
+  "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-freq" = dontDistribute super."git-freq";
+  "git-gpush" = dontDistribute super."git-gpush";
+  "git-jump" = dontDistribute super."git-jump";
+  "git-monitor" = dontDistribute super."git-monitor";
+  "git-object" = dontDistribute super."git-object";
+  "git-repair" = dontDistribute super."git-repair";
+  "git-sanity" = dontDistribute super."git-sanity";
+  "git-vogue" = dontDistribute super."git-vogue";
+  "gitHUD" = dontDistribute super."gitHUD";
+  "gitcache" = dontDistribute super."gitcache";
+  "gitdo" = dontDistribute super."gitdo";
+  "github" = doDistribute super."github_0_14_0";
+  "github-backup" = dontDistribute super."github-backup";
+  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-utils" = dontDistribute super."github-utils";
+  "gitignore" = dontDistribute super."gitignore";
+  "gitit" = dontDistribute super."gitit";
+  "gitlib-cmdline" = dontDistribute super."gitlib-cmdline";
+  "gitlib-cross" = dontDistribute super."gitlib-cross";
+  "gitlib-s3" = dontDistribute super."gitlib-s3";
+  "gitlib-sample" = dontDistribute super."gitlib-sample";
+  "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitter" = dontDistribute super."gitter";
+  "gl-capture" = dontDistribute super."gl-capture";
+  "glade" = dontDistribute super."glade";
+  "gladexml-accessor" = dontDistribute super."gladexml-accessor";
+  "glambda" = dontDistribute super."glambda";
+  "glapp" = dontDistribute super."glapp";
+  "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
+  "glider-nlp" = dontDistribute super."glider-nlp";
+  "glintcollider" = dontDistribute super."glintcollider";
+  "gll" = dontDistribute super."gll";
+  "global" = dontDistribute super."global";
+  "global-config" = dontDistribute super."global-config";
+  "global-lock" = dontDistribute super."global-lock";
+  "global-variables" = dontDistribute super."global-variables";
+  "glome-hs" = dontDistribute super."glome-hs";
+  "gloss" = dontDistribute super."gloss";
+  "gloss-accelerate" = dontDistribute super."gloss-accelerate";
+  "gloss-algorithms" = dontDistribute super."gloss-algorithms";
+  "gloss-banana" = dontDistribute super."gloss-banana";
+  "gloss-devil" = dontDistribute super."gloss-devil";
+  "gloss-examples" = dontDistribute super."gloss-examples";
+  "gloss-game" = dontDistribute super."gloss-game";
+  "gloss-juicy" = dontDistribute super."gloss-juicy";
+  "gloss-raster" = dontDistribute super."gloss-raster";
+  "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate";
+  "gloss-rendering" = dontDistribute super."gloss-rendering";
+  "gloss-sodium" = dontDistribute super."gloss-sodium";
+  "glpk-hs" = dontDistribute super."glpk-hs";
+  "glue" = dontDistribute super."glue";
+  "glue-common" = dontDistribute super."glue-common";
+  "glue-core" = dontDistribute super."glue-core";
+  "glue-ekg" = dontDistribute super."glue-ekg";
+  "glue-example" = dontDistribute super."glue-example";
+  "gluturtle" = dontDistribute super."gluturtle";
+  "gmap" = dontDistribute super."gmap";
+  "gmndl" = dontDistribute super."gmndl";
+  "gnome-desktop" = dontDistribute super."gnome-desktop";
+  "gnome-keyring" = dontDistribute super."gnome-keyring";
+  "gnomevfs" = dontDistribute super."gnomevfs";
+  "gnss-converters" = dontDistribute super."gnss-converters";
+  "gnuplot" = dontDistribute super."gnuplot";
+  "goa" = dontDistribute super."goa";
+  "goal-core" = dontDistribute super."goal-core";
+  "goal-geometry" = dontDistribute super."goal-geometry";
+  "goal-probability" = dontDistribute super."goal-probability";
+  "goal-simulation" = dontDistribute super."goal-simulation";
+  "goatee" = dontDistribute super."goatee";
+  "goatee-gtk" = dontDistribute super."goatee-gtk";
+  "gofer-prelude" = dontDistribute super."gofer-prelude";
+  "gogol" = dontDistribute super."gogol";
+  "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer";
+  "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller";
+  "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer";
+  "gogol-admin-directory" = dontDistribute super."gogol-admin-directory";
+  "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration";
+  "gogol-admin-reports" = dontDistribute super."gogol-admin-reports";
+  "gogol-adsense" = dontDistribute super."gogol-adsense";
+  "gogol-adsense-host" = dontDistribute super."gogol-adsense-host";
+  "gogol-affiliates" = dontDistribute super."gogol-affiliates";
+  "gogol-analytics" = dontDistribute super."gogol-analytics";
+  "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise";
+  "gogol-android-publisher" = dontDistribute super."gogol-android-publisher";
+  "gogol-appengine" = dontDistribute super."gogol-appengine";
+  "gogol-apps-activity" = dontDistribute super."gogol-apps-activity";
+  "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar";
+  "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing";
+  "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller";
+  "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks";
+  "gogol-appstate" = dontDistribute super."gogol-appstate";
+  "gogol-autoscaler" = dontDistribute super."gogol-autoscaler";
+  "gogol-bigquery" = dontDistribute super."gogol-bigquery";
+  "gogol-billing" = dontDistribute super."gogol-billing";
+  "gogol-blogger" = dontDistribute super."gogol-blogger";
+  "gogol-books" = dontDistribute super."gogol-books";
+  "gogol-civicinfo" = dontDistribute super."gogol-civicinfo";
+  "gogol-classroom" = dontDistribute super."gogol-classroom";
+  "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace";
+  "gogol-compute" = dontDistribute super."gogol-compute";
+  "gogol-container" = dontDistribute super."gogol-container";
+  "gogol-core" = dontDistribute super."gogol-core";
+  "gogol-customsearch" = dontDistribute super."gogol-customsearch";
+  "gogol-dataflow" = dontDistribute super."gogol-dataflow";
+  "gogol-datastore" = dontDistribute super."gogol-datastore";
+  "gogol-debugger" = dontDistribute super."gogol-debugger";
+  "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager";
+  "gogol-dfareporting" = dontDistribute super."gogol-dfareporting";
+  "gogol-discovery" = dontDistribute super."gogol-discovery";
+  "gogol-dns" = dontDistribute super."gogol-dns";
+  "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids";
+  "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search";
+  "gogol-drive" = dontDistribute super."gogol-drive";
+  "gogol-fitness" = dontDistribute super."gogol-fitness";
+  "gogol-fonts" = dontDistribute super."gogol-fonts";
+  "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch";
+  "gogol-fusiontables" = dontDistribute super."gogol-fusiontables";
+  "gogol-games" = dontDistribute super."gogol-games";
+  "gogol-games-configuration" = dontDistribute super."gogol-games-configuration";
+  "gogol-games-management" = dontDistribute super."gogol-games-management";
+  "gogol-genomics" = dontDistribute super."gogol-genomics";
+  "gogol-gmail" = dontDistribute super."gogol-gmail";
+  "gogol-groups-migration" = dontDistribute super."gogol-groups-migration";
+  "gogol-groups-settings" = dontDistribute super."gogol-groups-settings";
+  "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit";
+  "gogol-latencytest" = dontDistribute super."gogol-latencytest";
+  "gogol-logging" = dontDistribute super."gogol-logging";
+  "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate";
+  "gogol-maps-engine" = dontDistribute super."gogol-maps-engine";
+  "gogol-mirror" = dontDistribute super."gogol-mirror";
+  "gogol-monitoring" = dontDistribute super."gogol-monitoring";
+  "gogol-oauth2" = dontDistribute super."gogol-oauth2";
+  "gogol-pagespeed" = dontDistribute super."gogol-pagespeed";
+  "gogol-partners" = dontDistribute super."gogol-partners";
+  "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner";
+  "gogol-plus" = dontDistribute super."gogol-plus";
+  "gogol-plus-domains" = dontDistribute super."gogol-plus-domains";
+  "gogol-prediction" = dontDistribute super."gogol-prediction";
+  "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon";
+  "gogol-pubsub" = dontDistribute super."gogol-pubsub";
+  "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress";
+  "gogol-replicapool" = dontDistribute super."gogol-replicapool";
+  "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater";
+  "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager";
+  "gogol-resourceviews" = dontDistribute super."gogol-resourceviews";
+  "gogol-shopping-content" = dontDistribute super."gogol-shopping-content";
+  "gogol-siteverification" = dontDistribute super."gogol-siteverification";
+  "gogol-spectrum" = dontDistribute super."gogol-spectrum";
+  "gogol-sqladmin" = dontDistribute super."gogol-sqladmin";
+  "gogol-storage" = dontDistribute super."gogol-storage";
+  "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer";
+  "gogol-tagmanager" = dontDistribute super."gogol-tagmanager";
+  "gogol-taskqueue" = dontDistribute super."gogol-taskqueue";
+  "gogol-translate" = dontDistribute super."gogol-translate";
+  "gogol-urlshortener" = dontDistribute super."gogol-urlshortener";
+  "gogol-useraccounts" = dontDistribute super."gogol-useraccounts";
+  "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools";
+  "gogol-youtube" = dontDistribute super."gogol-youtube";
+  "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics";
+  "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting";
+  "gooey" = dontDistribute super."gooey";
+  "google-dictionary" = dontDistribute super."google-dictionary";
+  "google-drive" = dontDistribute super."google-drive";
+  "google-html5-slide" = dontDistribute super."google-html5-slide";
+  "google-mail-filters" = dontDistribute super."google-mail-filters";
+  "google-oauth2" = dontDistribute super."google-oauth2";
+  "google-search" = dontDistribute super."google-search";
+  "googleplus" = dontDistribute super."googleplus";
+  "googlepolyline" = dontDistribute super."googlepolyline";
+  "gopherbot" = dontDistribute super."gopherbot";
+  "gore-and-ash" = dontDistribute super."gore-and-ash";
+  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
+  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
+  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
+  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
+  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
+  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "gps" = dontDistribute super."gps";
+  "gps2htmlReport" = dontDistribute super."gps2htmlReport";
+  "gpx-conduit" = dontDistribute super."gpx-conduit";
+  "graceful" = dontDistribute super."graceful";
+  "grammar-combinators" = dontDistribute super."grammar-combinators";
+  "grapefruit-examples" = dontDistribute super."grapefruit-examples";
+  "grapefruit-frp" = dontDistribute super."grapefruit-frp";
+  "grapefruit-records" = dontDistribute super."grapefruit-records";
+  "grapefruit-ui" = dontDistribute super."grapefruit-ui";
+  "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
+  "graph-generators" = dontDistribute super."graph-generators";
+  "graph-matchings" = dontDistribute super."graph-matchings";
+  "graph-rewriting" = dontDistribute super."graph-rewriting";
+  "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl";
+  "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl";
+  "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope";
+  "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout";
+  "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski";
+  "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies";
+  "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs";
+  "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww";
+  "graph-serialize" = dontDistribute super."graph-serialize";
+  "graph-utils" = dontDistribute super."graph-utils";
+  "graph-visit" = dontDistribute super."graph-visit";
+  "graphbuilder" = dontDistribute super."graphbuilder";
+  "graphene" = dontDistribute super."graphene";
+  "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators";
+  "graphics-formats-collada" = dontDistribute super."graphics-formats-collada";
+  "graphicsFormats" = dontDistribute super."graphicsFormats";
+  "graphicstools" = dontDistribute super."graphicstools";
+  "graphmod" = dontDistribute super."graphmod";
+  "graphql" = dontDistribute super."graphql";
+  "graphtype" = dontDistribute super."graphtype";
+  "grasp" = dontDistribute super."grasp";
+  "gray-code" = dontDistribute super."gray-code";
+  "gray-extended" = dontDistribute super."gray-extended";
+  "greencard" = dontDistribute super."greencard";
+  "greencard-lib" = dontDistribute super."greencard-lib";
+  "greg-client" = dontDistribute super."greg-client";
+  "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
+  "grid" = dontDistribute super."grid";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "groupoid" = dontDistribute super."groupoid";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk-helpers" = dontDistribute super."gtk-helpers";
+  "gtk-jsinput" = dontDistribute super."gtk-jsinput";
+  "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore";
+  "gtk-mac-integration" = dontDistribute super."gtk-mac-integration";
+  "gtk-serialized-event" = dontDistribute super."gtk-serialized-event";
+  "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view";
+  "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list";
+  "gtk-toy" = dontDistribute super."gtk-toy";
+  "gtk-traymanager" = dontDistribute super."gtk-traymanager";
+  "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade";
+  "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib";
+  "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs";
+  "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk";
+  "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext";
+  "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2";
+  "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th";
+  "gtk2hs-hello" = dontDistribute super."gtk2hs-hello";
+  "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn";
+  "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "gulcii" = dontDistribute super."gulcii";
+  "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis";
+  "gyah-bin" = dontDistribute super."gyah-bin";
+  "h-booru" = dontDistribute super."h-booru";
+  "h-gpgme" = dontDistribute super."h-gpgme";
+  "h2048" = dontDistribute super."h2048";
+  "hArduino" = dontDistribute super."hArduino";
+  "hBDD" = dontDistribute super."hBDD";
+  "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD";
+  "hBDD-CUDD" = dontDistribute super."hBDD-CUDD";
+  "hCsound" = dontDistribute super."hCsound";
+  "hDFA" = dontDistribute super."hDFA";
+  "hF2" = dontDistribute super."hF2";
+  "hGelf" = dontDistribute super."hGelf";
+  "hLLVM" = dontDistribute super."hLLVM";
+  "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_1";
+  "hPDB-examples" = dontDistribute super."hPDB-examples";
+  "hPushover" = dontDistribute super."hPushover";
+  "hR" = dontDistribute super."hR";
+  "hRESP" = dontDistribute super."hRESP";
+  "hS3" = dontDistribute super."hS3";
+  "hScraper" = dontDistribute super."hScraper";
+  "hSimpleDB" = dontDistribute super."hSimpleDB";
+  "hTalos" = dontDistribute super."hTalos";
+  "hTensor" = dontDistribute super."hTensor";
+  "hVOIDP" = dontDistribute super."hVOIDP";
+  "hXmixer" = dontDistribute super."hXmixer";
+  "haar" = dontDistribute super."haar";
+  "hacanon-light" = dontDistribute super."hacanon-light";
+  "hack" = dontDistribute super."hack";
+  "hack-contrib" = dontDistribute super."hack-contrib";
+  "hack-contrib-press" = dontDistribute super."hack-contrib-press";
+  "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack";
+  "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi";
+  "hack-handler-cgi" = dontDistribute super."hack-handler-cgi";
+  "hack-handler-epoll" = dontDistribute super."hack-handler-epoll";
+  "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp";
+  "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi";
+  "hack-handler-happstack" = dontDistribute super."hack-handler-happstack";
+  "hack-handler-hyena" = dontDistribute super."hack-handler-hyena";
+  "hack-handler-kibro" = dontDistribute super."hack-handler-kibro";
+  "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver";
+  "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath";
+  "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession";
+  "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip";
+  "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp";
+  "hack2" = dontDistribute super."hack2";
+  "hack2-contrib" = dontDistribute super."hack2-contrib";
+  "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra";
+  "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server";
+  "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http";
+  "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server";
+  "hack2-handler-warp" = dontDistribute super."hack2-handler-warp";
+  "hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
+  "hackage-diff" = dontDistribute super."hackage-diff";
+  "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-proxy" = dontDistribute super."hackage-proxy";
+  "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
+  "hackage-security" = dontDistribute super."hackage-security";
+  "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
+  "hackage-server" = dontDistribute super."hackage-server";
+  "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackport" = dontDistribute super."hackport";
+  "hactor" = dontDistribute super."hactor";
+  "hactors" = dontDistribute super."hactors";
+  "haddock" = dontDistribute super."haddock";
+  "haddock-leksah" = dontDistribute super."haddock-leksah";
+  "hadoop-formats" = dontDistribute super."hadoop-formats";
+  "hadoop-rpc" = dontDistribute super."hadoop-rpc";
+  "hadoop-tools" = dontDistribute super."hadoop-tools";
+  "haeredes" = dontDistribute super."haeredes";
+  "haggis" = dontDistribute super."haggis";
+  "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
+  "haiji" = dontDistribute super."haiji";
+  "hailgun" = dontDistribute super."hailgun";
+  "hailgun-send" = dontDistribute super."hailgun-send";
+  "hails" = dontDistribute super."hails";
+  "hails-bin" = dontDistribute super."hails-bin";
+  "hairy" = dontDistribute super."hairy";
+  "hakaru" = dontDistribute super."hakaru";
+  "hake" = dontDistribute super."hake";
+  "hakismet" = dontDistribute super."hakismet";
+  "hako" = dontDistribute super."hako";
+  "hakyll-R" = dontDistribute super."hakyll-R";
+  "hakyll-agda" = dontDistribute super."hakyll-agda";
+  "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
+  "hakyll-contrib" = dontDistribute super."hakyll-contrib";
+  "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation";
+  "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links";
+  "hakyll-convert" = dontDistribute super."hakyll-convert";
+  "hakyll-elm" = dontDistribute super."hakyll-elm";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "halberd" = dontDistribute super."halberd";
+  "halfs" = dontDistribute super."halfs";
+  "halipeto" = dontDistribute super."halipeto";
+  "halive" = dontDistribute super."halive";
+  "halma" = dontDistribute super."halma";
+  "haltavista" = dontDistribute super."haltavista";
+  "hamid" = dontDistribute super."hamid";
+  "hampp" = dontDistribute super."hampp";
+  "hamtmap" = dontDistribute super."hamtmap";
+  "hamusic" = dontDistribute super."hamusic";
+  "handa-gdata" = dontDistribute super."handa-gdata";
+  "handa-geodata" = dontDistribute super."handa-geodata";
+  "handa-opengl" = dontDistribute super."handa-opengl";
+  "handle-like" = dontDistribute super."handle-like";
+  "handsy" = dontDistribute super."handsy";
+  "hangman" = dontDistribute super."hangman";
+  "hannahci" = dontDistribute super."hannahci";
+  "hans" = dontDistribute super."hans";
+  "hans-pcap" = dontDistribute super."hans-pcap";
+  "hans-pfq" = dontDistribute super."hans-pfq";
+  "haphviz" = dontDistribute super."haphviz";
+  "happindicator" = dontDistribute super."happindicator";
+  "happindicator3" = dontDistribute super."happindicator3";
+  "happraise" = dontDistribute super."happraise";
+  "happs-hsp" = dontDistribute super."happs-hsp";
+  "happs-hsp-template" = dontDistribute super."happs-hsp-template";
+  "happs-tutorial" = dontDistribute super."happs-tutorial";
+  "happstack" = dontDistribute super."happstack";
+  "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-contrib" = dontDistribute super."happstack-contrib";
+  "happstack-data" = dontDistribute super."happstack-data";
+  "happstack-dlg" = dontDistribute super."happstack-dlg";
+  "happstack-facebook" = dontDistribute super."happstack-facebook";
+  "happstack-fastcgi" = dontDistribute super."happstack-fastcgi";
+  "happstack-fay" = dontDistribute super."happstack-fay";
+  "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax";
+  "happstack-foundation" = dontDistribute super."happstack-foundation";
+  "happstack-hamlet" = dontDistribute super."happstack-hamlet";
+  "happstack-heist" = dontDistribute super."happstack-heist";
+  "happstack-helpers" = dontDistribute super."happstack-helpers";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
+  "happstack-state" = dontDistribute super."happstack-state";
+  "happstack-static-routing" = dontDistribute super."happstack-static-routing";
+  "happstack-util" = dontDistribute super."happstack-util";
+  "happstack-yui" = dontDistribute super."happstack-yui";
+  "happy-meta" = dontDistribute super."happy-meta";
+  "happybara" = dontDistribute super."happybara";
+  "happybara-webkit" = dontDistribute super."happybara-webkit";
+  "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "har" = dontDistribute super."har";
+  "harchive" = dontDistribute super."harchive";
+  "hardware-edsl" = dontDistribute super."hardware-edsl";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harpy" = dontDistribute super."harpy";
+  "has" = dontDistribute super."has";
+  "has-th" = dontDistribute super."has-th";
+  "hascal" = dontDistribute super."hascal";
+  "hascat" = dontDistribute super."hascat";
+  "hascat-lib" = dontDistribute super."hascat-lib";
+  "hascat-setup" = dontDistribute super."hascat-setup";
+  "hascat-system" = dontDistribute super."hascat-system";
+  "hash" = dontDistribute super."hash";
+  "hashable-generics" = dontDistribute super."hashable-generics";
+  "hashabler" = dontDistribute super."hashabler";
+  "hashed-storage" = dontDistribute super."hashed-storage";
+  "hashids" = dontDistribute super."hashids";
+  "hashring" = dontDistribute super."hashring";
+  "hashtables-plus" = dontDistribute super."hashtables-plus";
+  "hasim" = dontDistribute super."hasim";
+  "hask" = dontDistribute super."hask";
+  "hask-home" = dontDistribute super."hask-home";
+  "haskades" = dontDistribute super."haskades";
+  "haskakafka" = dontDistribute super."haskakafka";
+  "haskanoid" = dontDistribute super."haskanoid";
+  "haskarrow" = dontDistribute super."haskarrow";
+  "haskbot-core" = dontDistribute super."haskbot-core";
+  "haskdeep" = dontDistribute super."haskdeep";
+  "haskdogs" = dontDistribute super."haskdogs";
+  "haskeem" = dontDistribute super."haskeem";
+  "haskeline" = doDistribute super."haskeline_0_7_2_2";
+  "haskeline-class" = dontDistribute super."haskeline-class";
+  "haskell-aliyun" = dontDistribute super."haskell-aliyun";
+  "haskell-awk" = dontDistribute super."haskell-awk";
+  "haskell-bcrypt" = dontDistribute super."haskell-bcrypt";
+  "haskell-brainfuck" = dontDistribute super."haskell-brainfuck";
+  "haskell-cnc" = dontDistribute super."haskell-cnc";
+  "haskell-coffee" = dontDistribute super."haskell-coffee";
+  "haskell-compression" = dontDistribute super."haskell-compression";
+  "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
+  "haskell-docs" = dontDistribute super."haskell-docs";
+  "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "haskell-plot" = dontDistribute super."haskell-plot";
+  "haskell-qrencode" = dontDistribute super."haskell-qrencode";
+  "haskell-read-editor" = dontDistribute super."haskell-read-editor";
+  "haskell-reflect" = dontDistribute super."haskell-reflect";
+  "haskell-rules" = dontDistribute super."haskell-rules";
+  "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
+  "haskell-token-utils" = dontDistribute super."haskell-token-utils";
+  "haskell-tor" = dontDistribute super."haskell-tor";
+  "haskell-type-exts" = dontDistribute super."haskell-type-exts";
+  "haskell-typescript" = dontDistribute super."haskell-typescript";
+  "haskell-tyrant" = dontDistribute super."haskell-tyrant";
+  "haskell-updater" = dontDistribute super."haskell-updater";
+  "haskell-xmpp" = dontDistribute super."haskell-xmpp";
+  "haskell2010" = dontDistribute super."haskell2010";
+  "haskell98" = dontDistribute super."haskell98";
+  "haskell98libraries" = dontDistribute super."haskell98libraries";
+  "haskelldb" = dontDistribute super."haskelldb";
+  "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc";
+  "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl";
+  "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf";
+  "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers";
+  "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted";
+  "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic";
+  "haskelldb-flat" = dontDistribute super."haskelldb-flat";
+  "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc";
+  "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql";
+  "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc";
+  "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql";
+  "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3";
+  "haskelldb-hsql" = dontDistribute super."haskelldb-hsql";
+  "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql";
+  "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc";
+  "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle";
+  "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql";
+  "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite";
+  "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3";
+  "haskelldb-th" = dontDistribute super."haskelldb-th";
+  "haskelldb-wx" = dontDistribute super."haskelldb-wx";
+  "haskellscrabble" = dontDistribute super."haskellscrabble";
+  "haskellscript" = dontDistribute super."haskellscript";
+  "haskelm" = dontDistribute super."haskelm";
+  "haskgame" = dontDistribute super."haskgame";
+  "haskheap" = dontDistribute super."haskheap";
+  "haskhol-core" = dontDistribute super."haskhol-core";
+  "haskmon" = dontDistribute super."haskmon";
+  "haskoin" = dontDistribute super."haskoin";
+  "haskoin-core" = dontDistribute super."haskoin-core";
+  "haskoin-crypto" = dontDistribute super."haskoin-crypto";
+  "haskoin-node" = dontDistribute super."haskoin-node";
+  "haskoin-protocol" = dontDistribute super."haskoin-protocol";
+  "haskoin-script" = dontDistribute super."haskoin-script";
+  "haskoin-util" = dontDistribute super."haskoin-util";
+  "haskoin-wallet" = dontDistribute super."haskoin-wallet";
+  "haskoon" = dontDistribute super."haskoon";
+  "haskoon-httpspec" = dontDistribute super."haskoon-httpspec";
+  "haskoon-salvia" = dontDistribute super."haskoon-salvia";
+  "haskore" = dontDistribute super."haskore";
+  "haskore-realtime" = dontDistribute super."haskore-realtime";
+  "haskore-supercollider" = dontDistribute super."haskore-supercollider";
+  "haskore-synthesizer" = dontDistribute super."haskore-synthesizer";
+  "haskore-vintage" = dontDistribute super."haskore-vintage";
+  "hasktags" = dontDistribute super."hasktags";
+  "haslo" = dontDistribute super."haslo";
+  "hasloGUI" = dontDistribute super."hasloGUI";
+  "hasparql-client" = dontDistribute super."hasparql-client";
+  "haspell" = dontDistribute super."haspell";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "hasql-postgres" = dontDistribute super."hasql-postgres";
+  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
+  "hasql-transaction" = dontDistribute super."hasql-transaction";
+  "hastache-aeson" = dontDistribute super."hastache-aeson";
+  "haste" = dontDistribute super."haste";
+  "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-markup" = dontDistribute super."haste-markup";
+  "haste-perch" = dontDistribute super."haste-perch";
+  "hastily" = dontDistribute super."hastily";
+  "hat" = dontDistribute super."hat";
+  "hatex-guide" = dontDistribute super."hatex-guide";
+  "hath" = dontDistribute super."hath";
+  "hatt" = dontDistribute super."hatt";
+  "haverer" = dontDistribute super."haverer";
+  "hawitter" = dontDistribute super."hawitter";
+  "haxl-amazonka" = dontDistribute super."haxl-amazonka";
+  "haxl-facebook" = dontDistribute super."haxl-facebook";
+  "haxparse" = dontDistribute super."haxparse";
+  "haxr-th" = dontDistribute super."haxr-th";
+  "haxy" = dontDistribute super."haxy";
+  "hayland" = dontDistribute super."hayland";
+  "hayoo-cli" = dontDistribute super."hayoo-cli";
+  "hback" = dontDistribute super."hback";
+  "hbayes" = dontDistribute super."hbayes";
+  "hbb" = dontDistribute super."hbb";
+  "hbcd" = dontDistribute super."hbcd";
+  "hbeat" = dontDistribute super."hbeat";
+  "hblas" = dontDistribute super."hblas";
+  "hblock" = dontDistribute super."hblock";
+  "hbro" = dontDistribute super."hbro";
+  "hbro-contrib" = dontDistribute super."hbro-contrib";
+  "hburg" = dontDistribute super."hburg";
+  "hcc" = dontDistribute super."hcc";
+  "hcg-minus" = dontDistribute super."hcg-minus";
+  "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo";
+  "hcheat" = dontDistribute super."hcheat";
+  "hchesslib" = dontDistribute super."hchesslib";
+  "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
+  "hcron" = dontDistribute super."hcron";
+  "hcube" = dontDistribute super."hcube";
+  "hcwiid" = dontDistribute super."hcwiid";
+  "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix";
+  "hdbc-aeson" = dontDistribute super."hdbc-aeson";
+  "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore";
+  "hdbc-tuple" = dontDistribute super."hdbc-tuple";
+  "hdbi" = dontDistribute super."hdbi";
+  "hdbi-conduit" = dontDistribute super."hdbi-conduit";
+  "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
+  "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
+  "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "hedis-config" = dontDistribute super."hedis-config";
+  "hedis-monadic" = dontDistribute super."hedis-monadic";
+  "hedis-pile" = dontDistribute super."hedis-pile";
+  "hedis-simple" = dontDistribute super."hedis-simple";
+  "hedis-tags" = dontDistribute super."hedis-tags";
+  "hedn" = dontDistribute super."hedn";
+  "hein" = dontDistribute super."hein";
+  "heist-aeson" = dontDistribute super."heist-aeson";
+  "heist-async" = dontDistribute super."heist-async";
+  "helics" = dontDistribute super."helics";
+  "helics-wai" = dontDistribute super."helics-wai";
+  "helisp" = dontDistribute super."helisp";
+  "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
+  "hell" = dontDistribute super."hell";
+  "hellage" = dontDistribute super."hellage";
+  "hellnet" = dontDistribute super."hellnet";
+  "hello" = dontDistribute super."hello";
+  "helm" = dontDistribute super."helm";
+  "help-esb" = dontDistribute super."help-esb";
+  "hemkay" = dontDistribute super."hemkay";
+  "hemkay-core" = dontDistribute super."hemkay-core";
+  "hemokit" = dontDistribute super."hemokit";
+  "hen" = dontDistribute super."hen";
+  "henet" = dontDistribute super."henet";
+  "hepevt" = dontDistribute super."hepevt";
+  "her-lexer" = dontDistribute super."her-lexer";
+  "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
+  "herbalizer" = dontDistribute super."herbalizer";
+  "herf-time" = dontDistribute super."herf-time";
+  "hermit" = dontDistribute super."hermit";
+  "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
+  "heroku" = dontDistribute super."heroku";
+  "heroku-persistent" = dontDistribute super."heroku-persistent";
+  "herringbone" = dontDistribute super."herringbone";
+  "herringbone-embed" = dontDistribute super."herringbone-embed";
+  "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesql" = dontDistribute super."hesql";
+  "hetero-map" = dontDistribute super."hetero-map";
+  "hetris" = dontDistribute super."hetris";
+  "heukarya" = dontDistribute super."heukarya";
+  "hevolisa" = dontDistribute super."hevolisa";
+  "hevolisa-dph" = dontDistribute super."hevolisa-dph";
+  "hexdump" = dontDistribute super."hexdump";
+  "hexif" = dontDistribute super."hexif";
+  "hexpat-iteratee" = dontDistribute super."hexpat-iteratee";
+  "hexpat-lens" = dontDistribute super."hexpat-lens";
+  "hexpat-pickle" = dontDistribute super."hexpat-pickle";
+  "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic";
+  "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup";
+  "hexpr" = dontDistribute super."hexpr";
+  "hexquote" = dontDistribute super."hexquote";
+  "heyefi" = dontDistribute super."heyefi";
+  "hfann" = dontDistribute super."hfann";
+  "hfd" = dontDistribute super."hfd";
+  "hfiar" = dontDistribute super."hfiar";
+  "hfmt" = dontDistribute super."hfmt";
+  "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
+  "hfov" = dontDistribute super."hfov";
+  "hfractal" = dontDistribute super."hfractal";
+  "hfusion" = dontDistribute super."hfusion";
+  "hg-buildpackage" = dontDistribute super."hg-buildpackage";
+  "hgal" = dontDistribute super."hgal";
+  "hgalib" = dontDistribute super."hgalib";
+  "hgdbmi" = dontDistribute super."hgdbmi";
+  "hgearman" = dontDistribute super."hgearman";
+  "hgen" = dontDistribute super."hgen";
+  "hgeometric" = dontDistribute super."hgeometric";
+  "hgeometry" = dontDistribute super."hgeometry";
+  "hgithub" = dontDistribute super."hgithub";
+  "hgl-example" = dontDistribute super."hgl-example";
+  "hgom" = dontDistribute super."hgom";
+  "hgopher" = dontDistribute super."hgopher";
+  "hgrev" = dontDistribute super."hgrev";
+  "hgrib" = dontDistribute super."hgrib";
+  "hharp" = dontDistribute super."hharp";
+  "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams";
+  "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions";
+  "hierarchy" = dontDistribute super."hierarchy";
+  "hiernotify" = dontDistribute super."hiernotify";
+  "highWaterMark" = dontDistribute super."highWaterMark";
+  "higher-leveldb" = dontDistribute super."higher-leveldb";
+  "higherorder" = dontDistribute super."higherorder";
+  "highlight-versions" = dontDistribute super."highlight-versions";
+  "highlighter" = dontDistribute super."highlighter";
+  "highlighter2" = dontDistribute super."highlighter2";
+  "hills" = dontDistribute super."hills";
+  "himerge" = dontDistribute super."himerge";
+  "himg" = dontDistribute super."himg";
+  "himpy" = dontDistribute super."himpy";
+  "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
+  "hinduce-classifier" = dontDistribute super."hinduce-classifier";
+  "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
+  "hinduce-examples" = dontDistribute super."hinduce-examples";
+  "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hipbot" = dontDistribute super."hipbot";
+  "hipe" = dontDistribute super."hipe";
+  "hips" = dontDistribute super."hips";
+  "hircules" = dontDistribute super."hircules";
+  "hirt" = dontDistribute super."hirt";
+  "hissmetrics" = dontDistribute super."hissmetrics";
+  "hist-pl" = dontDistribute super."hist-pl";
+  "hist-pl-dawg" = dontDistribute super."hist-pl-dawg";
+  "hist-pl-fusion" = dontDistribute super."hist-pl-fusion";
+  "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon";
+  "hist-pl-lmf" = dontDistribute super."hist-pl-lmf";
+  "hist-pl-transliter" = dontDistribute super."hist-pl-transliter";
+  "hist-pl-types" = dontDistribute super."hist-pl-types";
+  "histogram-fill-binary" = dontDistribute super."histogram-fill-binary";
+  "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal";
+  "historian" = dontDistribute super."historian";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
+  "hjson" = dontDistribute super."hjson";
+  "hjson-query" = dontDistribute super."hjson-query";
+  "hjsonpointer" = dontDistribute super."hjsonpointer";
+  "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_26";
+  "hlogger" = dontDistribute super."hlogger";
+  "hlongurl" = dontDistribute super."hlongurl";
+  "hls" = dontDistribute super."hls";
+  "hlwm" = dontDistribute super."hlwm";
+  "hly" = dontDistribute super."hly";
+  "hmark" = dontDistribute super."hmark";
+  "hmarkup" = dontDistribute super."hmarkup";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "hmatrix-repa" = dontDistribute super."hmatrix-repa";
+  "hmatrix-special" = dontDistribute super."hmatrix-special";
+  "hmatrix-static" = dontDistribute super."hmatrix-static";
+  "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc";
+  "hmatrix-syntax" = dontDistribute super."hmatrix-syntax";
+  "hmatrix-tests" = dontDistribute super."hmatrix-tests";
+  "hmeap" = dontDistribute super."hmeap";
+  "hmeap-utils" = dontDistribute super."hmeap-utils";
+  "hmemdb" = dontDistribute super."hmemdb";
+  "hmenu" = dontDistribute super."hmenu";
+  "hmidi" = dontDistribute super."hmidi";
+  "hmk" = dontDistribute super."hmk";
+  "hmm" = dontDistribute super."hmm";
+  "hmm-hmatrix" = dontDistribute super."hmm-hmatrix";
+  "hmp3" = dontDistribute super."hmp3";
+  "hmpfr" = dontDistribute super."hmpfr";
+  "hmt" = dontDistribute super."hmt";
+  "hmt-diagrams" = dontDistribute super."hmt-diagrams";
+  "hmumps" = dontDistribute super."hmumps";
+  "hnetcdf" = dontDistribute super."hnetcdf";
+  "hnix" = dontDistribute super."hnix";
+  "hnn" = dontDistribute super."hnn";
+  "hnop" = dontDistribute super."hnop";
+  "ho-rewriting" = dontDistribute super."ho-rewriting";
+  "hoauth" = dontDistribute super."hoauth";
+  "hob" = dontDistribute super."hob";
+  "hobbes" = dontDistribute super."hobbes";
+  "hobbits" = dontDistribute super."hobbits";
+  "hoe" = dontDistribute super."hoe";
+  "hofix-mtl" = dontDistribute super."hofix-mtl";
+  "hog" = dontDistribute super."hog";
+  "hogg" = dontDistribute super."hogg";
+  "hogre" = dontDistribute super."hogre";
+  "hogre-examples" = dontDistribute super."hogre-examples";
+  "hois" = dontDistribute super."hois";
+  "hoist-error" = dontDistribute super."hoist-error";
+  "hold-em" = dontDistribute super."hold-em";
+  "hole" = dontDistribute super."hole";
+  "holey-format" = dontDistribute super."holey-format";
+  "homeomorphic" = dontDistribute super."homeomorphic";
+  "hommage" = dontDistribute super."hommage";
+  "hommage-ds" = dontDistribute super."hommage-ds";
+  "homplexity" = dontDistribute super."homplexity";
+  "honi" = dontDistribute super."honi";
+  "honk" = dontDistribute super."honk";
+  "hoobuddy" = dontDistribute super."hoobuddy";
+  "hood" = dontDistribute super."hood";
+  "hood-off" = dontDistribute super."hood-off";
+  "hood2" = dontDistribute super."hood2";
+  "hoodie" = dontDistribute super."hoodie";
+  "hoodle" = dontDistribute super."hoodle";
+  "hoodle-builder" = dontDistribute super."hoodle-builder";
+  "hoodle-core" = dontDistribute super."hoodle-core";
+  "hoodle-extra" = dontDistribute super."hoodle-extra";
+  "hoodle-parser" = dontDistribute super."hoodle-parser";
+  "hoodle-publish" = dontDistribute super."hoodle-publish";
+  "hoodle-render" = dontDistribute super."hoodle-render";
+  "hoodle-types" = dontDistribute super."hoodle-types";
+  "hoogle-index" = dontDistribute super."hoogle-index";
+  "hooks-dir" = dontDistribute super."hooks-dir";
+  "hoovie" = dontDistribute super."hoovie";
+  "hopencc" = dontDistribute super."hopencc";
+  "hopencl" = dontDistribute super."hopencl";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "hosc-json" = dontDistribute super."hosc-json";
+  "hosc-utils" = dontDistribute super."hosc-utils";
+  "hosts-server" = dontDistribute super."hosts-server";
+  "hothasktags" = dontDistribute super."hothasktags";
+  "hotswap" = dontDistribute super."hotswap";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "hp2any-core" = dontDistribute super."hp2any-core";
+  "hp2any-graph" = dontDistribute super."hp2any-graph";
+  "hp2any-manager" = dontDistribute super."hp2any-manager";
+  "hp2html" = dontDistribute super."hp2html";
+  "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = dontDistribute super."hpack";
+  "hpaco" = dontDistribute super."hpaco";
+  "hpaco-lib" = dontDistribute super."hpaco-lib";
+  "hpage" = dontDistribute super."hpage";
+  "hpapi" = dontDistribute super."hpapi";
+  "hpaste" = dontDistribute super."hpaste";
+  "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "hprotoc-fork" = dontDistribute super."hprotoc-fork";
+  "hps" = dontDistribute super."hps";
+  "hps-cairo" = dontDistribute super."hps-cairo";
+  "hps-kmeans" = dontDistribute super."hps-kmeans";
+  "hpuz" = dontDistribute super."hpuz";
+  "hpygments" = dontDistribute super."hpygments";
+  "hpylos" = dontDistribute super."hpylos";
+  "hpyrg" = dontDistribute super."hpyrg";
+  "hquantlib" = dontDistribute super."hquantlib";
+  "hquery" = dontDistribute super."hquery";
+  "hranker" = dontDistribute super."hranker";
+  "hreader" = dontDistribute super."hreader";
+  "hricket" = dontDistribute super."hricket";
+  "hruby" = dontDistribute super."hruby";
+  "hs-GeoIP" = dontDistribute super."hs-GeoIP";
+  "hs-blake2" = dontDistribute super."hs-blake2";
+  "hs-captcha" = dontDistribute super."hs-captcha";
+  "hs-carbon" = dontDistribute super."hs-carbon";
+  "hs-carbon-examples" = dontDistribute super."hs-carbon-examples";
+  "hs-cdb" = dontDistribute super."hs-cdb";
+  "hs-dotnet" = dontDistribute super."hs-dotnet";
+  "hs-duktape" = dontDistribute super."hs-duktape";
+  "hs-excelx" = dontDistribute super."hs-excelx";
+  "hs-ffmpeg" = dontDistribute super."hs-ffmpeg";
+  "hs-fltk" = dontDistribute super."hs-fltk";
+  "hs-gchart" = dontDistribute super."hs-gchart";
+  "hs-gen-iface" = dontDistribute super."hs-gen-iface";
+  "hs-gizapp" = dontDistribute super."hs-gizapp";
+  "hs-inspector" = dontDistribute super."hs-inspector";
+  "hs-java" = dontDistribute super."hs-java";
+  "hs-json-rpc" = dontDistribute super."hs-json-rpc";
+  "hs-logo" = dontDistribute super."hs-logo";
+  "hs-mesos" = dontDistribute super."hs-mesos";
+  "hs-nombre-generator" = dontDistribute super."hs-nombre-generator";
+  "hs-pgms" = dontDistribute super."hs-pgms";
+  "hs-php-session" = dontDistribute super."hs-php-session";
+  "hs-pkg-config" = dontDistribute super."hs-pkg-config";
+  "hs-pkpass" = dontDistribute super."hs-pkpass";
+  "hs-re" = dontDistribute super."hs-re";
+  "hs-scrape" = dontDistribute super."hs-scrape";
+  "hs-twitter" = dontDistribute super."hs-twitter";
+  "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver";
+  "hs-vcard" = dontDistribute super."hs-vcard";
+  "hs2048" = dontDistribute super."hs2048";
+  "hs2bf" = dontDistribute super."hs2bf";
+  "hs2dot" = dontDistribute super."hs2dot";
+  "hsConfigure" = dontDistribute super."hsConfigure";
+  "hsSqlite3" = dontDistribute super."hsSqlite3";
+  "hsXenCtrl" = dontDistribute super."hsXenCtrl";
+  "hsay" = dontDistribute super."hsay";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "hsbackup" = dontDistribute super."hsbackup";
+  "hsbencher" = dontDistribute super."hsbencher";
+  "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed";
+  "hsbencher-fusion" = dontDistribute super."hsbencher-fusion";
+  "hsc2hs" = dontDistribute super."hsc2hs";
+  "hsc3" = dontDistribute super."hsc3";
+  "hsc3-auditor" = dontDistribute super."hsc3-auditor";
+  "hsc3-cairo" = dontDistribute super."hsc3-cairo";
+  "hsc3-data" = dontDistribute super."hsc3-data";
+  "hsc3-db" = dontDistribute super."hsc3-db";
+  "hsc3-dot" = dontDistribute super."hsc3-dot";
+  "hsc3-forth" = dontDistribute super."hsc3-forth";
+  "hsc3-graphs" = dontDistribute super."hsc3-graphs";
+  "hsc3-lang" = dontDistribute super."hsc3-lang";
+  "hsc3-lisp" = dontDistribute super."hsc3-lisp";
+  "hsc3-plot" = dontDistribute super."hsc3-plot";
+  "hsc3-process" = dontDistribute super."hsc3-process";
+  "hsc3-rec" = dontDistribute super."hsc3-rec";
+  "hsc3-rw" = dontDistribute super."hsc3-rw";
+  "hsc3-server" = dontDistribute super."hsc3-server";
+  "hsc3-sf" = dontDistribute super."hsc3-sf";
+  "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
+  "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
+  "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscamwire" = dontDistribute super."hscamwire";
+  "hscassandra" = dontDistribute super."hscassandra";
+  "hscd" = dontDistribute super."hscd";
+  "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "hsdif" = dontDistribute super."hsdif";
+  "hsdip" = dontDistribute super."hsdip";
+  "hsdns" = dontDistribute super."hsdns";
+  "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsemail-ns" = dontDistribute super."hsemail-ns";
+  "hsenv" = dontDistribute super."hsenv";
+  "hserv" = dontDistribute super."hserv";
+  "hset" = dontDistribute super."hset";
+  "hsfacter" = dontDistribute super."hsfacter";
+  "hsfcsh" = dontDistribute super."hsfcsh";
+  "hsfilt" = dontDistribute super."hsfilt";
+  "hsgnutls" = dontDistribute super."hsgnutls";
+  "hsgnutls-yj" = dontDistribute super."hsgnutls-yj";
+  "hsgsom" = dontDistribute super."hsgsom";
+  "hsgtd" = dontDistribute super."hsgtd";
+  "hsharc" = dontDistribute super."hsharc";
+  "hsilop" = dontDistribute super."hsilop";
+  "hsimport" = dontDistribute super."hsimport";
+  "hsini" = dontDistribute super."hsini";
+  "hskeleton" = dontDistribute super."hskeleton";
+  "hslackbuilder" = dontDistribute super."hslackbuilder";
+  "hslibsvm" = dontDistribute super."hslibsvm";
+  "hslinks" = dontDistribute super."hslinks";
+  "hslogger-reader" = dontDistribute super."hslogger-reader";
+  "hslogger-template" = dontDistribute super."hslogger-template";
+  "hslogger4j" = dontDistribute super."hslogger4j";
+  "hslogstash" = dontDistribute super."hslogstash";
+  "hsmagick" = dontDistribute super."hsmagick";
+  "hsmisc" = dontDistribute super."hsmisc";
+  "hsmtpclient" = dontDistribute super."hsmtpclient";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsnock" = dontDistribute super."hsnock";
+  "hsnoise" = dontDistribute super."hsnoise";
+  "hsns" = dontDistribute super."hsns";
+  "hsnsq" = dontDistribute super."hsnsq";
+  "hsntp" = dontDistribute super."hsntp";
+  "hsoptions" = dontDistribute super."hsoptions";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
+  "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
+  "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
+  "hspec-test-framework" = dontDistribute super."hspec-test-framework";
+  "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
+  "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec2" = dontDistribute super."hspec2";
+  "hspr-sh" = dontDistribute super."hspr-sh";
+  "hspread" = dontDistribute super."hspread";
+  "hspresent" = dontDistribute super."hspresent";
+  "hsprocess" = dontDistribute super."hsprocess";
+  "hsql" = dontDistribute super."hsql";
+  "hsql-mysql" = dontDistribute super."hsql-mysql";
+  "hsql-odbc" = dontDistribute super."hsql-odbc";
+  "hsql-postgresql" = dontDistribute super."hsql-postgresql";
+  "hsql-sqlite3" = dontDistribute super."hsql-sqlite3";
+  "hsqml" = dontDistribute super."hsqml";
+  "hsqml-datamodel" = dontDistribute super."hsqml-datamodel";
+  "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl";
+  "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris";
+  "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes";
+  "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples";
+  "hsqml-morris" = dontDistribute super."hsqml-morris";
+  "hsreadability" = dontDistribute super."hsreadability";
+  "hsseccomp" = dontDistribute super."hsseccomp";
+  "hsshellscript" = dontDistribute super."hsshellscript";
+  "hssourceinfo" = dontDistribute super."hssourceinfo";
+  "hssqlppp" = dontDistribute super."hssqlppp";
+  "hstats" = dontDistribute super."hstats";
+  "hstest" = dontDistribute super."hstest";
+  "hstidy" = dontDistribute super."hstidy";
+  "hstorchat" = dontDistribute super."hstorchat";
+  "hstradeking" = dontDistribute super."hstradeking";
+  "hstyle" = dontDistribute super."hstyle";
+  "hstzaar" = dontDistribute super."hstzaar";
+  "hsubconvert" = dontDistribute super."hsubconvert";
+  "hsverilog" = dontDistribute super."hsverilog";
+  "hswip" = dontDistribute super."hswip";
+  "hsx" = dontDistribute super."hsx";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htags" = dontDistribute super."htags";
+  "htar" = dontDistribute super."htar";
+  "htiled" = dontDistribute super."htiled";
+  "htime" = dontDistribute super."htime";
+  "html-email-validate" = dontDistribute super."html-email-validate";
+  "html-entities" = dontDistribute super."html-entities";
+  "html-kure" = dontDistribute super."html-kure";
+  "html-minimalist" = dontDistribute super."html-minimalist";
+  "html-rules" = dontDistribute super."html-rules";
+  "html-tokenizer" = dontDistribute super."html-tokenizer";
+  "html-truncate" = dontDistribute super."html-truncate";
+  "html2hamlet" = dontDistribute super."html2hamlet";
+  "html5-entity" = dontDistribute super."html5-entity";
+  "htodo" = dontDistribute super."htodo";
+  "htoml" = dontDistribute super."htoml";
+  "htrace" = dontDistribute super."htrace";
+  "hts" = dontDistribute super."hts";
+  "htsn" = dontDistribute super."htsn";
+  "htsn-common" = dontDistribute super."htsn-common";
+  "htsn-import" = dontDistribute super."htsn-import";
+  "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client-auth" = dontDistribute super."http-client-auth";
+  "http-client-conduit" = dontDistribute super."http-client-conduit";
+  "http-client-lens" = dontDistribute super."http-client-lens";
+  "http-client-multipart" = dontDistribute super."http-client-multipart";
+  "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers";
+  "http-client-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "http-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
+  "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
+  "httpspec" = dontDistribute super."httpspec";
+  "htune" = dontDistribute super."htune";
+  "htzaar" = dontDistribute super."htzaar";
+  "hub" = dontDistribute super."hub";
+  "hubigraph" = dontDistribute super."hubigraph";
+  "hubris" = dontDistribute super."hubris";
+  "huckleberry" = dontDistribute super."huckleberry";
+  "huffman" = dontDistribute super."huffman";
+  "hugs2yc" = dontDistribute super."hugs2yc";
+  "hulk" = dontDistribute super."hulk";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-gui" = dontDistribute super."hunit-gui";
+  "hunit-parsec" = dontDistribute super."hunit-parsec";
+  "hunit-rematch" = dontDistribute super."hunit-rematch";
+  "hunp" = dontDistribute super."hunp";
+  "hunt-searchengine" = dontDistribute super."hunt-searchengine";
+  "hunt-server" = dontDistribute super."hunt-server";
+  "hunt-server-cli" = dontDistribute super."hunt-server-cli";
+  "hurdle" = dontDistribute super."hurdle";
+  "husk-scheme" = dontDistribute super."husk-scheme";
+  "husk-scheme-libs" = dontDistribute super."husk-scheme-libs";
+  "husky" = dontDistribute super."husky";
+  "hutton" = dontDistribute super."hutton";
+  "huttons-razor" = dontDistribute super."huttons-razor";
+  "huzzy" = dontDistribute super."huzzy";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hws" = dontDistribute super."hws";
+  "hwsl2" = dontDistribute super."hwsl2";
+  "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector";
+  "hwsl2-reducers" = dontDistribute super."hwsl2-reducers";
+  "hx" = dontDistribute super."hx";
+  "hxmppc" = dontDistribute super."hxmppc";
+  "hxournal" = dontDistribute super."hxournal";
+  "hxt-binary" = dontDistribute super."hxt-binary";
+  "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-extras" = dontDistribute super."hxt-extras";
+  "hxt-filter" = dontDistribute super."hxt-filter";
+  "hxt-xpath" = dontDistribute super."hxt-xpath";
+  "hxt-xslt" = dontDistribute super."hxt-xslt";
+  "hxthelper" = dontDistribute super."hxthelper";
+  "hxweb" = dontDistribute super."hxweb";
+  "hyahtzee" = dontDistribute super."hyahtzee";
+  "hyakko" = dontDistribute super."hyakko";
+  "hybrid" = dontDistribute super."hybrid";
+  "hydra-hs" = dontDistribute super."hydra-hs";
+  "hydra-print" = dontDistribute super."hydra-print";
+  "hydrogen" = dontDistribute super."hydrogen";
+  "hydrogen-cli" = dontDistribute super."hydrogen-cli";
+  "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args";
+  "hydrogen-data" = dontDistribute super."hydrogen-data";
+  "hydrogen-multimap" = dontDistribute super."hydrogen-multimap";
+  "hydrogen-parsing" = dontDistribute super."hydrogen-parsing";
+  "hydrogen-prelude" = dontDistribute super."hydrogen-prelude";
+  "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec";
+  "hydrogen-syntax" = dontDistribute super."hydrogen-syntax";
+  "hydrogen-util" = dontDistribute super."hydrogen-util";
+  "hydrogen-version" = dontDistribute super."hydrogen-version";
+  "hyena" = dontDistribute super."hyena";
+  "hylolib" = dontDistribute super."hylolib";
+  "hylotab" = dontDistribute super."hylotab";
+  "hyloutils" = dontDistribute super."hyloutils";
+  "hyperdrive" = dontDistribute super."hyperdrive";
+  "hyperfunctions" = dontDistribute super."hyperfunctions";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
+  "hzk" = dontDistribute super."hzk";
+  "i18n" = dontDistribute super."i18n";
+  "iCalendar" = dontDistribute super."iCalendar";
+  "iException" = dontDistribute super."iException";
+  "iap-verifier" = dontDistribute super."iap-verifier";
+  "ib-api" = dontDistribute super."ib-api";
+  "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
+  "ideas" = dontDistribute super."ideas";
+  "ideas-math" = dontDistribute super."ideas-math";
+  "idempotent" = dontDistribute super."idempotent";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "ieee" = dontDistribute super."ieee";
+  "ieee-utils" = dontDistribute super."ieee-utils";
+  "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754-parser" = dontDistribute super."ieee754-parser";
+  "ifcxt" = dontDistribute super."ifcxt";
+  "iff" = dontDistribute super."iff";
+  "ifscs" = dontDistribute super."ifscs";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell-display" = dontDistribute super."ihaskell-display";
+  "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "imapget" = dontDistribute super."imapget";
+  "imbib" = dontDistribute super."imbib";
+  "imgurder" = dontDistribute super."imgurder";
+  "imm" = dontDistribute super."imm";
+  "imparse" = dontDistribute super."imparse";
+  "imperative-edsl" = dontDistribute super."imperative-edsl";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
+  "implicit" = dontDistribute super."implicit";
+  "implicit-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "indentparser" = dontDistribute super."indentparser";
+  "index-core" = dontDistribute super."index-core";
+  "indexed" = dontDistribute super."indexed";
+  "indexed-do-notation" = dontDistribute super."indexed-do-notation";
+  "indexed-extras" = dontDistribute super."indexed-extras";
+  "indexed-free" = dontDistribute super."indexed-free";
+  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
+  "indices" = dontDistribute super."indices";
+  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
+  "infer-upstream" = dontDistribute super."infer-upstream";
+  "infernu" = dontDistribute super."infernu";
+  "infinite-search" = dontDistribute super."infinite-search";
+  "infinity" = dontDistribute super."infinity";
+  "infix" = dontDistribute super."infix";
+  "inflist" = dontDistribute super."inflist";
+  "influxdb" = dontDistribute super."influxdb";
+  "informative" = dontDistribute super."informative";
+  "inilist" = dontDistribute super."inilist";
+  "inject" = dontDistribute super."inject";
+  "inject-function" = dontDistribute super."inject-function";
+  "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "instant-aeson" = dontDistribute super."instant-aeson";
+  "instant-bytes" = dontDistribute super."instant-bytes";
+  "instant-deepseq" = dontDistribute super."instant-deepseq";
+  "instant-generics" = dontDistribute super."instant-generics";
+  "instant-hashable" = dontDistribute super."instant-hashable";
+  "instant-zipper" = dontDistribute super."instant-zipper";
+  "instinct" = dontDistribute super."instinct";
+  "instrument-chord" = dontDistribute super."instrument-chord";
+  "int-cast" = dontDistribute super."int-cast";
+  "integer-pure" = dontDistribute super."integer-pure";
+  "intel-aes" = dontDistribute super."intel-aes";
+  "interchangeable" = dontDistribute super."interchangeable";
+  "interleavableGen" = dontDistribute super."interleavableGen";
+  "interleavableIO" = dontDistribute super."interleavableIO";
+  "interleave" = dontDistribute super."interleave";
+  "interlude" = dontDistribute super."interlude";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-streams-http" = dontDistribute super."io-streams-http";
+  "io-throttle" = dontDistribute super."io-throttle";
+  "ioctl" = dontDistribute super."ioctl";
+  "ioref-stable" = dontDistribute super."ioref-stable";
+  "iothread" = dontDistribute super."iothread";
+  "iotransaction" = dontDistribute super."iotransaction";
+  "ip-quoter" = dontDistribute super."ip-quoter";
+  "ipatch" = dontDistribute super."ipatch";
+  "ipc" = dontDistribute super."ipc";
+  "ipcvar" = dontDistribute super."ipcvar";
+  "ipopt-hs" = dontDistribute super."ipopt-hs";
+  "ipprint" = dontDistribute super."ipprint";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-fun-bot" = dontDistribute super."irc-fun-bot";
+  "irc-fun-client" = dontDistribute super."irc-fun-client";
+  "irc-fun-color" = dontDistribute super."irc-fun-color";
+  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "iron-mq" = dontDistribute super."iron-mq";
+  "ironforge" = dontDistribute super."ironforge";
+  "is" = dontDistribute super."is";
+  "isdicom" = dontDistribute super."isdicom";
+  "isevaluated" = dontDistribute super."isevaluated";
+  "isiz" = dontDistribute super."isiz";
+  "ismtp" = dontDistribute super."ismtp";
+  "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
+  "isohunt" = dontDistribute super."isohunt";
+  "itanium-abi" = dontDistribute super."itanium-abi";
+  "iter-stats" = dontDistribute super."iter-stats";
+  "iterIO" = dontDistribute super."iterIO";
+  "iteratee" = dontDistribute super."iteratee";
+  "iteratee-compress" = dontDistribute super."iteratee-compress";
+  "iteratee-mtl" = dontDistribute super."iteratee-mtl";
+  "iteratee-parsec" = dontDistribute super."iteratee-parsec";
+  "iteratee-stm" = dontDistribute super."iteratee-stm";
+  "iterio-server" = dontDistribute super."iterio-server";
+  "ivar-simple" = dontDistribute super."ivar-simple";
+  "ivor" = dontDistribute super."ivor";
+  "ivory" = dontDistribute super."ivory";
+  "ivory-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-examples" = dontDistribute super."ivory-examples";
+  "ivory-hw" = dontDistribute super."ivory-hw";
+  "ivory-opts" = dontDistribute super."ivory-opts";
+  "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-stdlib" = dontDistribute super."ivory-stdlib";
+  "ivy-web" = dontDistribute super."ivy-web";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "iyql" = dontDistribute super."iyql";
+  "j2hs" = dontDistribute super."j2hs";
+  "ja-base-extra" = dontDistribute super."ja-base-extra";
+  "jack" = dontDistribute super."jack";
+  "jack-bindings" = dontDistribute super."jack-bindings";
+  "jackminimix" = dontDistribute super."jackminimix";
+  "jacobi-roots" = dontDistribute super."jacobi-roots";
+  "jail" = dontDistribute super."jail";
+  "jailbreak-cabal" = dontDistribute super."jailbreak-cabal";
+  "jalaali" = dontDistribute super."jalaali";
+  "jalla" = dontDistribute super."jalla";
+  "jammittools" = dontDistribute super."jammittools";
+  "jarfind" = dontDistribute super."jarfind";
+  "java-bridge" = dontDistribute super."java-bridge";
+  "java-bridge-extras" = dontDistribute super."java-bridge-extras";
+  "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
+  "java-reflect" = dontDistribute super."java-reflect";
+  "javasf" = dontDistribute super."javasf";
+  "javav" = dontDistribute super."javav";
+  "jcdecaux-vls" = dontDistribute super."jcdecaux-vls";
+  "jdi" = dontDistribute super."jdi";
+  "jespresso" = dontDistribute super."jespresso";
+  "jobqueue" = dontDistribute super."jobqueue";
+  "join" = dontDistribute super."join";
+  "joinlist" = dontDistribute super."joinlist";
+  "jonathanscard" = dontDistribute super."jonathanscard";
+  "jort" = dontDistribute super."jort";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-b" = dontDistribute super."json-b";
+  "json-encoder" = dontDistribute super."json-encoder";
+  "json-enumerator" = dontDistribute super."json-enumerator";
+  "json-extra" = dontDistribute super."json-extra";
+  "json-fu" = dontDistribute super."json-fu";
+  "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
+  "json-python" = dontDistribute super."json-python";
+  "json-qq" = dontDistribute super."json-qq";
+  "json-rpc" = dontDistribute super."json-rpc";
+  "json-rpc-client" = dontDistribute super."json-rpc-client";
+  "json-rpc-server" = dontDistribute super."json-rpc-server";
+  "json-sop" = dontDistribute super."json-sop";
+  "json-state" = dontDistribute super."json-state";
+  "json-stream" = dontDistribute super."json-stream";
+  "json-togo" = dontDistribute super."json-togo";
+  "json-tools" = dontDistribute super."json-tools";
+  "json-types" = dontDistribute super."json-types";
+  "json2" = dontDistribute super."json2";
+  "json2-hdbc" = dontDistribute super."json2-hdbc";
+  "json2-types" = dontDistribute super."json2-types";
+  "json2yaml" = dontDistribute super."json2yaml";
+  "jsonresume" = dontDistribute super."jsonresume";
+  "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit";
+  "jsonschema-gen" = dontDistribute super."jsonschema-gen";
+  "jsonsql" = dontDistribute super."jsonsql";
+  "jsontsv" = dontDistribute super."jsontsv";
+  "jspath" = dontDistribute super."jspath";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-lava" = dontDistribute super."kansas-lava";
+  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
+  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
+  "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
+  "karakuri" = dontDistribute super."karakuri";
+  "karver" = dontDistribute super."karver";
+  "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
+  "kbq-gu" = dontDistribute super."kbq-gu";
+  "kd-tree" = dontDistribute super."kd-tree";
+  "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
+  "keera-callbacks" = dontDistribute super."keera-callbacks";
+  "keera-hails-i18n" = dontDistribute super."keera-hails-i18n";
+  "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller";
+  "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk";
+  "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel";
+  "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel";
+  "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config";
+  "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk";
+  "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view";
+  "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk";
+  "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs";
+  "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk";
+  "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network";
+  "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling";
+  "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx";
+  "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa";
+  "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses";
+  "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues";
+  "keera-posture" = dontDistribute super."keera-posture";
+  "keiretsu" = dontDistribute super."keiretsu";
+  "kevin" = dontDistribute super."kevin";
+  "keyed" = dontDistribute super."keyed";
+  "keyring" = dontDistribute super."keyring";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "kibro" = dontDistribute super."kibro";
+  "kicad-data" = dontDistribute super."kicad-data";
+  "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
+  "kickchan" = dontDistribute super."kickchan";
+  "kif-parser" = dontDistribute super."kif-parser";
+  "kinds" = dontDistribute super."kinds";
+  "kit" = dontDistribute super."kit";
+  "kmeans-par" = dontDistribute super."kmeans-par";
+  "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knots" = dontDistribute super."knots";
+  "koellner-phonetic" = dontDistribute super."koellner-phonetic";
+  "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
+  "korfu" = dontDistribute super."korfu";
+  "kqueue" = dontDistribute super."kqueue";
+  "krpc" = dontDistribute super."krpc";
+  "ks-test" = dontDistribute super."ks-test";
+  "ktx" = dontDistribute super."ktx";
+  "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate";
+  "kyotocabinet" = dontDistribute super."kyotocabinet";
+  "l-bfgs-b" = dontDistribute super."l-bfgs-b";
+  "labeled-graph" = dontDistribute super."labeled-graph";
+  "labeled-tree" = dontDistribute super."labeled-tree";
+  "laborantin-hs" = dontDistribute super."laborantin-hs";
+  "labyrinth" = dontDistribute super."labyrinth";
+  "labyrinth-server" = dontDistribute super."labyrinth-server";
+  "lackey" = dontDistribute super."lackey";
+  "lagrangian" = dontDistribute super."lagrangian";
+  "laika" = dontDistribute super."laika";
+  "lambda-ast" = dontDistribute super."lambda-ast";
+  "lambda-bridge" = dontDistribute super."lambda-bridge";
+  "lambda-canvas" = dontDistribute super."lambda-canvas";
+  "lambda-devs" = dontDistribute super."lambda-devs";
+  "lambda-options" = dontDistribute super."lambda-options";
+  "lambda-placeholders" = dontDistribute super."lambda-placeholders";
+  "lambda-toolbox" = dontDistribute super."lambda-toolbox";
+  "lambda2js" = dontDistribute super."lambda2js";
+  "lambdaBase" = dontDistribute super."lambdaBase";
+  "lambdaFeed" = dontDistribute super."lambdaFeed";
+  "lambdaLit" = dontDistribute super."lambdaLit";
+  "lambdabot" = dontDistribute super."lambdabot";
+  "lambdabot-core" = dontDistribute super."lambdabot-core";
+  "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins";
+  "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins";
+  "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins";
+  "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins";
+  "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins";
+  "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins";
+  "lambdabot-trusted" = dontDistribute super."lambdabot-trusted";
+  "lambdabot-utils" = dontDistribute super."lambdabot-utils";
+  "lambdacat" = dontDistribute super."lambdacat";
+  "lambdacms-core" = dontDistribute super."lambdacms-core";
+  "lambdacms-media" = dontDistribute super."lambdacms-media";
+  "lambdacube" = dontDistribute super."lambdacube";
+  "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
+  "lambdacube-core" = dontDistribute super."lambdacube-core";
+  "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
+  "lambdacube-engine" = dontDistribute super."lambdacube-engine";
+  "lambdacube-examples" = dontDistribute super."lambdacube-examples";
+  "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "lambdiff" = dontDistribute super."lambdiff";
+  "lame-tester" = dontDistribute super."lame-tester";
+  "language-asn1" = dontDistribute super."language-asn1";
+  "language-bash" = dontDistribute super."language-bash";
+  "language-boogie" = dontDistribute super."language-boogie";
+  "language-c-comments" = dontDistribute super."language-c-comments";
+  "language-c-inline" = dontDistribute super."language-c-inline";
+  "language-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
+  "language-eiffel" = dontDistribute super."language-eiffel";
+  "language-fortran" = dontDistribute super."language-fortran";
+  "language-gcl" = dontDistribute super."language-gcl";
+  "language-go" = dontDistribute super."language-go";
+  "language-guess" = dontDistribute super."language-guess";
+  "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-kort" = dontDistribute super."language-kort";
+  "language-lua" = dontDistribute super."language-lua";
+  "language-lua-qq" = dontDistribute super."language-lua-qq";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-objc" = dontDistribute super."language-objc";
+  "language-openscad" = dontDistribute super."language-openscad";
+  "language-pig" = dontDistribute super."language-pig";
+  "language-puppet" = dontDistribute super."language-puppet";
+  "language-python" = dontDistribute super."language-python";
+  "language-python-colour" = dontDistribute super."language-python-colour";
+  "language-python-test" = dontDistribute super."language-python-test";
+  "language-qux" = dontDistribute super."language-qux";
+  "language-sh" = dontDistribute super."language-sh";
+  "language-slice" = dontDistribute super."language-slice";
+  "language-spelling" = dontDistribute super."language-spelling";
+  "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "launchpad-control" = dontDistribute super."launchpad-control";
+  "lax" = dontDistribute super."lax";
+  "layers" = dontDistribute super."layers";
+  "layers-game" = dontDistribute super."layers-game";
+  "layout" = dontDistribute super."layout";
+  "layout-bootstrap" = dontDistribute super."layout-bootstrap";
+  "lazy-io" = dontDistribute super."lazy-io";
+  "lazyarray" = dontDistribute super."lazyarray";
+  "lazyio" = dontDistribute super."lazyio";
+  "lazysmallcheck" = dontDistribute super."lazysmallcheck";
+  "lazysplines" = dontDistribute super."lazysplines";
+  "lbfgs" = dontDistribute super."lbfgs";
+  "lcs" = dontDistribute super."lcs";
+  "lda" = dontDistribute super."lda";
+  "ldap-client" = dontDistribute super."ldap-client";
+  "ldif" = dontDistribute super."ldif";
+  "leaf" = dontDistribute super."leaf";
+  "leaky" = dontDistribute super."leaky";
+  "leankit-api" = dontDistribute super."leankit-api";
+  "leapseconds-announced" = dontDistribute super."leapseconds-announced";
+  "learn" = dontDistribute super."learn";
+  "learn-physics" = dontDistribute super."learn-physics";
+  "learn-physics-examples" = dontDistribute super."learn-physics-examples";
+  "learning-hmm" = dontDistribute super."learning-hmm";
+  "leetify" = dontDistribute super."leetify";
+  "leksah" = dontDistribute super."leksah";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-sop" = dontDistribute super."lens-sop";
+  "lens-text-encoding" = dontDistribute super."lens-text-encoding";
+  "lens-time" = dontDistribute super."lens-time";
+  "lens-tutorial" = dontDistribute super."lens-tutorial";
+  "lens-utils" = dontDistribute super."lens-utils";
+  "lenses" = dontDistribute super."lenses";
+  "lensref" = dontDistribute super."lensref";
+  "lenz" = dontDistribute super."lenz";
+  "lenz-template" = dontDistribute super."lenz-template";
+  "level-monad" = dontDistribute super."level-monad";
+  "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
+  "levmar" = dontDistribute super."levmar";
+  "levmar-chart" = dontDistribute super."levmar-chart";
+  "lgtk" = dontDistribute super."lgtk";
+  "lha" = dontDistribute super."lha";
+  "lhae" = dontDistribute super."lhae";
+  "lhc" = dontDistribute super."lhc";
+  "lhe" = dontDistribute super."lhe";
+  "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl";
+  "lhs2html" = dontDistribute super."lhs2html";
+  "lhslatex" = dontDistribute super."lhslatex";
+  "libGenI" = dontDistribute super."libGenI";
+  "libarchive-conduit" = dontDistribute super."libarchive-conduit";
+  "libconfig" = dontDistribute super."libconfig";
+  "libcspm" = dontDistribute super."libcspm";
+  "libexpect" = dontDistribute super."libexpect";
+  "libffi" = dontDistribute super."libffi";
+  "libgraph" = dontDistribute super."libgraph";
+  "libhbb" = dontDistribute super."libhbb";
+  "libjenkins" = dontDistribute super."libjenkins";
+  "liblastfm" = dontDistribute super."liblastfm";
+  "liblinear-enumerator" = dontDistribute super."liblinear-enumerator";
+  "libltdl" = dontDistribute super."libltdl";
+  "libmpd" = dontDistribute super."libmpd";
+  "libnvvm" = dontDistribute super."libnvvm";
+  "liboleg" = dontDistribute super."liboleg";
+  "libpafe" = dontDistribute super."libpafe";
+  "libpq" = dontDistribute super."libpq";
+  "librandomorg" = dontDistribute super."librandomorg";
+  "libravatar" = dontDistribute super."libravatar";
+  "libssh2" = dontDistribute super."libssh2";
+  "libssh2-conduit" = dontDistribute super."libssh2-conduit";
+  "libstackexchange" = dontDistribute super."libstackexchange";
+  "libsystemd-daemon" = dontDistribute super."libsystemd-daemon";
+  "libtagc" = dontDistribute super."libtagc";
+  "libvirt-hs" = dontDistribute super."libvirt-hs";
+  "libvorbis" = dontDistribute super."libvorbis";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-threads" = dontDistribute super."lifted-threads";
+  "lifter" = dontDistribute super."lifter";
+  "ligature" = dontDistribute super."ligature";
+  "ligd" = dontDistribute super."ligd";
+  "lighttpd-conf" = dontDistribute super."lighttpd-conf";
+  "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq";
+  "lilypond" = dontDistribute super."lilypond";
+  "limp" = dontDistribute super."limp";
+  "limp-cbc" = dontDistribute super."limp-cbc";
+  "lin-alg" = dontDistribute super."lin-alg";
+  "linda" = dontDistribute super."linda";
+  "lindenmayer" = dontDistribute super."lindenmayer";
+  "line-break" = dontDistribute super."line-break";
+  "line2pdf" = dontDistribute super."line2pdf";
+  "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
+  "linear-circuit" = dontDistribute super."linear-circuit";
+  "linear-grammar" = dontDistribute super."linear-grammar";
+  "linear-maps" = dontDistribute super."linear-maps";
+  "linear-opengl" = dontDistribute super."linear-opengl";
+  "linear-vect" = dontDistribute super."linear-vect";
+  "linearEqSolver" = dontDistribute super."linearEqSolver";
+  "linearscan" = dontDistribute super."linearscan";
+  "linearscan-hoopl" = dontDistribute super."linearscan-hoopl";
+  "linebreak" = dontDistribute super."linebreak";
+  "linguistic-ordinals" = dontDistribute super."linguistic-ordinals";
+  "link-relations" = dontDistribute super."link-relations";
+  "linkchk" = dontDistribute super."linkchk";
+  "linkcore" = dontDistribute super."linkcore";
+  "linkedhashmap" = dontDistribute super."linkedhashmap";
+  "linklater" = dontDistribute super."linklater";
+  "linode" = dontDistribute super."linode";
+  "linux-blkid" = dontDistribute super."linux-blkid";
+  "linux-cgroup" = dontDistribute super."linux-cgroup";
+  "linux-evdev" = dontDistribute super."linux-evdev";
+  "linux-inotify" = dontDistribute super."linux-inotify";
+  "linux-kmod" = dontDistribute super."linux-kmod";
+  "linux-mount" = dontDistribute super."linux-mount";
+  "linux-perf" = dontDistribute super."linux-perf";
+  "linux-ptrace" = dontDistribute super."linux-ptrace";
+  "linux-xattr" = dontDistribute super."linux-xattr";
+  "linx-gateway" = dontDistribute super."linx-gateway";
+  "lio" = dontDistribute super."lio";
+  "lio-eci11" = dontDistribute super."lio-eci11";
+  "lio-fs" = dontDistribute super."lio-fs";
+  "lio-simple" = dontDistribute super."lio-simple";
+  "lipsum-gen" = dontDistribute super."lipsum-gen";
+  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
+  "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "lispparser" = dontDistribute super."lispparser";
+  "list-extras" = dontDistribute super."list-extras";
+  "list-grouping" = dontDistribute super."list-grouping";
+  "list-mux" = dontDistribute super."list-mux";
+  "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
+  "list-t-html-parser" = dontDistribute super."list-t-html-parser";
+  "list-t-http-client" = dontDistribute super."list-t-http-client";
+  "list-t-libcurl" = dontDistribute super."list-t-libcurl";
+  "list-t-text" = dontDistribute super."list-t-text";
+  "list-tries" = dontDistribute super."list-tries";
+  "list-zip-def" = dontDistribute super."list-zip-def";
+  "listlike-instances" = dontDistribute super."listlike-instances";
+  "lists" = dontDistribute super."lists";
+  "listsafe" = dontDistribute super."listsafe";
+  "lit" = dontDistribute super."lit";
+  "literals" = dontDistribute super."literals";
+  "live-sequencer" = dontDistribute super."live-sequencer";
+  "ll-picosat" = dontDistribute super."ll-picosat";
+  "llrbtree" = dontDistribute super."llrbtree";
+  "llsd" = dontDistribute super."llsd";
+  "llvm" = dontDistribute super."llvm";
+  "llvm-analysis" = dontDistribute super."llvm-analysis";
+  "llvm-base" = dontDistribute super."llvm-base";
+  "llvm-base-types" = dontDistribute super."llvm-base-types";
+  "llvm-base-util" = dontDistribute super."llvm-base-util";
+  "llvm-data-interop" = dontDistribute super."llvm-data-interop";
+  "llvm-extra" = dontDistribute super."llvm-extra";
+  "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-general" = dontDistribute super."llvm-general";
+  "llvm-general-pure" = dontDistribute super."llvm-general-pure";
+  "llvm-general-quote" = dontDistribute super."llvm-general-quote";
+  "llvm-ht" = dontDistribute super."llvm-ht";
+  "llvm-pkg-config" = dontDistribute super."llvm-pkg-config";
+  "llvm-pretty" = dontDistribute super."llvm-pretty";
+  "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser";
+  "llvm-tf" = dontDistribute super."llvm-tf";
+  "llvm-tools" = dontDistribute super."llvm-tools";
+  "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
+  "load-env" = dontDistribute super."load-env";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "located-base" = dontDistribute super."located-base";
+  "locators" = dontDistribute super."locators";
+  "loch" = dontDistribute super."loch";
+  "lock-file" = dontDistribute super."lock-file";
+  "locked-poll" = dontDistribute super."locked-poll";
+  "lockfree-queue" = dontDistribute super."lockfree-queue";
+  "log" = dontDistribute super."log";
+  "log-effect" = dontDistribute super."log-effect";
+  "log2json" = dontDistribute super."log2json";
+  "logfloat" = dontDistribute super."logfloat";
+  "logger" = dontDistribute super."logger";
+  "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade-journald" = dontDistribute super."logging-facade-journald";
+  "logic-TPTP" = dontDistribute super."logic-TPTP";
+  "logic-classes" = dontDistribute super."logic-classes";
+  "logicst" = dontDistribute super."logicst";
+  "logplex-parse" = dontDistribute super."logplex-parse";
+  "logsink" = dontDistribute super."logsink";
+  "lojban" = dontDistribute super."lojban";
+  "lojbanParser" = dontDistribute super."lojbanParser";
+  "lojbanXiragan" = dontDistribute super."lojbanXiragan";
+  "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
+  "loli" = dontDistribute super."loli";
+  "lookup-tables" = dontDistribute super."lookup-tables";
+  "loop-effin" = dontDistribute super."loop-effin";
+  "loop-while" = dontDistribute super."loop-while";
+  "loops" = dontDistribute super."loops";
+  "loopy" = dontDistribute super."loopy";
+  "lord" = dontDistribute super."lord";
+  "lorem" = dontDistribute super."lorem";
+  "loris" = dontDistribute super."loris";
+  "loshadka" = dontDistribute super."loshadka";
+  "lostcities" = dontDistribute super."lostcities";
+  "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
+  "ls-usb" = dontDistribute super."ls-usb";
+  "lscabal" = dontDistribute super."lscabal";
+  "lss" = dontDistribute super."lss";
+  "lsystem" = dontDistribute super."lsystem";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "lua-bytecode" = dontDistribute super."lua-bytecode";
+  "luachunk" = dontDistribute super."luachunk";
+  "luautils" = dontDistribute super."luautils";
+  "lub" = dontDistribute super."lub";
+  "lucid-foundation" = dontDistribute super."lucid-foundation";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luka" = dontDistribute super."luka";
+  "lushtags" = dontDistribute super."lushtags";
+  "luthor" = dontDistribute super."luthor";
+  "lvish" = dontDistribute super."lvish";
+  "lvmlib" = dontDistribute super."lvmlib";
+  "lvmrun" = dontDistribute super."lvmrun";
+  "lxc" = dontDistribute super."lxc";
+  "lye" = dontDistribute super."lye";
+  "lz4" = dontDistribute super."lz4";
+  "lzma" = dontDistribute super."lzma";
+  "lzma-clib" = dontDistribute super."lzma-clib";
+  "lzma-enumerator" = dontDistribute super."lzma-enumerator";
+  "lzma-streams" = dontDistribute super."lzma-streams";
+  "maam" = dontDistribute super."maam";
+  "mac" = dontDistribute super."mac";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "machines-zlib" = dontDistribute super."machines-zlib";
+  "macho" = dontDistribute super."macho";
+  "maclight" = dontDistribute super."maclight";
+  "macosx-make-standalone" = dontDistribute super."macosx-make-standalone";
+  "mage" = dontDistribute super."mage";
+  "magico" = dontDistribute super."magico";
+  "magma" = dontDistribute super."magma";
+  "mahoro" = dontDistribute super."mahoro";
+  "maid" = dontDistribute super."maid";
+  "mailbox-count" = dontDistribute super."mailbox-count";
+  "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
+  "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "majordomo" = dontDistribute super."majordomo";
+  "majority" = dontDistribute super."majority";
+  "make-hard-links" = dontDistribute super."make-hard-links";
+  "make-package" = dontDistribute super."make-package";
+  "makedo" = dontDistribute super."makedo";
+  "manatee" = dontDistribute super."manatee";
+  "manatee-all" = dontDistribute super."manatee-all";
+  "manatee-anything" = dontDistribute super."manatee-anything";
+  "manatee-browser" = dontDistribute super."manatee-browser";
+  "manatee-core" = dontDistribute super."manatee-core";
+  "manatee-curl" = dontDistribute super."manatee-curl";
+  "manatee-editor" = dontDistribute super."manatee-editor";
+  "manatee-filemanager" = dontDistribute super."manatee-filemanager";
+  "manatee-imageviewer" = dontDistribute super."manatee-imageviewer";
+  "manatee-ircclient" = dontDistribute super."manatee-ircclient";
+  "manatee-mplayer" = dontDistribute super."manatee-mplayer";
+  "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer";
+  "manatee-processmanager" = dontDistribute super."manatee-processmanager";
+  "manatee-reader" = dontDistribute super."manatee-reader";
+  "manatee-template" = dontDistribute super."manatee-template";
+  "manatee-terminal" = dontDistribute super."manatee-terminal";
+  "manatee-welcome" = dontDistribute super."manatee-welcome";
+  "mancala" = dontDistribute super."mancala";
+  "mandulia" = dontDistribute super."mandulia";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
+  "marionetta" = dontDistribute super."marionetta";
+  "markdown-kate" = dontDistribute super."markdown-kate";
+  "markdown-pap" = dontDistribute super."markdown-pap";
+  "markdown2svg" = dontDistribute super."markdown2svg";
+  "marked-pretty" = dontDistribute super."marked-pretty";
+  "markov" = dontDistribute super."markov";
+  "markov-chain" = dontDistribute super."markov-chain";
+  "markov-processes" = dontDistribute super."markov-processes";
+  "markup-preview" = dontDistribute super."markup-preview";
+  "marmalade-upload" = dontDistribute super."marmalade-upload";
+  "marquise" = dontDistribute super."marquise";
+  "marxup" = dontDistribute super."marxup";
+  "masakazu-bot" = dontDistribute super."masakazu-bot";
+  "mastermind" = dontDistribute super."mastermind";
+  "matchers" = dontDistribute super."matchers";
+  "mathblog" = dontDistribute super."mathblog";
+  "mathgenealogy" = dontDistribute super."mathgenealogy";
+  "mathista" = dontDistribute super."mathista";
+  "mathlink" = dontDistribute super."mathlink";
+  "matlab" = dontDistribute super."matlab";
+  "matrix-market" = dontDistribute super."matrix-market";
+  "matrix-market-pure" = dontDistribute super."matrix-market-pure";
+  "matsuri" = dontDistribute super."matsuri";
+  "maude" = dontDistribute super."maude";
+  "maxent" = dontDistribute super."maxent";
+  "maxsharing" = dontDistribute super."maxsharing";
+  "maybe-justify" = dontDistribute super."maybe-justify";
+  "maybench" = dontDistribute super."maybench";
+  "mbox-tools" = dontDistribute super."mbox-tools";
+  "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples";
+  "mcmc-samplers" = dontDistribute super."mcmc-samplers";
+  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
+  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
+  "mdcat" = dontDistribute super."mdcat";
+  "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
+  "mecab" = dontDistribute super."mecab";
+  "mecha" = dontDistribute super."mecha";
+  "mediawiki" = dontDistribute super."mediawiki";
+  "mediawiki2latex" = dontDistribute super."mediawiki2latex";
+  "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
+  "meep" = dontDistribute super."meep";
+  "mega-sdist" = dontDistribute super."mega-sdist";
+  "meldable-heap" = dontDistribute super."meldable-heap";
+  "melody" = dontDistribute super."melody";
+  "memcache" = dontDistribute super."memcache";
+  "memcache-conduit" = dontDistribute super."memcache-conduit";
+  "memcache-haskell" = dontDistribute super."memcache-haskell";
+  "memcached" = dontDistribute super."memcached";
+  "memexml" = dontDistribute super."memexml";
+  "memo-ptr" = dontDistribute super."memo-ptr";
+  "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memscript" = dontDistribute super."memscript";
+  "mersenne-random" = dontDistribute super."mersenne-random";
+  "messente" = dontDistribute super."messente";
+  "meta-misc" = dontDistribute super."meta-misc";
+  "meta-par" = dontDistribute super."meta-par";
+  "meta-par-accelerate" = dontDistribute super."meta-par-accelerate";
+  "metadata" = dontDistribute super."metadata";
+  "metamorphic" = dontDistribute super."metamorphic";
+  "metaplug" = dontDistribute super."metaplug";
+  "metric" = dontDistribute super."metric";
+  "metricsd-client" = dontDistribute super."metricsd-client";
+  "metronome" = dontDistribute super."metronome";
+  "mezzolens" = dontDistribute super."mezzolens";
+  "mfsolve" = dontDistribute super."mfsolve";
+  "mgeneric" = dontDistribute super."mgeneric";
+  "mi" = dontDistribute super."mi";
+  "microbench" = dontDistribute super."microbench";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microtimer" = dontDistribute super."microtimer";
+  "mida" = dontDistribute super."mida";
+  "midi" = dontDistribute super."midi";
+  "midi-alsa" = dontDistribute super."midi-alsa";
+  "midi-music-box" = dontDistribute super."midi-music-box";
+  "midi-util" = dontDistribute super."midi-util";
+  "midimory" = dontDistribute super."midimory";
+  "midisurface" = dontDistribute super."midisurface";
+  "mighttpd" = dontDistribute super."mighttpd";
+  "mighttpd2" = dontDistribute super."mighttpd2";
+  "mikmod" = dontDistribute super."mikmod";
+  "miku" = dontDistribute super."miku";
+  "milena" = dontDistribute super."milena";
+  "mime" = dontDistribute super."mime";
+  "mime-directory" = dontDistribute super."mime-directory";
+  "mime-string" = dontDistribute super."mime-string";
+  "mines" = dontDistribute super."mines";
+  "minesweeper" = dontDistribute super."minesweeper";
+  "miniball" = dontDistribute super."miniball";
+  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
+  "minimal-configuration" = dontDistribute super."minimal-configuration";
+  "minimorph" = dontDistribute super."minimorph";
+  "minimung" = dontDistribute super."minimung";
+  "minions" = dontDistribute super."minions";
+  "minioperational" = dontDistribute super."minioperational";
+  "miniplex" = dontDistribute super."miniplex";
+  "minirotate" = dontDistribute super."minirotate";
+  "minisat" = dontDistribute super."minisat";
+  "ministg" = dontDistribute super."ministg";
+  "miniutter" = dontDistribute super."miniutter";
+  "minst-idx" = dontDistribute super."minst-idx";
+  "mirror-tweet" = dontDistribute super."mirror-tweet";
+  "missing-py2" = dontDistribute super."missing-py2";
+  "mix-arrows" = dontDistribute super."mix-arrows";
+  "mixed-strategies" = dontDistribute super."mixed-strategies";
+  "mkbndl" = dontDistribute super."mkbndl";
+  "mkcabal" = dontDistribute super."mkcabal";
+  "ml-w" = dontDistribute super."ml-w";
+  "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_5";
+  "mmtl" = dontDistribute super."mmtl";
+  "mmtl-base" = dontDistribute super."mmtl-base";
+  "moan" = dontDistribute super."moan";
+  "modbus-tcp" = dontDistribute super."modbus-tcp";
+  "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4";
+  "modsplit" = dontDistribute super."modsplit";
+  "modular-arithmetic" = dontDistribute super."modular-arithmetic";
+  "modular-prelude" = dontDistribute super."modular-prelude";
+  "modular-prelude-classy" = dontDistribute super."modular-prelude-classy";
+  "module-management" = dontDistribute super."module-management";
+  "modulespection" = dontDistribute super."modulespection";
+  "modulo" = dontDistribute super."modulo";
+  "moe" = dontDistribute super."moe";
+  "mohws" = dontDistribute super."mohws";
+  "monad-abort-fd" = dontDistribute super."monad-abort-fd";
+  "monad-atom" = dontDistribute super."monad-atom";
+  "monad-atom-simple" = dontDistribute super."monad-atom-simple";
+  "monad-bool" = dontDistribute super."monad-bool";
+  "monad-classes" = dontDistribute super."monad-classes";
+  "monad-codec" = dontDistribute super."monad-codec";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "monad-logger" = doDistribute super."monad-logger_0_3_17";
+  "monad-loops-stm" = dontDistribute super."monad-loops-stm";
+  "monad-lrs" = dontDistribute super."monad-lrs";
+  "monad-memo" = dontDistribute super."monad-memo";
+  "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
+  "monad-open" = dontDistribute super."monad-open";
+  "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
+  "monad-param" = dontDistribute super."monad-param";
+  "monad-ran" = dontDistribute super."monad-ran";
+  "monad-resumption" = dontDistribute super."monad-resumption";
+  "monad-state" = dontDistribute super."monad-state";
+  "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
+  "monad-supply" = dontDistribute super."monad-supply";
+  "monad-task" = dontDistribute super."monad-task";
+  "monad-tx" = dontDistribute super."monad-tx";
+  "monad-unify" = dontDistribute super."monad-unify";
+  "monad-wrap" = dontDistribute super."monad-wrap";
+  "monadIO" = dontDistribute super."monadIO";
+  "monadLib-compose" = dontDistribute super."monadLib-compose";
+  "monadacme" = dontDistribute super."monadacme";
+  "monadbi" = dontDistribute super."monadbi";
+  "monadfibre" = dontDistribute super."monadfibre";
+  "monadiccp" = dontDistribute super."monadiccp";
+  "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
+  "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
+  "monadlist" = dontDistribute super."monadlist";
+  "monadloc-pp" = dontDistribute super."monadloc-pp";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_1_2";
+  "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidplus" = dontDistribute super."monoidplus";
+  "monoids" = dontDistribute super."monoids";
+  "monomorphic" = dontDistribute super."monomorphic";
+  "montage" = dontDistribute super."montage";
+  "montage-client" = dontDistribute super."montage-client";
+  "monte-carlo" = dontDistribute super."monte-carlo";
+  "moo" = dontDistribute super."moo";
+  "moonshine" = dontDistribute super."moonshine";
+  "morfette" = dontDistribute super."morfette";
+  "morfeusz" = dontDistribute super."morfeusz";
+  "mosaico-lib" = dontDistribute super."mosaico-lib";
+  "mount" = dontDistribute super."mount";
+  "mp" = dontDistribute super."mp";
+  "mp3decoder" = dontDistribute super."mp3decoder";
+  "mpdmate" = dontDistribute super."mpdmate";
+  "mpppc" = dontDistribute super."mpppc";
+  "mpretty" = dontDistribute super."mpretty";
+  "mpris" = dontDistribute super."mpris";
+  "mprover" = dontDistribute super."mprover";
+  "mps" = dontDistribute super."mps";
+  "mpvguihs" = dontDistribute super."mpvguihs";
+  "mqtt-hs" = dontDistribute super."mqtt-hs";
+  "ms" = dontDistribute super."ms";
+  "msgpack" = dontDistribute super."msgpack";
+  "msgpack-aeson" = dontDistribute super."msgpack-aeson";
+  "msgpack-idl" = dontDistribute super."msgpack-idl";
+  "msgpack-rpc" = dontDistribute super."msgpack-rpc";
+  "msh" = dontDistribute super."msh";
+  "msu" = dontDistribute super."msu";
+  "mtgoxapi" = dontDistribute super."mtgoxapi";
+  "mtl-c" = dontDistribute super."mtl-c";
+  "mtl-evil-instances" = dontDistribute super."mtl-evil-instances";
+  "mtl-tf" = dontDistribute super."mtl-tf";
+  "mtl-unleashed" = dontDistribute super."mtl-unleashed";
+  "mtlparse" = dontDistribute super."mtlparse";
+  "mtlx" = dontDistribute super."mtlx";
+  "mtp" = dontDistribute super."mtp";
+  "mtree" = dontDistribute super."mtree";
+  "mucipher" = dontDistribute super."mucipher";
+  "mudbath" = dontDistribute super."mudbath";
+  "muesli" = dontDistribute super."muesli";
+  "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "multifocal" = dontDistribute super."multifocal";
+  "multihash" = dontDistribute super."multihash";
+  "multipart-names" = dontDistribute super."multipart-names";
+  "multipass" = dontDistribute super."multipass";
+  "multiplate-simplified" = dontDistribute super."multiplate-simplified";
+  "multiplicity" = dontDistribute super."multiplicity";
+  "multirec" = dontDistribute super."multirec";
+  "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
+  "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "murmur3" = dontDistribute super."murmur3";
+  "murmurhash3" = dontDistribute super."murmurhash3";
+  "music-articulation" = dontDistribute super."music-articulation";
+  "music-diatonic" = dontDistribute super."music-diatonic";
+  "music-dynamics" = dontDistribute super."music-dynamics";
+  "music-dynamics-literal" = dontDistribute super."music-dynamics-literal";
+  "music-graphics" = dontDistribute super."music-graphics";
+  "music-parts" = dontDistribute super."music-parts";
+  "music-pitch" = dontDistribute super."music-pitch";
+  "music-pitch-literal" = dontDistribute super."music-pitch-literal";
+  "music-preludes" = dontDistribute super."music-preludes";
+  "music-score" = dontDistribute super."music-score";
+  "music-sibelius" = dontDistribute super."music-sibelius";
+  "music-suite" = dontDistribute super."music-suite";
+  "music-util" = dontDistribute super."music-util";
+  "musicbrainz-email" = dontDistribute super."musicbrainz-email";
+  "musicxml" = dontDistribute super."musicxml";
+  "musicxml2" = dontDistribute super."musicxml2";
+  "mustache-haskell" = dontDistribute super."mustache-haskell";
+  "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-iter" = dontDistribute super."mutable-iter";
+  "mute-unmute" = dontDistribute super."mute-unmute";
+  "mvc" = dontDistribute super."mvc";
+  "mvc-updates" = dontDistribute super."mvc-updates";
+  "mvclient" = dontDistribute super."mvclient";
+  "mwc-random-monad" = dontDistribute super."mwc-random-monad";
+  "myTestlll" = dontDistribute super."myTestlll";
+  "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
+  "myo" = dontDistribute super."myo";
+  "mysnapsession" = dontDistribute super."mysnapsession";
+  "mysnapsession-example" = dontDistribute super."mysnapsession-example";
+  "mysql-effect" = dontDistribute super."mysql-effect";
+  "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
+  "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mzv" = dontDistribute super."mzv";
+  "n-m" = dontDistribute super."n-m";
+  "nagios-perfdata" = dontDistribute super."nagios-perfdata";
+  "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg";
+  "named-formlet" = dontDistribute super."named-formlet";
+  "named-lock" = dontDistribute super."named-lock";
+  "named-records" = dontDistribute super."named-records";
+  "namelist" = dontDistribute super."namelist";
+  "names" = dontDistribute super."names";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "nano-hmac" = dontDistribute super."nano-hmac";
+  "nano-md5" = dontDistribute super."nano-md5";
+  "nanoAgda" = dontDistribute super."nanoAgda";
+  "nanocurses" = dontDistribute super."nanocurses";
+  "nanomsg" = dontDistribute super."nanomsg";
+  "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
+  "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "naturalcomp" = dontDistribute super."naturalcomp";
+  "naturals" = dontDistribute super."naturals";
+  "naver-translate" = dontDistribute super."naver-translate";
+  "nbt" = dontDistribute super."nbt";
+  "nc-indicators" = dontDistribute super."nc-indicators";
+  "ncurses" = dontDistribute super."ncurses";
+  "neat" = dontDistribute super."neat";
+  "needle" = dontDistribute super."needle";
+  "neet" = dontDistribute super."neet";
+  "nehe-tuts" = dontDistribute super."nehe-tuts";
+  "neil" = dontDistribute super."neil";
+  "neither" = dontDistribute super."neither";
+  "nemesis" = dontDistribute super."nemesis";
+  "nemesis-titan" = dontDistribute super."nemesis-titan";
+  "nerf" = dontDistribute super."nerf";
+  "nero" = dontDistribute super."nero";
+  "nero-wai" = dontDistribute super."nero-wai";
+  "nero-warp" = dontDistribute super."nero-warp";
+  "nested-routes" = dontDistribute super."nested-routes";
+  "nested-sets" = dontDistribute super."nested-sets";
+  "nestedmap" = dontDistribute super."nestedmap";
+  "net-concurrent" = dontDistribute super."net-concurrent";
+  "netclock" = dontDistribute super."netclock";
+  "netcore" = dontDistribute super."netcore";
+  "netlines" = dontDistribute super."netlines";
+  "netlink" = dontDistribute super."netlink";
+  "netlist" = dontDistribute super."netlist";
+  "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl";
+  "netpbm" = dontDistribute super."netpbm";
+  "netrc" = dontDistribute super."netrc";
+  "netspec" = dontDistribute super."netspec";
+  "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle-frp" = dontDistribute super."nettle-frp";
+  "nettle-netkit" = dontDistribute super."nettle-netkit";
+  "nettle-openflow" = dontDistribute super."nettle-openflow";
+  "netwire" = dontDistribute super."netwire";
+  "netwire-input" = dontDistribute super."netwire-input";
+  "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network-address" = dontDistribute super."network-address";
+  "network-api-support" = dontDistribute super."network-api-support";
+  "network-bitcoin" = dontDistribute super."network-bitcoin";
+  "network-builder" = dontDistribute super."network-builder";
+  "network-bytestring" = dontDistribute super."network-bytestring";
+  "network-conduit" = dontDistribute super."network-conduit";
+  "network-connection" = dontDistribute super."network-connection";
+  "network-data" = dontDistribute super."network-data";
+  "network-dbus" = dontDistribute super."network-dbus";
+  "network-dns" = dontDistribute super."network-dns";
+  "network-enumerator" = dontDistribute super."network-enumerator";
+  "network-fancy" = dontDistribute super."network-fancy";
+  "network-interfacerequest" = dontDistribute super."network-interfacerequest";
+  "network-ip" = dontDistribute super."network-ip";
+  "network-metrics" = dontDistribute super."network-metrics";
+  "network-minihttp" = dontDistribute super."network-minihttp";
+  "network-msg" = dontDistribute super."network-msg";
+  "network-netpacket" = dontDistribute super."network-netpacket";
+  "network-pgi" = dontDistribute super."network-pgi";
+  "network-rpca" = dontDistribute super."network-rpca";
+  "network-server" = dontDistribute super."network-server";
+  "network-service" = dontDistribute super."network-service";
+  "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr";
+  "network-simple-tls" = dontDistribute super."network-simple-tls";
+  "network-socket-options" = dontDistribute super."network-socket-options";
+  "network-stream" = dontDistribute super."network-stream";
+  "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-uri-static" = dontDistribute super."network-uri-static";
+  "network-wai-router" = dontDistribute super."network-wai-router";
+  "network-websocket" = dontDistribute super."network-websocket";
+  "networked-game" = dontDistribute super."networked-game";
+  "newports" = dontDistribute super."newports";
+  "newsynth" = dontDistribute super."newsynth";
+  "newt" = dontDistribute super."newt";
+  "newtype-deriving" = dontDistribute super."newtype-deriving";
+  "newtype-th" = dontDistribute super."newtype-th";
+  "newtyper" = dontDistribute super."newtyper";
+  "nextstep-plist" = dontDistribute super."nextstep-plist";
+  "nf" = dontDistribute super."nf";
+  "ngrams-loader" = dontDistribute super."ngrams-loader";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "nitro" = dontDistribute super."nitro";
+  "nix-eval" = dontDistribute super."nix-eval";
+  "nixfromnpm" = dontDistribute super."nixfromnpm";
+  "nixos-types" = dontDistribute super."nixos-types";
+  "nkjp" = dontDistribute super."nkjp";
+  "nlp-scores" = dontDistribute super."nlp-scores";
+  "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts";
+  "nm" = dontDistribute super."nm";
+  "nme" = dontDistribute super."nme";
+  "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
+  "no-role-annots" = dontDistribute super."no-role-annots";
+  "nofib-analyse" = dontDistribute super."nofib-analyse";
+  "nofib-analyze" = dontDistribute super."nofib-analyze";
+  "noise" = dontDistribute super."noise";
+  "non-empty" = dontDistribute super."non-empty";
+  "non-negative" = dontDistribute super."non-negative";
+  "nondeterminism" = dontDistribute super."nondeterminism";
+  "nonfree" = dontDistribute super."nonfree";
+  "nonlinear-optimization" = dontDistribute super."nonlinear-optimization";
+  "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad";
+  "noodle" = dontDistribute super."noodle";
+  "normaldistribution" = dontDistribute super."normaldistribution";
+  "not-gloss" = dontDistribute super."not-gloss";
+  "not-gloss-examples" = dontDistribute super."not-gloss-examples";
+  "not-in-base" = dontDistribute super."not-in-base";
+  "notcpp" = dontDistribute super."notcpp";
+  "notmuch-haskell" = dontDistribute super."notmuch-haskell";
+  "notmuch-web" = dontDistribute super."notmuch-web";
+  "notzero" = dontDistribute super."notzero";
+  "np-extras" = dontDistribute super."np-extras";
+  "np-linear" = dontDistribute super."np-linear";
+  "nptools" = dontDistribute super."nptools";
+  "nth-prime" = dontDistribute super."nth-prime";
+  "nthable" = dontDistribute super."nthable";
+  "ntp-control" = dontDistribute super."ntp-control";
+  "null-canvas" = dontDistribute super."null-canvas";
+  "nullary" = dontDistribute super."nullary";
+  "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
+  "numbering" = dontDistribute super."numbering";
+  "numerals" = dontDistribute super."numerals";
+  "numerals-base" = dontDistribute super."numerals-base";
+  "numeric-limits" = dontDistribute super."numeric-limits";
+  "numeric-prelude" = dontDistribute super."numeric-prelude";
+  "numeric-qq" = dontDistribute super."numeric-qq";
+  "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
+  "numeric-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype" = dontDistribute super."numtype";
+  "numtype-tf" = dontDistribute super."numtype-tf";
+  "nurbs" = dontDistribute super."nurbs";
+  "nvim-hs" = dontDistribute super."nvim-hs";
+  "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib";
+  "nyan" = dontDistribute super."nyan";
+  "nylas" = dontDistribute super."nylas";
+  "nymphaea" = dontDistribute super."nymphaea";
+  "oauthenticated" = dontDistribute super."oauthenticated";
+  "obdd" = dontDistribute super."obdd";
+  "oberon0" = dontDistribute super."oberon0";
+  "obj" = dontDistribute super."obj";
+  "objectid" = dontDistribute super."objectid";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "oeis" = dontDistribute super."oeis";
+  "off-simple" = dontDistribute super."off-simple";
+  "ohloh-hs" = dontDistribute super."ohloh-hs";
+  "oi" = dontDistribute super."oi";
+  "oidc-client" = dontDistribute super."oidc-client";
+  "ois-input-manager" = dontDistribute super."ois-input-manager";
+  "old-version" = dontDistribute super."old-version";
+  "olwrapper" = dontDistribute super."olwrapper";
+  "omaketex" = dontDistribute super."omaketex";
+  "omega" = dontDistribute super."omega";
+  "omnicodec" = dontDistribute super."omnicodec";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "one-liner" = dontDistribute super."one-liner";
+  "one-time-password" = dontDistribute super."one-time-password";
+  "oneOfN" = dontDistribute super."oneOfN";
+  "oneormore" = dontDistribute super."oneormore";
+  "only" = dontDistribute super."only";
+  "onu-course" = dontDistribute super."onu-course";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "open-symbology" = dontDistribute super."open-symbology";
+  "open-typerep" = dontDistribute super."open-typerep";
+  "open-union" = dontDistribute super."open-union";
+  "open-witness" = dontDistribute super."open-witness";
+  "opencog-atomspace" = dontDistribute super."opencog-atomspace";
+  "opencv-raw" = dontDistribute super."opencv-raw";
+  "opendatatable" = dontDistribute super."opendatatable";
+  "openexchangerates" = dontDistribute super."openexchangerates";
+  "openflow" = dontDistribute super."openflow";
+  "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
+  "opengles" = dontDistribute super."opengles";
+  "openid" = dontDistribute super."openid";
+  "openpgp" = dontDistribute super."openpgp";
+  "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
+  "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
+  "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "openssh-github-keys" = dontDistribute super."openssh-github-keys";
+  "openssl-createkey" = dontDistribute super."openssl-createkey";
+  "opentheory" = dontDistribute super."opentheory";
+  "opentheory-bits" = dontDistribute super."opentheory-bits";
+  "opentheory-byte" = dontDistribute super."opentheory-byte";
+  "opentheory-char" = dontDistribute super."opentheory-char";
+  "opentheory-divides" = dontDistribute super."opentheory-divides";
+  "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci";
+  "opentheory-parser" = dontDistribute super."opentheory-parser";
+  "opentheory-prime" = dontDistribute super."opentheory-prime";
+  "opentheory-primitive" = dontDistribute super."opentheory-primitive";
+  "opentheory-probability" = dontDistribute super."opentheory-probability";
+  "opentheory-stream" = dontDistribute super."opentheory-stream";
+  "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational-alacarte" = dontDistribute super."operational-alacarte";
+  "opml" = dontDistribute super."opml";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "orc" = dontDistribute super."orc";
+  "orchestrate" = dontDistribute super."orchestrate";
+  "orchid" = dontDistribute super."orchid";
+  "orchid-demo" = dontDistribute super."orchid-demo";
+  "ord-adhoc" = dontDistribute super."ord-adhoc";
+  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistics" = dontDistribute super."order-statistics";
+  "ordered" = dontDistribute super."ordered";
+  "orders" = dontDistribute super."orders";
+  "ordrea" = dontDistribute super."ordrea";
+  "organize-imports" = dontDistribute super."organize-imports";
+  "orgmode" = dontDistribute super."orgmode";
+  "orgmode-parse" = dontDistribute super."orgmode-parse";
+  "origami" = dontDistribute super."origami";
+  "os-release" = dontDistribute super."os-release";
+  "osc" = dontDistribute super."osc";
+  "osm-download" = dontDistribute super."osm-download";
+  "oso2pdf" = dontDistribute super."oso2pdf";
+  "osx-ar" = dontDistribute super."osx-ar";
+  "ot" = dontDistribute super."ot";
+  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "packed-dawg" = dontDistribute super."packed-dawg";
+  "packedstring" = dontDistribute super."packedstring";
+  "packer" = dontDistribute super."packer";
+  "packman" = dontDistribute super."packman";
+  "packunused" = dontDistribute super."packunused";
+  "pacman-memcache" = dontDistribute super."pacman-memcache";
+  "padKONTROL" = dontDistribute super."padKONTROL";
+  "pagarme" = dontDistribute super."pagarme";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
+  "pandoc-crossref" = dontDistribute super."pandoc-crossref";
+  "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
+  "pandoc-include" = dontDistribute super."pandoc-include";
+  "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters";
+  "pandoc-lens" = dontDistribute super."pandoc-lens";
+  "pandoc-placetable" = dontDistribute super."pandoc-placetable";
+  "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-unlit" = dontDistribute super."pandoc-unlit";
+  "papillon" = dontDistribute super."papillon";
+  "pappy" = dontDistribute super."pappy";
+  "para" = dontDistribute super."para";
+  "paragon" = dontDistribute super."paragon";
+  "parallel-tasks" = dontDistribute super."parallel-tasks";
+  "parallel-tree-search" = dontDistribute super."parallel-tree-search";
+  "parameterized-data" = dontDistribute super."parameterized-data";
+  "parco" = dontDistribute super."parco";
+  "parco-attoparsec" = dontDistribute super."parco-attoparsec";
+  "parco-parsec" = dontDistribute super."parco-parsec";
+  "parcom-lib" = dontDistribute super."parcom-lib";
+  "parconc-examples" = dontDistribute super."parconc-examples";
+  "parport" = dontDistribute super."parport";
+  "parse-dimacs" = dontDistribute super."parse-dimacs";
+  "parse-help" = dontDistribute super."parse-help";
+  "parsec-extra" = dontDistribute super."parsec-extra";
+  "parsec-numbers" = dontDistribute super."parsec-numbers";
+  "parsec-parsers" = dontDistribute super."parsec-parsers";
+  "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
+  "parsec-trace" = dontDistribute super."parsec-trace";
+  "parsec-utils" = dontDistribute super."parsec-utils";
+  "parsec1" = dontDistribute super."parsec1";
+  "parsec2" = dontDistribute super."parsec2";
+  "parsec3" = dontDistribute super."parsec3";
+  "parsec3-numbers" = dontDistribute super."parsec3-numbers";
+  "parsedate" = dontDistribute super."parsedate";
+  "parsek" = dontDistribute super."parsek";
+  "parsely" = dontDistribute super."parsely";
+  "parser-helper" = dontDistribute super."parser-helper";
+  "parser241" = dontDistribute super."parser241";
+  "parsergen" = dontDistribute super."parsergen";
+  "parsestar" = dontDistribute super."parsestar";
+  "parsimony" = dontDistribute super."parsimony";
+  "partial" = dontDistribute super."partial";
+  "partial-lens" = dontDistribute super."partial-lens";
+  "partial-uri" = dontDistribute super."partial-uri";
+  "partly" = dontDistribute super."partly";
+  "passage" = dontDistribute super."passage";
+  "passwords" = dontDistribute super."passwords";
+  "pastis" = dontDistribute super."pastis";
+  "pasty" = dontDistribute super."pasty";
+  "patch-combinators" = dontDistribute super."patch-combinators";
+  "patch-image" = dontDistribute super."patch-image";
+  "path-io" = doDistribute super."path-io_0_2_0";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "patronscraper" = dontDistribute super."patronscraper";
+  "patterns" = dontDistribute super."patterns";
+  "paymill" = dontDistribute super."paymill";
+  "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops";
+  "paypal-api" = dontDistribute super."paypal-api";
+  "pb" = dontDistribute super."pb";
+  "pbc4hs" = dontDistribute super."pbc4hs";
+  "pbkdf" = dontDistribute super."pbkdf";
+  "pcap-conduit" = dontDistribute super."pcap-conduit";
+  "pcap-enumerator" = dontDistribute super."pcap-enumerator";
+  "pcd-loader" = dontDistribute super."pcd-loader";
+  "pcf" = dontDistribute super."pcf";
+  "pcg-random" = dontDistribute super."pcg-random";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
+  "pdf2line" = dontDistribute super."pdf2line";
+  "pdfsplit" = dontDistribute super."pdfsplit";
+  "pdynload" = dontDistribute super."pdynload";
+  "peakachu" = dontDistribute super."peakachu";
+  "peano" = dontDistribute super."peano";
+  "peano-inf" = dontDistribute super."peano-inf";
+  "pec" = dontDistribute super."pec";
+  "pecoff" = dontDistribute super."pecoff";
+  "peg" = dontDistribute super."peg";
+  "peggy" = dontDistribute super."peggy";
+  "pell" = dontDistribute super."pell";
+  "penn-treebank" = dontDistribute super."penn-treebank";
+  "penny" = dontDistribute super."penny";
+  "penny-bin" = dontDistribute super."penny-bin";
+  "penny-lib" = dontDistribute super."penny-lib";
+  "peparser" = dontDistribute super."peparser";
+  "perceptron" = dontDistribute super."perceptron";
+  "perdure" = dontDistribute super."perdure";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "persistent-equivalence" = dontDistribute super."persistent-equivalence";
+  "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
+  "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
+  "persistent-map" = dontDistribute super."persistent-map";
+  "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-vector" = dontDistribute super."persistent-vector";
+  "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
+  "persona" = dontDistribute super."persona";
+  "persona-idp" = dontDistribute super."persona-idp";
+  "pesca" = dontDistribute super."pesca";
+  "peyotls" = dontDistribute super."peyotls";
+  "peyotls-codec" = dontDistribute super."peyotls-codec";
+  "pez" = dontDistribute super."pez";
+  "pg-harness" = dontDistribute super."pg-harness";
+  "pg-harness-client" = dontDistribute super."pg-harness-client";
+  "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "phone-numbers" = dontDistribute super."phone-numbers";
+  "phone-push" = dontDistribute super."phone-push";
+  "phonetic-code" = dontDistribute super."phonetic-code";
+  "phooey" = dontDistribute super."phooey";
+  "photoname" = dontDistribute super."photoname";
+  "phraskell" = dontDistribute super."phraskell";
+  "phybin" = dontDistribute super."phybin";
+  "pi-calculus" = dontDistribute super."pi-calculus";
+  "pia-forward" = dontDistribute super."pia-forward";
+  "pianola" = dontDistribute super."pianola";
+  "picologic" = dontDistribute super."picologic";
+  "picosat" = dontDistribute super."picosat";
+  "piet" = dontDistribute super."piet";
+  "piki" = dontDistribute super."piki";
+  "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-cellular" = dontDistribute super."pipes-cellular";
+  "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
+  "pipes-cereal" = dontDistribute super."pipes-cereal";
+  "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-conduit" = dontDistribute super."pipes-conduit";
+  "pipes-core" = dontDistribute super."pipes-core";
+  "pipes-courier" = dontDistribute super."pipes-courier";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-network-tls" = dontDistribute super."pipes-network-tls";
+  "pipes-p2p" = dontDistribute super."pipes-p2p";
+  "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-rt" = dontDistribute super."pipes-rt";
+  "pipes-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-websockets" = dontDistribute super."pipes-websockets";
+  "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
+  "pipes-zlib" = dontDistribute super."pipes-zlib";
+  "pisigma" = dontDistribute super."pisigma";
+  "pit" = dontDistribute super."pit";
+  "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
+  "pkcs1" = dontDistribute super."pkcs1";
+  "pkcs7" = dontDistribute super."pkcs7";
+  "pkggraph" = dontDistribute super."pkggraph";
+  "pktree" = dontDistribute super."pktree";
+  "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
+  "planar-graph" = dontDistribute super."planar-graph";
+  "plat" = dontDistribute super."plat";
+  "playlists" = dontDistribute super."playlists";
+  "plist" = dontDistribute super."plist";
+  "plist-buddy" = dontDistribute super."plist-buddy";
+  "plivo" = dontDistribute super."plivo";
+  "plot-lab" = dontDistribute super."plot-lab";
+  "plotfont" = dontDistribute super."plotfont";
+  "plotserver-api" = dontDistribute super."plotserver-api";
+  "plugins" = dontDistribute super."plugins";
+  "plugins-auto" = dontDistribute super."plugins-auto";
+  "plugins-multistage" = dontDistribute super."plugins-multistage";
+  "plumbers" = dontDistribute super."plumbers";
+  "ply-loader" = dontDistribute super."ply-loader";
+  "png-file" = dontDistribute super."png-file";
+  "pngload" = dontDistribute super."pngload";
+  "pngload-fixed" = dontDistribute super."pngload-fixed";
+  "pnm" = dontDistribute super."pnm";
+  "pocket-dns" = dontDistribute super."pocket-dns";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "pointless-haskell" = dontDistribute super."pointless-haskell";
+  "pointless-lenses" = dontDistribute super."pointless-lenses";
+  "pointless-rewrite" = dontDistribute super."pointless-rewrite";
+  "poker-eval" = dontDistribute super."poker-eval";
+  "pokitdok" = dontDistribute super."pokitdok";
+  "polar" = dontDistribute super."polar";
+  "polar-configfile" = dontDistribute super."polar-configfile";
+  "polar-shader" = dontDistribute super."polar-shader";
+  "polh-lexicon" = dontDistribute super."polh-lexicon";
+  "polimorf" = dontDistribute super."polimorf";
+  "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
+  "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
+  "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
+  "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
+  "pony" = dontDistribute super."pony";
+  "pool" = dontDistribute super."pool";
+  "pool-conduit" = dontDistribute super."pool-conduit";
+  "pooled-io" = dontDistribute super."pooled-io";
+  "pop3-client" = dontDistribute super."pop3-client";
+  "popenhs" = dontDistribute super."popenhs";
+  "poppler" = dontDistribute super."poppler";
+  "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache";
+  "portable-lines" = dontDistribute super."portable-lines";
+  "portaudio" = dontDistribute super."portaudio";
+  "porte" = dontDistribute super."porte";
+  "porter" = dontDistribute super."porter";
+  "ports" = dontDistribute super."ports";
+  "ports-tools" = dontDistribute super."ports-tools";
+  "positive" = dontDistribute super."positive";
+  "posix-acl" = dontDistribute super."posix-acl";
+  "posix-escape" = dontDistribute super."posix-escape";
+  "posix-filelock" = dontDistribute super."posix-filelock";
+  "posix-paths" = dontDistribute super."posix-paths";
+  "posix-pty" = dontDistribute super."posix-pty";
+  "posix-timer" = dontDistribute super."posix-timer";
+  "posix-waitpid" = dontDistribute super."posix-waitpid";
+  "possible" = dontDistribute super."possible";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_7_8";
+  "postgresql-config" = dontDistribute super."postgresql-config";
+  "postgresql-connector" = dontDistribute super."postgresql-connector";
+  "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
+  "postgresql-cube" = dontDistribute super."postgresql-cube";
+  "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
+  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
+  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-typed" = dontDistribute super."postgresql-typed";
+  "postgrest" = dontDistribute super."postgrest";
+  "postie" = dontDistribute super."postie";
+  "postmark" = dontDistribute super."postmark";
+  "postmaster" = dontDistribute super."postmaster";
+  "potato-tool" = dontDistribute super."potato-tool";
+  "potrace" = dontDistribute super."potrace";
+  "potrace-diagrams" = dontDistribute super."potrace-diagrams";
+  "powermate" = dontDistribute super."powermate";
+  "powerpc" = dontDistribute super."powerpc";
+  "ppm" = dontDistribute super."ppm";
+  "pqc" = dontDistribute super."pqc";
+  "pqueue-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "present" = dontDistribute super."present";
+  "press" = dontDistribute super."press";
+  "presto-hdbc" = dontDistribute super."presto-hdbc";
+  "prettify" = dontDistribute super."prettify";
+  "pretty-compact" = dontDistribute super."pretty-compact";
+  "pretty-error" = dontDistribute super."pretty-error";
+  "pretty-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "printxosd" = dontDistribute super."printxosd";
+  "priority-queue" = dontDistribute super."priority-queue";
+  "priority-sync" = dontDistribute super."priority-sync";
+  "privileged-concurrency" = dontDistribute super."privileged-concurrency";
+  "prizm" = dontDistribute super."prizm";
+  "probability" = dontDistribute super."probability";
+  "probable" = dontDistribute super."probable";
+  "proc" = dontDistribute super."proc";
+  "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_7";
+  "process-iterio" = dontDistribute super."process-iterio";
+  "process-leksah" = dontDistribute super."process-leksah";
+  "process-listlike" = dontDistribute super."process-listlike";
+  "process-progress" = dontDistribute super."process-progress";
+  "process-qq" = dontDistribute super."process-qq";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "processing" = dontDistribute super."processing";
+  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
+  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
+  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
+  "procstat" = dontDistribute super."procstat";
+  "proctest" = dontDistribute super."proctest";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "progress" = dontDistribute super."progress";
+  "progressbar" = dontDistribute super."progressbar";
+  "progression" = dontDistribute super."progression";
+  "progressive" = dontDistribute super."progressive";
+  "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings";
+  "projection" = dontDistribute super."projection";
+  "prolog" = dontDistribute super."prolog";
+  "prolog-graph" = dontDistribute super."prolog-graph";
+  "prolog-graph-lib" = dontDistribute super."prolog-graph-lib";
+  "prologue" = dontDistribute super."prologue";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "propane" = dontDistribute super."propane";
+  "propellor" = dontDistribute super."propellor";
+  "properties" = dontDistribute super."properties";
+  "property-list" = dontDistribute super."property-list";
+  "proplang" = dontDistribute super."proplang";
+  "props" = dontDistribute super."props";
+  "prosper" = dontDistribute super."prosper";
+  "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
+  "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork";
+  "proton-haskell" = dontDistribute super."proton-haskell";
+  "prototype" = dontDistribute super."prototype";
+  "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
+  "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
+  "publicsuffixlist" = dontDistribute super."publicsuffixlist";
+  "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
+  "pubnub" = dontDistribute super."pubnub";
+  "pubsub" = dontDistribute super."pubsub";
+  "puffytools" = dontDistribute super."puffytools";
+  "pugixml" = dontDistribute super."pugixml";
+  "pugs-DrIFT" = dontDistribute super."pugs-DrIFT";
+  "pugs-HsSyck" = dontDistribute super."pugs-HsSyck";
+  "pugs-compat" = dontDistribute super."pugs-compat";
+  "pugs-hsregex" = dontDistribute super."pugs-hsregex";
+  "pulse-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-fft" = dontDistribute super."pure-fft";
+  "pure-priority-queue" = dontDistribute super."pure-priority-queue";
+  "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
+  "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "push-notify" = dontDistribute super."push-notify";
+  "push-notify-ccs" = dontDistribute super."push-notify-ccs";
+  "push-notify-general" = dontDistribute super."push-notify-general";
+  "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pushme" = dontDistribute super."pushme";
+  "putlenses" = dontDistribute super."putlenses";
+  "puzzle-draw" = dontDistribute super."puzzle-draw";
+  "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline";
+  "pvd" = dontDistribute super."pvd";
+  "pwstore-cli" = dontDistribute super."pwstore-cli";
+  "pxsl-tools" = dontDistribute super."pxsl-tools";
+  "pyffi" = dontDistribute super."pyffi";
+  "pyfi" = dontDistribute super."pyfi";
+  "python-pickle" = dontDistribute super."python-pickle";
+  "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator";
+  "qd" = dontDistribute super."qd";
+  "qd-vec" = dontDistribute super."qd-vec";
+  "qed" = dontDistribute super."qed";
+  "qhull-simple" = dontDistribute super."qhull-simple";
+  "qrcode" = dontDistribute super."qrcode";
+  "qt" = dontDistribute super."qt";
+  "quadratic-irrational" = dontDistribute super."quadratic-irrational";
+  "quantfin" = dontDistribute super."quantfin";
+  "quantities" = dontDistribute super."quantities";
+  "quantum-arrow" = dontDistribute super."quantum-arrow";
+  "qudb" = dontDistribute super."qudb";
+  "quenya-verb" = dontDistribute super."quenya-verb";
+  "querystring-pickle" = dontDistribute super."querystring-pickle";
+  "queue" = dontDistribute super."queue";
+  "queuelike" = dontDistribute super."queuelike";
+  "quick-generator" = dontDistribute super."quick-generator";
+  "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
+  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
+  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
+  "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
+  "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad";
+  "quickcheck-regex" = dontDistribute super."quickcheck-regex";
+  "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng";
+  "quickcheck-rematch" = dontDistribute super."quickcheck-rematch";
+  "quickcheck-script" = dontDistribute super."quickcheck-script";
+  "quickcheck-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "quiver-bytestring" = dontDistribute super."quiver-bytestring";
+  "quiver-cell" = dontDistribute super."quiver-cell";
+  "quiver-csv" = dontDistribute super."quiver-csv";
+  "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-http" = dontDistribute super."quiver-http";
+  "quoridor-hs" = dontDistribute super."quoridor-hs";
+  "qux" = dontDistribute super."qux";
+  "rabocsv2qif" = dontDistribute super."rabocsv2qif";
+  "rad" = dontDistribute super."rad";
+  "radian" = dontDistribute super."radian";
+  "radium" = dontDistribute super."radium";
+  "radium-formula-parser" = dontDistribute super."radium-formula-parser";
+  "radix" = dontDistribute super."radix";
+  "rados-haskell" = dontDistribute super."rados-haskell";
+  "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
+  "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rake" = dontDistribute super."rake";
+  "rakhana" = dontDistribute super."rakhana";
+  "ralist" = dontDistribute super."ralist";
+  "rallod" = dontDistribute super."rallod";
+  "raml" = dontDistribute super."raml";
+  "rand-vars" = dontDistribute super."rand-vars";
+  "randfile" = dontDistribute super."randfile";
+  "random-access-list" = dontDistribute super."random-access-list";
+  "random-derive" = dontDistribute super."random-derive";
+  "random-eff" = dontDistribute super."random-eff";
+  "random-effin" = dontDistribute super."random-effin";
+  "random-extras" = dontDistribute super."random-extras";
+  "random-hypergeometric" = dontDistribute super."random-hypergeometric";
+  "random-stream" = dontDistribute super."random-stream";
+  "random-variates" = dontDistribute super."random-variates";
+  "randomgen" = dontDistribute super."randomgen";
+  "randproc" = dontDistribute super."randproc";
+  "randsolid" = dontDistribute super."randsolid";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rascal" = dontDistribute super."rascal";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratio-int" = dontDistribute super."ratio-int";
+  "raven-haskell" = dontDistribute super."raven-haskell";
+  "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "rawstring-qm" = dontDistribute super."rawstring-qm";
+  "razom-text-util" = dontDistribute super."razom-text-util";
+  "rbr" = dontDistribute super."rbr";
+  "rclient" = dontDistribute super."rclient";
+  "rcu" = dontDistribute super."rcu";
+  "rdf4h" = dontDistribute super."rdf4h";
+  "rdioh" = dontDistribute super."rdioh";
+  "rdtsc" = dontDistribute super."rdtsc";
+  "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
+  "re2" = dontDistribute super."re2";
+  "react-flux" = dontDistribute super."react-flux";
+  "react-haskell" = dontDistribute super."react-haskell";
+  "reaction-logic" = dontDistribute super."reaction-logic";
+  "reactive" = dontDistribute super."reactive";
+  "reactive-bacon" = dontDistribute super."reactive-bacon";
+  "reactive-balsa" = dontDistribute super."reactive-balsa";
+  "reactive-banana" = dontDistribute super."reactive-banana";
+  "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
+  "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
+  "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
+  "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
+  "reactive-glut" = dontDistribute super."reactive-glut";
+  "reactive-haskell" = dontDistribute super."reactive-haskell";
+  "reactive-io" = dontDistribute super."reactive-io";
+  "reactive-thread" = dontDistribute super."reactive-thread";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
+  "recaptcha" = dontDistribute super."recaptcha";
+  "record" = dontDistribute super."record";
+  "record-aeson" = dontDistribute super."record-aeson";
+  "record-gl" = dontDistribute super."record-gl";
+  "record-preprocessor" = dontDistribute super."record-preprocessor";
+  "record-syntax" = dontDistribute super."record-syntax";
+  "records" = dontDistribute super."records";
+  "records-th" = dontDistribute super."records-th";
+  "recursive-line-count" = dontDistribute super."recursive-line-count";
+  "redHandlers" = dontDistribute super."redHandlers";
+  "reddit" = dontDistribute super."reddit";
+  "redis" = dontDistribute super."redis";
+  "redis-hs" = dontDistribute super."redis-hs";
+  "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-simple" = dontDistribute super."redis-simple";
+  "redo" = dontDistribute super."redo";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "reenact" = dontDistribute super."reenact";
+  "reexport-crypto-random" = dontDistribute super."reexport-crypto-random";
+  "ref" = dontDistribute super."ref";
+  "ref-mtl" = dontDistribute super."ref-mtl";
+  "ref-tf" = dontDistribute super."ref-tf";
+  "refcount" = dontDistribute super."refcount";
+  "reference" = dontDistribute super."reference";
+  "references" = dontDistribute super."references";
+  "refh" = dontDistribute super."refh";
+  "refined" = dontDistribute super."refined";
+  "reflection-extras" = dontDistribute super."reflection-extras";
+  "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
+  "reflex" = dontDistribute super."reflex";
+  "reflex-animation" = dontDistribute super."reflex-animation";
+  "reflex-dom" = dontDistribute super."reflex-dom";
+  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
+  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-deriv" = dontDistribute super."regex-deriv";
+  "regex-dfa" = dontDistribute super."regex-dfa";
+  "regex-easy" = dontDistribute super."regex-easy";
+  "regex-genex" = dontDistribute super."regex-genex";
+  "regex-parsec" = dontDistribute super."regex-parsec";
+  "regex-pderiv" = dontDistribute super."regex-pderiv";
+  "regex-posix-unittest" = dontDistribute super."regex-posix-unittest";
+  "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes";
+  "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter";
+  "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
+  "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
+  "regex-tre" = dontDistribute super."regex-tre";
+  "regex-xmlschema" = dontDistribute super."regex-xmlschema";
+  "regexchar" = dontDistribute super."regexchar";
+  "regexdot" = dontDistribute super."regexdot";
+  "regexp-tries" = dontDistribute super."regexp-tries";
+  "regexpr" = dontDistribute super."regexpr";
+  "regexpr-symbolic" = dontDistribute super."regexpr-symbolic";
+  "regexqq" = dontDistribute super."regexqq";
+  "regional-pointers" = dontDistribute super."regional-pointers";
+  "regions" = dontDistribute super."regions";
+  "regions-monadsfd" = dontDistribute super."regions-monadsfd";
+  "regions-monadstf" = dontDistribute super."regions-monadstf";
+  "regions-mtl" = dontDistribute super."regions-mtl";
+  "regress" = dontDistribute super."regress";
+  "regular" = dontDistribute super."regular";
+  "regular-extras" = dontDistribute super."regular-extras";
+  "regular-web" = dontDistribute super."regular-web";
+  "regular-xmlpickler" = dontDistribute super."regular-xmlpickler";
+  "reheat" = dontDistribute super."reheat";
+  "rehoo" = dontDistribute super."rehoo";
+  "rei" = dontDistribute super."rei";
+  "reified-records" = dontDistribute super."reified-records";
+  "reify" = dontDistribute super."reify";
+  "relacion" = dontDistribute super."relacion";
+  "relation" = dontDistribute super."relation";
+  "relational-postgresql8" = dontDistribute super."relational-postgresql8";
+  "relational-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
+  "remotion" = dontDistribute super."remotion";
+  "renderable" = dontDistribute super."renderable";
+  "reord" = dontDistribute super."reord";
+  "reorderable" = dontDistribute super."reorderable";
+  "repa-array" = dontDistribute super."repa-array";
+  "repa-bytestring" = dontDistribute super."repa-bytestring";
+  "repa-convert" = dontDistribute super."repa-convert";
+  "repa-eval" = dontDistribute super."repa-eval";
+  "repa-examples" = dontDistribute super."repa-examples";
+  "repa-fftw" = dontDistribute super."repa-fftw";
+  "repa-flow" = dontDistribute super."repa-flow";
+  "repa-linear-algebra" = dontDistribute super."repa-linear-algebra";
+  "repa-plugin" = dontDistribute super."repa-plugin";
+  "repa-scalar" = dontDistribute super."repa-scalar";
+  "repa-series" = dontDistribute super."repa-series";
+  "repa-sndfile" = dontDistribute super."repa-sndfile";
+  "repa-stream" = dontDistribute super."repa-stream";
+  "repa-v4l2" = dontDistribute super."repa-v4l2";
+  "repl" = dontDistribute super."repl";
+  "repl-toolkit" = dontDistribute super."repl-toolkit";
+  "repline" = dontDistribute super."repline";
+  "repo-based-blog" = dontDistribute super."repo-based-blog";
+  "repr" = dontDistribute super."repr";
+  "repr-tree-syb" = dontDistribute super."repr-tree-syb";
+  "representable-functors" = dontDistribute super."representable-functors";
+  "representable-profunctors" = dontDistribute super."representable-profunctors";
+  "representable-tries" = dontDistribute super."representable-tries";
+  "request-monad" = dontDistribute super."request-monad";
+  "reserve" = dontDistribute super."reserve";
+  "resistor-cube" = dontDistribute super."resistor-cube";
+  "resource-effect" = dontDistribute super."resource-effect";
+  "resource-embed" = dontDistribute super."resource-embed";
+  "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
+  "resource-pool-monad" = dontDistribute super."resource-pool-monad";
+  "resource-simple" = dontDistribute super."resource-simple";
+  "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-geocoding" = dontDistribute super."reverse-geocoding";
+  "reversi" = dontDistribute super."reversi";
+  "rewrite" = dontDistribute super."rewrite";
+  "rewriting" = dontDistribute super."rewriting";
+  "rex" = dontDistribute super."rex";
+  "rezoom" = dontDistribute super."rezoom";
+  "rfc3339" = dontDistribute super."rfc3339";
+  "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial";
+  "richreports" = dontDistribute super."richreports";
+  "riemann" = dontDistribute super."riemann";
+  "riff" = dontDistribute super."riff";
+  "ring-buffer" = dontDistribute super."ring-buffer";
+  "riot" = dontDistribute super."riot";
+  "ripple" = dontDistribute super."ripple";
+  "ripple-federation" = dontDistribute super."ripple-federation";
+  "risc386" = dontDistribute super."risc386";
+  "rivers" = dontDistribute super."rivers";
+  "rivet" = dontDistribute super."rivet";
+  "rivet-core" = dontDistribute super."rivet-core";
+  "rivet-migration" = dontDistribute super."rivet-migration";
+  "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy";
+  "rlglue" = dontDistribute super."rlglue";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "robin" = dontDistribute super."robin";
+  "robot" = dontDistribute super."robot";
+  "robots-txt" = dontDistribute super."robots-txt";
+  "rocksdb-haskell" = dontDistribute super."rocksdb-haskell";
+  "roguestar" = dontDistribute super."roguestar";
+  "roguestar-engine" = dontDistribute super."roguestar-engine";
+  "roguestar-gl" = dontDistribute super."roguestar-gl";
+  "roguestar-glut" = dontDistribute super."roguestar-glut";
+  "rollbar" = dontDistribute super."rollbar";
+  "roller" = dontDistribute super."roller";
+  "rolling-queue" = dontDistribute super."rolling-queue";
+  "roman-numerals" = dontDistribute super."roman-numerals";
+  "romkan" = dontDistribute super."romkan";
+  "roots" = dontDistribute super."roots";
+  "rope" = dontDistribute super."rope";
+  "rosa" = dontDistribute super."rosa";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "roshask" = dontDistribute super."roshask";
+  "rosso" = dontDistribute super."rosso";
+  "rot13" = dontDistribute super."rot13";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "rounding" = dontDistribute super."rounding";
+  "roundtrip" = dontDistribute super."roundtrip";
+  "roundtrip-aeson" = dontDistribute super."roundtrip-aeson";
+  "roundtrip-string" = dontDistribute super."roundtrip-string";
+  "roundtrip-xml" = dontDistribute super."roundtrip-xml";
+  "route-generator" = dontDistribute super."route-generator";
+  "route-planning" = dontDistribute super."route-planning";
+  "rowrecord" = dontDistribute super."rowrecord";
+  "rpc" = dontDistribute super."rpc";
+  "rpc-framework" = dontDistribute super."rpc-framework";
+  "rpf" = dontDistribute super."rpf";
+  "rpm" = dontDistribute super."rpm";
+  "rsagl" = dontDistribute super."rsagl";
+  "rsagl-frp" = dontDistribute super."rsagl-frp";
+  "rsagl-math" = dontDistribute super."rsagl-math";
+  "rspp" = dontDistribute super."rspp";
+  "rss" = dontDistribute super."rss";
+  "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
+  "rtld" = dontDistribute super."rtld";
+  "rtlsdr" = dontDistribute super."rtlsdr";
+  "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";
+  "rtorrent-state" = dontDistribute super."rtorrent-state";
+  "rubberband" = dontDistribute super."rubberband";
+  "ruby-marshal" = dontDistribute super."ruby-marshal";
+  "ruby-qq" = dontDistribute super."ruby-qq";
+  "ruff" = dontDistribute super."ruff";
+  "ruler" = dontDistribute super."ruler";
+  "ruler-core" = dontDistribute super."ruler-core";
+  "rungekutta" = dontDistribute super."rungekutta";
+  "runghc" = dontDistribute super."runghc";
+  "rwlock" = dontDistribute super."rwlock";
+  "rws" = dontDistribute super."rws";
+  "s-cargot" = dontDistribute super."s-cargot";
+  "safe-access" = dontDistribute super."safe-access";
+  "safe-failure" = dontDistribute super."safe-failure";
+  "safe-failure-cme" = dontDistribute super."safe-failure-cme";
+  "safe-freeze" = dontDistribute super."safe-freeze";
+  "safe-globals" = dontDistribute super."safe-globals";
+  "safe-lazy-io" = dontDistribute super."safe-lazy-io";
+  "safe-length" = dontDistribute super."safe-length";
+  "safe-plugins" = dontDistribute super."safe-plugins";
+  "safe-printf" = dontDistribute super."safe-printf";
+  "safeint" = dontDistribute super."safeint";
+  "safer-file-handles" = dontDistribute super."safer-file-handles";
+  "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
+  "safer-file-handles-text" = dontDistribute super."safer-file-handles-text";
+  "saferoute" = dontDistribute super."saferoute";
+  "sai-shape-syb" = dontDistribute super."sai-shape-syb";
+  "saltine" = dontDistribute super."saltine";
+  "saltine-quickcheck" = dontDistribute super."saltine-quickcheck";
+  "salvia" = dontDistribute super."salvia";
+  "salvia-demo" = dontDistribute super."salvia-demo";
+  "salvia-extras" = dontDistribute super."salvia-extras";
+  "salvia-protocol" = dontDistribute super."salvia-protocol";
+  "salvia-sessions" = dontDistribute super."salvia-sessions";
+  "salvia-websocket" = dontDistribute super."salvia-websocket";
+  "sample-frame" = dontDistribute super."sample-frame";
+  "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "sasl" = dontDistribute super."sasl";
+  "sat" = dontDistribute super."sat";
+  "sat-micro-hs" = dontDistribute super."sat-micro-hs";
+  "satchmo" = dontDistribute super."satchmo";
+  "satchmo-backends" = dontDistribute super."satchmo-backends";
+  "satchmo-examples" = dontDistribute super."satchmo-examples";
+  "satchmo-funsat" = dontDistribute super."satchmo-funsat";
+  "satchmo-minisat" = dontDistribute super."satchmo-minisat";
+  "satchmo-toysat" = dontDistribute super."satchmo-toysat";
+  "sbp" = dontDistribute super."sbp";
+  "sbvPlugin" = dontDistribute super."sbvPlugin";
+  "sc3-rdu" = dontDistribute super."sc3-rdu";
+  "scalable-server" = dontDistribute super."scalable-server";
+  "scaleimage" = dontDistribute super."scaleimage";
+  "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scat" = dontDistribute super."scat";
+  "scc" = dontDistribute super."scc";
+  "scenegraph" = dontDistribute super."scenegraph";
+  "scgi" = dontDistribute super."scgi";
+  "schedevr" = dontDistribute super."schedevr";
+  "schedule-planner" = dontDistribute super."schedule-planner";
+  "schedyield" = dontDistribute super."schedyield";
+  "scholdoc" = dontDistribute super."scholdoc";
+  "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc";
+  "scholdoc-texmath" = dontDistribute super."scholdoc-texmath";
+  "scholdoc-types" = dontDistribute super."scholdoc-types";
+  "schonfinkeling" = dontDistribute super."schonfinkeling";
+  "sci-ratio" = dontDistribute super."sci-ratio";
+  "science-constants" = dontDistribute super."science-constants";
+  "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scion" = dontDistribute super."scion";
+  "scion-browser" = dontDistribute super."scion-browser";
+  "scons2dot" = dontDistribute super."scons2dot";
+  "scope" = dontDistribute super."scope";
+  "scope-cairo" = dontDistribute super."scope-cairo";
+  "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
+  "scotty-binding-play" = dontDistribute super."scotty-binding-play";
+  "scotty-blaze" = dontDistribute super."scotty-blaze";
+  "scotty-cookie" = dontDistribute super."scotty-cookie";
+  "scotty-fay" = dontDistribute super."scotty-fay";
+  "scotty-hastache" = dontDistribute super."scotty-hastache";
+  "scotty-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrz" = dontDistribute super."scrz";
+  "scyther-proof" = dontDistribute super."scyther-proof";
+  "sde-solver" = dontDistribute super."sde-solver";
+  "sdf2p1-parser" = dontDistribute super."sdf2p1-parser";
+  "sdl2-cairo" = dontDistribute super."sdl2-cairo";
+  "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image";
+  "sdl2-compositor" = dontDistribute super."sdl2-compositor";
+  "sdl2-image" = dontDistribute super."sdl2-image";
+  "sdl2-ttf" = dontDistribute super."sdl2-ttf";
+  "sdnv" = dontDistribute super."sdnv";
+  "sdr" = dontDistribute super."sdr";
+  "seacat" = dontDistribute super."seacat";
+  "seal-module" = dontDistribute super."seal-module";
+  "search" = dontDistribute super."search";
+  "sec" = dontDistribute super."sec";
+  "secdh" = dontDistribute super."secdh";
+  "seclib" = dontDistribute super."seclib";
+  "secp256k1" = dontDistribute super."secp256k1";
+  "secret-santa" = dontDistribute super."secret-santa";
+  "secret-sharing" = dontDistribute super."secret-sharing";
+  "secrm" = dontDistribute super."secrm";
+  "secure-sockets" = dontDistribute super."secure-sockets";
+  "sednaDBXML" = dontDistribute super."sednaDBXML";
+  "select" = dontDistribute super."select";
+  "selectors" = dontDistribute super."selectors";
+  "selenium" = dontDistribute super."selenium";
+  "selenium-server" = dontDistribute super."selenium-server";
+  "selfrestart" = dontDistribute super."selfrestart";
+  "selinux" = dontDistribute super."selinux";
+  "semaphore-plus" = dontDistribute super."semaphore-plus";
+  "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups-actions" = dontDistribute super."semigroups-actions";
+  "semiring" = dontDistribute super."semiring";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "sensenet" = dontDistribute super."sensenet";
+  "sentry" = dontDistribute super."sentry";
+  "senza" = dontDistribute super."senza";
+  "separated" = dontDistribute super."separated";
+  "seqaid" = dontDistribute super."seqaid";
+  "seqid" = dontDistribute super."seqid";
+  "seqid-streams" = dontDistribute super."seqid-streams";
+  "seqloc-datafiles" = dontDistribute super."seqloc-datafiles";
+  "sequence" = dontDistribute super."sequence";
+  "sequent-core" = dontDistribute super."sequent-core";
+  "sequential-index" = dontDistribute super."sequential-index";
+  "sequor" = dontDistribute super."sequor";
+  "serial" = dontDistribute super."serial";
+  "serial-test-generators" = dontDistribute super."serial-test-generators";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-with" = dontDistribute super."set-with";
+  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
+  "setops" = dontDistribute super."setops";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
+  "sexp-show" = dontDistribute super."sexp-show";
+  "sexpr" = dontDistribute super."sexpr";
+  "sext" = dontDistribute super."sext";
+  "sfml-audio" = dontDistribute super."sfml-audio";
+  "sfmt" = dontDistribute super."sfmt";
+  "sgd" = dontDistribute super."sgd";
+  "sgf" = dontDistribute super."sgf";
+  "sgrep" = dontDistribute super."sgrep";
+  "sha-streams" = dontDistribute super."sha-streams";
+  "shadower" = dontDistribute super."shadower";
+  "shadowsocks" = dontDistribute super."shadowsocks";
+  "shady-gen" = dontDistribute super."shady-gen";
+  "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake-cabal-build" = dontDistribute super."shake-cabal-build";
+  "shake-extras" = dontDistribute super."shake-extras";
+  "shake-minify" = dontDistribute super."shake-minify";
+  "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
+  "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
+  "shakespeare-css" = dontDistribute super."shakespeare-css";
+  "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
+  "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-text" = dontDistribute super."shakespeare-text";
+  "shana" = dontDistribute super."shana";
+  "shapefile" = dontDistribute super."shapefile";
+  "shapely-data" = dontDistribute super."shapely-data";
+  "sharc-timbre" = dontDistribute super."sharc-timbre";
+  "shared-buffer" = dontDistribute super."shared-buffer";
+  "shared-fields" = dontDistribute super."shared-fields";
+  "shared-memory" = dontDistribute super."shared-memory";
+  "sharedio" = dontDistribute super."sharedio";
+  "she" = dontDistribute super."she";
+  "shelduck" = dontDistribute super."shelduck";
+  "shell-escape" = dontDistribute super."shell-escape";
+  "shell-monad" = dontDistribute super."shell-monad";
+  "shell-pipe" = dontDistribute super."shell-pipe";
+  "shellish" = dontDistribute super."shellish";
+  "shellmate" = dontDistribute super."shellmate";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "shivers-cfg" = dontDistribute super."shivers-cfg";
+  "shoap" = dontDistribute super."shoap";
+  "shortcircuit" = dontDistribute super."shortcircuit";
+  "shorten-strings" = dontDistribute super."shorten-strings";
+  "show" = dontDistribute super."show";
+  "show-type" = dontDistribute super."show-type";
+  "showdown" = dontDistribute super."showdown";
+  "shpider" = dontDistribute super."shpider";
+  "shplit" = dontDistribute super."shplit";
+  "shqq" = dontDistribute super."shqq";
+  "shuffle" = dontDistribute super."shuffle";
+  "sieve" = dontDistribute super."sieve";
+  "sifflet" = dontDistribute super."sifflet";
+  "sifflet-lib" = dontDistribute super."sifflet-lib";
+  "sign" = dontDistribute super."sign";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple-actors" = dontDistribute super."simple-actors";
+  "simple-atom" = dontDistribute super."simple-atom";
+  "simple-bluetooth" = dontDistribute super."simple-bluetooth";
+  "simple-c-value" = dontDistribute super."simple-c-value";
+  "simple-conduit" = dontDistribute super."simple-conduit";
+  "simple-config" = dontDistribute super."simple-config";
+  "simple-css" = dontDistribute super."simple-css";
+  "simple-eval" = dontDistribute super."simple-eval";
+  "simple-firewire" = dontDistribute super."simple-firewire";
+  "simple-form" = dontDistribute super."simple-form";
+  "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm";
+  "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr";
+  "simple-get-opt" = dontDistribute super."simple-get-opt";
+  "simple-index" = dontDistribute super."simple-index";
+  "simple-log" = dontDistribute super."simple-log";
+  "simple-log-syslog" = dontDistribute super."simple-log-syslog";
+  "simple-neural-networks" = dontDistribute super."simple-neural-networks";
+  "simple-nix" = dontDistribute super."simple-nix";
+  "simple-observer" = dontDistribute super."simple-observer";
+  "simple-pascal" = dontDistribute super."simple-pascal";
+  "simple-pipe" = dontDistribute super."simple-pipe";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-sessions" = dontDistribute super."simple-sessions";
+  "simple-sql-parser" = dontDistribute super."simple-sql-parser";
+  "simple-stacked-vm" = dontDistribute super."simple-stacked-vm";
+  "simple-tabular" = dontDistribute super."simple-tabular";
+  "simple-vec3" = dontDistribute super."simple-vec3";
+  "simpleargs" = dontDistribute super."simpleargs";
+  "simpleirc" = dontDistribute super."simpleirc";
+  "simpleirc-lens" = dontDistribute super."simpleirc-lens";
+  "simplenote" = dontDistribute super."simplenote";
+  "simpleprelude" = dontDistribute super."simpleprelude";
+  "simplesmtpclient" = dontDistribute super."simplesmtpclient";
+  "simplessh" = dontDistribute super."simplessh";
+  "simplest-sqlite" = dontDistribute super."simplest-sqlite";
+  "simplex" = dontDistribute super."simplex";
+  "simplex-basic" = dontDistribute super."simplex-basic";
+  "simseq" = dontDistribute super."simseq";
+  "simtreelo" = dontDistribute super."simtreelo";
+  "sindre" = dontDistribute super."sindre";
+  "singleton-nats" = dontDistribute super."singleton-nats";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "sized" = dontDistribute super."sized";
+  "sized-types" = dontDistribute super."sized-types";
+  "sized-vector" = dontDistribute super."sized-vector";
+  "sizes" = dontDistribute super."sizes";
+  "sjsp" = dontDistribute super."sjsp";
+  "skeleton" = dontDistribute super."skeleton";
+  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
+  "skype4hs" = dontDistribute super."skype4hs";
+  "skypelogexport" = dontDistribute super."skypelogexport";
+  "slack" = dontDistribute super."slack";
+  "slack-api" = dontDistribute super."slack-api";
+  "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
+  "slidemews" = dontDistribute super."slidemews";
+  "sloane" = dontDistribute super."sloane";
+  "slot-lambda" = dontDistribute super."slot-lambda";
+  "sloth" = dontDistribute super."sloth";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake-game" = dontDistribute super."snake-game";
+  "snap-accept" = dontDistribute super."snap-accept";
+  "snap-app" = dontDistribute super."snap-app";
+  "snap-auth-cli" = dontDistribute super."snap-auth-cli";
+  "snap-blaze" = dontDistribute super."snap-blaze";
+  "snap-blaze-clay" = dontDistribute super."snap-blaze-clay";
+  "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities";
+  "snap-cors" = dontDistribute super."snap-cors";
+  "snap-elm" = dontDistribute super."snap-elm";
+  "snap-error-collector" = dontDistribute super."snap-error-collector";
+  "snap-extras" = dontDistribute super."snap-extras";
+  "snap-language" = dontDistribute super."snap-language";
+  "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic";
+  "snap-loader-static" = dontDistribute super."snap-loader-static";
+  "snap-predicates" = dontDistribute super."snap-predicates";
+  "snap-testing" = dontDistribute super."snap-testing";
+  "snap-utils" = dontDistribute super."snap-utils";
+  "snap-web-routes" = dontDistribute super."snap-web-routes";
+  "snaplet-acid-state" = dontDistribute super."snaplet-acid-state";
+  "snaplet-actionlog" = dontDistribute super."snaplet-actionlog";
+  "snaplet-amqp" = dontDistribute super."snaplet-amqp";
+  "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid";
+  "snaplet-coffee" = dontDistribute super."snaplet-coffee";
+  "snaplet-css-min" = dontDistribute super."snaplet-css-min";
+  "snaplet-environments" = dontDistribute super."snaplet-environments";
+  "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs";
+  "snaplet-hasql" = dontDistribute super."snaplet-hasql";
+  "snaplet-haxl" = dontDistribute super."snaplet-haxl";
+  "snaplet-hdbc" = dontDistribute super."snaplet-hdbc";
+  "snaplet-hslogger" = dontDistribute super."snaplet-hslogger";
+  "snaplet-i18n" = dontDistribute super."snaplet-i18n";
+  "snaplet-influxdb" = dontDistribute super."snaplet-influxdb";
+  "snaplet-lss" = dontDistribute super."snaplet-lss";
+  "snaplet-mandrill" = dontDistribute super."snaplet-mandrill";
+  "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB";
+  "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic";
+  "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple";
+  "snaplet-oauth" = dontDistribute super."snaplet-oauth";
+  "snaplet-persistent" = dontDistribute super."snaplet-persistent";
+  "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple";
+  "snaplet-postmark" = dontDistribute super."snaplet-postmark";
+  "snaplet-purescript" = dontDistribute super."snaplet-purescript";
+  "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha";
+  "snaplet-redis" = dontDistribute super."snaplet-redis";
+  "snaplet-redson" = dontDistribute super."snaplet-redson";
+  "snaplet-rest" = dontDistribute super."snaplet-rest";
+  "snaplet-riak" = dontDistribute super."snaplet-riak";
+  "snaplet-sass" = dontDistribute super."snaplet-sass";
+  "snaplet-sedna" = dontDistribute super."snaplet-sedna";
+  "snaplet-ses-html" = dontDistribute super."snaplet-ses-html";
+  "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple";
+  "snaplet-stripe" = dontDistribute super."snaplet-stripe";
+  "snaplet-tasks" = dontDistribute super."snaplet-tasks";
+  "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions";
+  "snaplet-wordpress" = dontDistribute super."snaplet-wordpress";
+  "snappy" = dontDistribute super."snappy";
+  "snappy-conduit" = dontDistribute super."snappy-conduit";
+  "snappy-framing" = dontDistribute super."snappy-framing";
+  "snappy-iteratee" = dontDistribute super."snappy-iteratee";
+  "sndfile-enumerators" = dontDistribute super."sndfile-enumerators";
+  "sneakyterm" = dontDistribute super."sneakyterm";
+  "sneathlane-haste" = dontDistribute super."sneathlane-haste";
+  "snippet-extractor" = dontDistribute super."snippet-extractor";
+  "snm" = dontDistribute super."snm";
+  "snow-white" = dontDistribute super."snow-white";
+  "snowball" = dontDistribute super."snowball";
+  "snowglobe" = dontDistribute super."snowglobe";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket-activation" = dontDistribute super."socket-activation";
+  "socket-sctp" = dontDistribute super."socket-sctp";
+  "socketio" = dontDistribute super."socketio";
+  "soegtk" = dontDistribute super."soegtk";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "sorting" = dontDistribute super."sorting";
+  "sorty" = dontDistribute super."sorty";
+  "sound-collage" = dontDistribute super."sound-collage";
+  "sounddelay" = dontDistribute super."sounddelay";
+  "source-code-server" = dontDistribute super."source-code-server";
+  "sousit" = dontDistribute super."sousit";
+  "sox" = dontDistribute super."sox";
+  "soxlib" = dontDistribute super."soxlib";
+  "soyuz" = dontDistribute super."soyuz";
+  "spacefill" = dontDistribute super."spacefill";
+  "spacepart" = dontDistribute super."spacepart";
+  "spaceprobe" = dontDistribute super."spaceprobe";
+  "spanout" = dontDistribute super."spanout";
+  "sparse" = dontDistribute super."sparse";
+  "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
+  "sparsebit" = dontDistribute super."sparsebit";
+  "sparsecheck" = dontDistribute super."sparsecheck";
+  "sparser" = dontDistribute super."sparser";
+  "spata" = dontDistribute super."spata";
+  "spatial-math" = dontDistribute super."spatial-math";
+  "spawn" = dontDistribute super."spawn";
+  "spe" = dontDistribute super."spe";
+  "special-functors" = dontDistribute super."special-functors";
+  "special-keys" = dontDistribute super."special-keys";
+  "specialize-th" = dontDistribute super."specialize-th";
+  "species" = dontDistribute super."species";
+  "speculation-transformers" = dontDistribute super."speculation-transformers";
+  "spelling-suggest" = dontDistribute super."spelling-suggest";
+  "sphero" = dontDistribute super."sphero";
+  "sphinx-cli" = dontDistribute super."sphinx-cli";
+  "spice" = dontDistribute super."spice";
+  "spike" = dontDistribute super."spike";
+  "spine" = dontDistribute super."spine";
+  "spir-v" = dontDistribute super."spir-v";
+  "splay" = dontDistribute super."splay";
+  "splaytree" = dontDistribute super."splaytree";
+  "spline3" = dontDistribute super."spline3";
+  "splines" = dontDistribute super."splines";
+  "split-channel" = dontDistribute super."split-channel";
+  "split-record" = dontDistribute super."split-record";
+  "split-tchan" = dontDistribute super."split-tchan";
+  "splitter" = dontDistribute super."splitter";
+  "splot" = dontDistribute super."splot";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "spsa" = dontDistribute super."spsa";
+  "spy" = dontDistribute super."spy";
+  "sql-simple" = dontDistribute super."sql-simple";
+  "sql-simple-mysql" = dontDistribute super."sql-simple-mysql";
+  "sql-simple-pool" = dontDistribute super."sql-simple-pool";
+  "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql";
+  "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite";
+  "sql-words" = dontDistribute super."sql-words";
+  "sqlite" = dontDistribute super."sqlite";
+  "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed";
+  "sqlvalue-list" = dontDistribute super."sqlvalue-list";
+  "squeeze" = dontDistribute super."squeeze";
+  "sr-extra" = dontDistribute super."sr-extra";
+  "srcinst" = dontDistribute super."srcinst";
+  "srec" = dontDistribute super."srec";
+  "sscgi" = dontDistribute super."sscgi";
+  "ssh" = dontDistribute super."ssh";
+  "sshd-lint" = dontDistribute super."sshd-lint";
+  "sshtun" = dontDistribute super."sshtun";
+  "sssp" = dontDistribute super."sssp";
+  "sstable" = dontDistribute super."sstable";
+  "ssv" = dontDistribute super."ssv";
+  "stable-heap" = dontDistribute super."stable-heap";
+  "stable-maps" = dontDistribute super."stable-maps";
+  "stable-marriage" = dontDistribute super."stable-marriage";
+  "stable-memo" = dontDistribute super."stable-memo";
+  "stable-tree" = dontDistribute super."stable-tree";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
+  "standalone-haddock" = dontDistribute super."standalone-haddock";
+  "star-to-star" = dontDistribute super."star-to-star";
+  "star-to-star-contra" = dontDistribute super."star-to-star-contra";
+  "starling" = dontDistribute super."starling";
+  "starrover2" = dontDistribute super."starrover2";
+  "stash" = dontDistribute super."stash";
+  "state" = dontDistribute super."state";
+  "state-record" = dontDistribute super."state-record";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-firehose" = dontDistribute super."stm-firehose";
+  "stm-io-hooks" = dontDistribute super."stm-io-hooks";
+  "stm-lifted" = dontDistribute super."stm-lifted";
+  "stm-linkedlist" = dontDistribute super."stm-linkedlist";
+  "stm-orelse-io" = dontDistribute super."stm-orelse-io";
+  "stm-promise" = dontDistribute super."stm-promise";
+  "stm-queue-extras" = dontDistribute super."stm-queue-extras";
+  "stm-sbchan" = dontDistribute super."stm-sbchan";
+  "stm-split" = dontDistribute super."stm-split";
+  "stm-tlist" = dontDistribute super."stm-tlist";
+  "stmcontrol" = dontDistribute super."stmcontrol";
+  "stomp-conduit" = dontDistribute super."stomp-conduit";
+  "stomp-patterns" = dontDistribute super."stomp-patterns";
+  "stomp-queue" = dontDistribute super."stomp-queue";
+  "stompl" = dontDistribute super."stompl";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "storable" = dontDistribute super."storable";
+  "storable-record" = dontDistribute super."storable-record";
+  "storable-static-array" = dontDistribute super."storable-static-array";
+  "storable-tuple" = dontDistribute super."storable-tuple";
+  "storablevector" = dontDistribute super."storablevector";
+  "storablevector-carray" = dontDistribute super."storablevector-carray";
+  "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
+  "strict-concurrency" = dontDistribute super."strict-concurrency";
+  "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
+  "strict-identity" = dontDistribute super."strict-identity";
+  "strict-io" = dontDistribute super."strict-io";
+  "strictify" = dontDistribute super."strictify";
+  "strictly" = dontDistribute super."strictly";
+  "string" = dontDistribute super."string";
+  "string-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
+  "stringlike" = dontDistribute super."stringlike";
+  "stringprep" = dontDistribute super."stringprep";
+  "strings" = dontDistribute super."strings";
+  "stringtable-atom" = dontDistribute super."stringtable-atom";
+  "strio" = dontDistribute super."strio";
+  "stripe" = dontDistribute super."stripe";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "structured-haskell-mode" = dontDistribute super."structured-haskell-mode";
+  "structured-mongoDB" = dontDistribute super."structured-mongoDB";
+  "structures" = dontDistribute super."structures";
+  "stunclient" = dontDistribute super."stunclient";
+  "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_4";
+  "stylized" = dontDistribute super."stylized";
+  "sub-state" = dontDistribute super."sub-state";
+  "subhask" = dontDistribute super."subhask";
+  "subleq-toolchain" = dontDistribute super."subleq-toolchain";
+  "subnet" = dontDistribute super."subnet";
+  "subtitleParser" = dontDistribute super."subtitleParser";
+  "subtitles" = dontDistribute super."subtitles";
+  "success" = doDistribute super."success_0_2_5";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "sunlight" = dontDistribute super."sunlight";
+  "sunroof-compiler" = dontDistribute super."sunroof-compiler";
+  "sunroof-examples" = dontDistribute super."sunroof-examples";
+  "sunroof-server" = dontDistribute super."sunroof-server";
+  "super-user-spark" = dontDistribute super."super-user-spark";
+  "supercollider-ht" = dontDistribute super."supercollider-ht";
+  "supercollider-midi" = dontDistribute super."supercollider-midi";
+  "superdoc" = dontDistribute super."superdoc";
+  "supero" = dontDistribute super."supero";
+  "supervisor" = dontDistribute super."supervisor";
+  "suspend" = dontDistribute super."suspend";
+  "svg2q" = dontDistribute super."svg2q";
+  "svgcairo" = dontDistribute super."svgcairo";
+  "svgutils" = dontDistribute super."svgutils";
+  "svm" = dontDistribute super."svm";
+  "svm-light-utils" = dontDistribute super."svm-light-utils";
+  "svm-simple" = dontDistribute super."svm-simple";
+  "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_1_2_1";
+  "swapper" = dontDistribute super."swapper";
+  "swearjure" = dontDistribute super."swearjure";
+  "swf" = dontDistribute super."swf";
+  "swift-lda" = dontDistribute super."swift-lda";
+  "swish" = dontDistribute super."swish";
+  "sws" = dontDistribute super."sws";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text";
+  "sylvia" = dontDistribute super."sylvia";
+  "sym" = dontDistribute super."sym";
+  "sym-plot" = dontDistribute super."sym-plot";
+  "symbol" = dontDistribute super."symbol";
+  "sync" = dontDistribute super."sync";
+  "synchronous-channels" = dontDistribute super."synchronous-channels";
+  "syncthing-hs" = dontDistribute super."syncthing-hs";
+  "synt" = dontDistribute super."synt";
+  "syntactic" = dontDistribute super."syntactic";
+  "syntactical" = dontDistribute super."syntactical";
+  "syntax" = dontDistribute super."syntax";
+  "syntax-attoparsec" = dontDistribute super."syntax-attoparsec";
+  "syntax-example" = dontDistribute super."syntax-example";
+  "syntax-example-json" = dontDistribute super."syntax-example-json";
+  "syntax-pretty" = dontDistribute super."syntax-pretty";
+  "syntax-printer" = dontDistribute super."syntax-printer";
+  "syntax-trees" = dontDistribute super."syntax-trees";
+  "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn";
+  "synthesizer" = dontDistribute super."synthesizer";
+  "synthesizer-alsa" = dontDistribute super."synthesizer-alsa";
+  "synthesizer-core" = dontDistribute super."synthesizer-core";
+  "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional";
+  "synthesizer-filter" = dontDistribute super."synthesizer-filter";
+  "synthesizer-inference" = dontDistribute super."synthesizer-inference";
+  "synthesizer-llvm" = dontDistribute super."synthesizer-llvm";
+  "synthesizer-midi" = dontDistribute super."synthesizer-midi";
+  "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient";
+  "sys-process" = dontDistribute super."sys-process";
+  "system-canonicalpath" = dontDistribute super."system-canonicalpath";
+  "system-command" = dontDistribute super."system-command";
+  "system-gpio" = dontDistribute super."system-gpio";
+  "system-inotify" = dontDistribute super."system-inotify";
+  "system-lifted" = dontDistribute super."system-lifted";
+  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
+  "system-util" = dontDistribute super."system-util";
+  "system-uuid" = dontDistribute super."system-uuid";
+  "systemd" = dontDistribute super."systemd";
+  "t-regex" = dontDistribute super."t-regex";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "table-tennis" = dontDistribute super."table-tennis";
+  "tableaux" = dontDistribute super."tableaux";
+  "tables" = dontDistribute super."tables";
+  "tablestorage" = dontDistribute super."tablestorage";
+  "tabloid" = dontDistribute super."tabloid";
+  "taffybar" = dontDistribute super."taffybar";
+  "tag-bits" = dontDistribute super."tag-bits";
+  "tag-stream" = dontDistribute super."tag-stream";
+  "tagchup" = dontDistribute super."tagchup";
+  "tagged-exception-core" = dontDistribute super."tagged-exception-core";
+  "tagged-list" = dontDistribute super."tagged-list";
+  "tagged-th" = dontDistribute super."tagged-th";
+  "tagged-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "taglib" = dontDistribute super."taglib";
+  "taglib-api" = dontDistribute super."taglib-api";
+  "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup-ht" = dontDistribute super."tagsoup-ht";
+  "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "takahashi" = dontDistribute super."takahashi";
+  "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tamarin-prover" = dontDistribute super."tamarin-prover";
+  "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
+  "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
+  "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
+  "tamper" = dontDistribute super."tamper";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "taskpool" = dontDistribute super."taskpool";
+  "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
+  "tasty-integrate" = dontDistribute super."tasty-integrate";
+  "tasty-laws" = dontDistribute super."tasty-laws";
+  "tasty-lens" = dontDistribute super."tasty-lens";
+  "tasty-program" = dontDistribute super."tasty-program";
+  "tateti-tateti" = dontDistribute super."tateti-tateti";
+  "tau" = dontDistribute super."tau";
+  "tbox" = dontDistribute super."tbox";
+  "tcache-AWS" = dontDistribute super."tcache-AWS";
+  "tccli" = dontDistribute super."tccli";
+  "tce-conf" = dontDistribute super."tce-conf";
+  "tconfig" = dontDistribute super."tconfig";
+  "tcp" = dontDistribute super."tcp";
+  "tdd-util" = dontDistribute super."tdd-util";
+  "tdoc" = dontDistribute super."tdoc";
+  "teams" = dontDistribute super."teams";
+  "teeth" = dontDistribute super."teeth";
+  "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
+  "template-default" = dontDistribute super."template-default";
+  "template-haskell-util" = dontDistribute super."template-haskell-util";
+  "template-hsml" = dontDistribute super."template-hsml";
+  "template-yj" = dontDistribute super."template-yj";
+  "templatepg" = dontDistribute super."templatepg";
+  "templater" = dontDistribute super."templater";
+  "tempodb" = dontDistribute super."tempodb";
+  "temporal-csound" = dontDistribute super."temporal-csound";
+  "temporal-media" = dontDistribute super."temporal-media";
+  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
+  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
+  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
+  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
+  "tempus" = dontDistribute super."tempus";
+  "tempus-fugit" = dontDistribute super."tempus-fugit";
+  "tensor" = dontDistribute super."tensor";
+  "term-rewriting" = dontDistribute super."term-rewriting";
+  "termbox-bindings" = dontDistribute super."termbox-bindings";
+  "termination-combinators" = dontDistribute super."termination-combinators";
+  "terminfo" = doDistribute super."terminfo_0_4_0_2";
+  "terminfo-hs" = dontDistribute super."terminfo-hs";
+  "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
+  "terrahs" = dontDistribute super."terrahs";
+  "tersmu" = dontDistribute super."tersmu";
+  "test-framework-doctest" = dontDistribute super."test-framework-doctest";
+  "test-framework-golden" = dontDistribute super."test-framework-golden";
+  "test-framework-program" = dontDistribute super."test-framework-program";
+  "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck";
+  "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
+  "test-framework-skip" = dontDistribute super."test-framework-skip";
+  "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-invariant" = dontDistribute super."test-invariant";
+  "test-pkg" = dontDistribute super."test-pkg";
+  "test-sandbox" = dontDistribute super."test-sandbox";
+  "test-sandbox-compose" = dontDistribute super."test-sandbox-compose";
+  "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit";
+  "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
+  "test-shouldbe" = dontDistribute super."test-shouldbe";
+  "testPkg" = dontDistribute super."testPkg";
+  "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
+  "testloop" = dontDistribute super."testloop";
+  "testpack" = dontDistribute super."testpack";
+  "testpattern" = dontDistribute super."testpattern";
+  "testrunner" = dontDistribute super."testrunner";
+  "tetris" = dontDistribute super."tetris";
+  "tex2txt" = dontDistribute super."tex2txt";
+  "texrunner" = dontDistribute super."texrunner";
+  "text-and-plots" = dontDistribute super."text-and-plots";
+  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-translit" = dontDistribute super."text-icu-translit";
+  "text-json-qq" = dontDistribute super."text-json-qq";
+  "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show-instances" = dontDistribute super."text-show-instances";
+  "text-stream-decode" = dontDistribute super."text-stream-decode";
+  "text-utf7" = dontDistribute super."text-utf7";
+  "text-xml-generic" = dontDistribute super."text-xml-generic";
+  "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text1" = dontDistribute super."text1";
+  "textPlot" = dontDistribute super."textPlot";
+  "textmatetags" = dontDistribute super."textmatetags";
+  "textocat-api" = dontDistribute super."textocat-api";
+  "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
+  "tfp" = dontDistribute super."tfp";
+  "tfp-th" = dontDistribute super."tfp-th";
+  "tftp" = dontDistribute super."tftp";
+  "tga" = dontDistribute super."tga";
+  "th-alpha" = dontDistribute super."th-alpha";
+  "th-build" = dontDistribute super."th-build";
+  "th-cas" = dontDistribute super."th-cas";
+  "th-context" = dontDistribute super."th-context";
+  "th-fold" = dontDistribute super."th-fold";
+  "th-inline-io-action" = dontDistribute super."th-inline-io-action";
+  "th-instance-reification" = dontDistribute super."th-instance-reification";
+  "th-instances" = dontDistribute super."th-instances";
+  "th-kinds" = dontDistribute super."th-kinds";
+  "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "thespian" = dontDistribute super."thespian";
+  "theta-functions" = dontDistribute super."theta-functions";
+  "thih" = dontDistribute super."thih";
+  "thimk" = dontDistribute super."thimk";
+  "thorn" = dontDistribute super."thorn";
+  "thread-local-storage" = dontDistribute super."thread-local-storage";
+  "threadPool" = dontDistribute super."threadPool";
+  "threadmanager" = dontDistribute super."threadmanager";
+  "threads-pool" = dontDistribute super."threads-pool";
+  "threads-supervisor" = dontDistribute super."threads-supervisor";
+  "threadscope" = dontDistribute super."threadscope";
+  "threefish" = dontDistribute super."threefish";
+  "threepenny-gui" = dontDistribute super."threepenny-gui";
+  "thrift" = dontDistribute super."thrift";
+  "thrist" = dontDistribute super."thrist";
+  "throttle" = dontDistribute super."throttle";
+  "thumbnail" = dontDistribute super."thumbnail";
+  "tianbar" = dontDistribute super."tianbar";
+  "tic-tac-toe" = dontDistribute super."tic-tac-toe";
+  "tickle" = dontDistribute super."tickle";
+  "tictactoe3d" = dontDistribute super."tictactoe3d";
+  "tidal" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "tidal-vis" = dontDistribute super."tidal-vis";
+  "tie-knot" = dontDistribute super."tie-knot";
+  "tiempo" = dontDistribute super."tiempo";
+  "tiger" = dontDistribute super."tiger";
+  "tight-apply" = dontDistribute super."tight-apply";
+  "tightrope" = dontDistribute super."tightrope";
+  "tighttp" = dontDistribute super."tighttp";
+  "tilings" = dontDistribute super."tilings";
+  "timberc" = dontDistribute super."timberc";
+  "time-extras" = dontDistribute super."time-extras";
+  "time-exts" = dontDistribute super."time-exts";
+  "time-http" = dontDistribute super."time-http";
+  "time-interval" = dontDistribute super."time-interval";
+  "time-io-access" = dontDistribute super."time-io-access";
+  "time-patterns" = dontDistribute super."time-patterns";
+  "time-qq" = dontDistribute super."time-qq";
+  "time-recurrence" = dontDistribute super."time-recurrence";
+  "time-series" = dontDistribute super."time-series";
+  "time-w3c" = dontDistribute super."time-w3c";
+  "timecalc" = dontDistribute super."timecalc";
+  "timeconsole" = dontDistribute super."timeconsole";
+  "timeless" = dontDistribute super."timeless";
+  "timelike" = dontDistribute super."timelike";
+  "timelike-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "timeout" = dontDistribute super."timeout";
+  "timeout-control" = dontDistribute super."timeout-control";
+  "timeout-with-results" = dontDistribute super."timeout-with-results";
+  "timeparsers" = dontDistribute super."timeparsers";
+  "timeplot" = dontDistribute super."timeplot";
+  "timers" = dontDistribute super."timers";
+  "timers-updatable" = dontDistribute super."timers-updatable";
+  "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines";
+  "timestamper" = dontDistribute super."timestamper";
+  "timezone-olson-th" = dontDistribute super."timezone-olson-th";
+  "timing-convenience" = dontDistribute super."timing-convenience";
+  "tinyMesh" = dontDistribute super."tinyMesh";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls-extra" = dontDistribute super."tls-extra";
+  "tmpl" = dontDistribute super."tmpl";
+  "tn" = dontDistribute super."tn";
+  "tnet" = dontDistribute super."tnet";
+  "to-haskell" = dontDistribute super."to-haskell";
+  "to-string-class" = dontDistribute super."to-string-class";
+  "to-string-instances" = dontDistribute super."to-string-instances";
+  "todos" = dontDistribute super."todos";
+  "tofromxml" = dontDistribute super."tofromxml";
+  "toilet" = dontDistribute super."toilet";
+  "tokenify" = dontDistribute super."tokenify";
+  "tokenize" = dontDistribute super."tokenize";
+  "toktok" = dontDistribute super."toktok";
+  "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell";
+  "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell";
+  "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal";
+  "toml" = dontDistribute super."toml";
+  "toolshed" = dontDistribute super."toolshed";
+  "topkata" = dontDistribute super."topkata";
+  "torch" = dontDistribute super."torch";
+  "total" = dontDistribute super."total";
+  "total-map" = dontDistribute super."total-map";
+  "total-maps" = dontDistribute super."total-maps";
+  "touched" = dontDistribute super."touched";
+  "toysolver" = dontDistribute super."toysolver";
+  "tpdb" = dontDistribute super."tpdb";
+  "trace" = dontDistribute super."trace";
+  "trace-call" = dontDistribute super."trace-call";
+  "trace-function-call" = dontDistribute super."trace-function-call";
+  "traced" = dontDistribute super."traced";
+  "tracer" = dontDistribute super."tracer";
+  "tracker" = dontDistribute super."tracker";
+  "trajectory" = dontDistribute super."trajectory";
+  "transactional-events" = dontDistribute super."transactional-events";
+  "transf" = dontDistribute super."transf";
+  "transformations" = dontDistribute super."transformations";
+  "transformers-abort" = dontDistribute super."transformers-abort";
+  "transformers-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "translatable-intset" = dontDistribute super."translatable-intset";
+  "translate" = dontDistribute super."translate";
+  "travis" = dontDistribute super."travis";
+  "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
+  "trawl" = dontDistribute super."trawl";
+  "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-monad" = dontDistribute super."tree-monad";
+  "treemap-html" = dontDistribute super."treemap-html";
+  "treemap-html-tools" = dontDistribute super."treemap-html-tools";
+  "treersec" = dontDistribute super."treersec";
+  "treeviz" = dontDistribute super."treeviz";
+  "tremulous-query" = dontDistribute super."tremulous-query";
+  "trhsx" = dontDistribute super."trhsx";
+  "triangulation" = dontDistribute super."triangulation";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "truelevel" = dontDistribute super."truelevel";
+  "trurl" = dontDistribute super."trurl";
+  "truthful" = dontDistribute super."truthful";
+  "tsession" = dontDistribute super."tsession";
+  "tsession-happstack" = dontDistribute super."tsession-happstack";
+  "tskiplist" = dontDistribute super."tskiplist";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tupleinstances" = dontDistribute super."tupleinstances";
+  "turing" = dontDistribute super."turing";
+  "turing-music" = dontDistribute super."turing-music";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "tweak" = dontDistribute super."tweak";
+  "twentefp" = dontDistribute super."twentefp";
+  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
+  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
+  "twentefp-graphs" = dontDistribute super."twentefp-graphs";
+  "twentefp-number" = dontDistribute super."twentefp-number";
+  "twentefp-rosetree" = dontDistribute super."twentefp-rosetree";
+  "twentefp-trees" = dontDistribute super."twentefp-trees";
+  "twentefp-websockets" = dontDistribute super."twentefp-websockets";
+  "twhs" = dontDistribute super."twhs";
+  "twidge" = dontDistribute super."twidge";
+  "twilight-stm" = dontDistribute super."twilight-stm";
+  "twilio" = dontDistribute super."twilio";
+  "twill" = dontDistribute super."twill";
+  "twiml" = dontDistribute super."twiml";
+  "twine" = dontDistribute super."twine";
+  "twisty" = dontDistribute super."twisty";
+  "twitch" = dontDistribute super."twitch";
+  "twitter" = dontDistribute super."twitter";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "tx" = dontDistribute super."tx";
+  "txt-sushi" = dontDistribute super."txt-sushi";
+  "txt2rtf" = dontDistribute super."txt2rtf";
+  "txtblk" = dontDistribute super."txtblk";
+  "ty" = dontDistribute super."ty";
+  "typalyze" = dontDistribute super."typalyze";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
+  "type-cereal" = dontDistribute super."type-cereal";
+  "type-combinators" = dontDistribute super."type-combinators";
+  "type-combinators-quote" = dontDistribute super."type-combinators-quote";
+  "type-digits" = dontDistribute super."type-digits";
+  "type-equality" = dontDistribute super."type-equality";
+  "type-equality-check" = dontDistribute super."type-equality-check";
+  "type-fun" = dontDistribute super."type-fun";
+  "type-functions" = dontDistribute super."type-functions";
+  "type-hint" = dontDistribute super."type-hint";
+  "type-int" = dontDistribute super."type-int";
+  "type-iso" = dontDistribute super."type-iso";
+  "type-level" = dontDistribute super."type-level";
+  "type-level-bst" = dontDistribute super."type-level-bst";
+  "type-level-natural-number" = dontDistribute super."type-level-natural-number";
+  "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction";
+  "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations";
+  "type-level-sets" = dontDistribute super."type-level-sets";
+  "type-level-tf" = dontDistribute super."type-level-tf";
+  "type-natural" = dontDistribute super."type-natural";
+  "type-ord" = dontDistribute super."type-ord";
+  "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
+  "type-prelude" = dontDistribute super."type-prelude";
+  "type-settheory" = dontDistribute super."type-settheory";
+  "type-spine" = dontDistribute super."type-spine";
+  "type-structure" = dontDistribute super."type-structure";
+  "type-sub-th" = dontDistribute super."type-sub-th";
+  "type-unary" = dontDistribute super."type-unary";
+  "typeable-th" = dontDistribute super."typeable-th";
+  "typed-spreadsheet" = dontDistribute super."typed-spreadsheet";
+  "typed-wire" = dontDistribute super."typed-wire";
+  "typed-wire-utils" = dontDistribute super."typed-wire-utils";
+  "typedquery" = dontDistribute super."typedquery";
+  "typehash" = dontDistribute super."typehash";
+  "typelevel" = dontDistribute super."typelevel";
+  "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "uberlast" = dontDistribute super."uberlast";
+  "uconv" = dontDistribute super."uconv";
+  "udbus" = dontDistribute super."udbus";
+  "udbus-model" = dontDistribute super."udbus-model";
+  "udcode" = dontDistribute super."udcode";
+  "udev" = dontDistribute super."udev";
+  "uhc-light" = dontDistribute super."uhc-light";
+  "uhc-util" = dontDistribute super."uhc-util";
+  "uhexdump" = dontDistribute super."uhexdump";
+  "uhttpc" = dontDistribute super."uhttpc";
+  "ui-command" = dontDistribute super."ui-command";
+  "uid" = dontDistribute super."uid";
+  "una" = dontDistribute super."una";
+  "unagi-chan" = dontDistribute super."unagi-chan";
+  "unagi-streams" = dontDistribute super."unagi-streams";
+  "unamb" = dontDistribute super."unamb";
+  "unamb-custom" = dontDistribute super."unamb-custom";
+  "unbound" = dontDistribute super."unbound";
+  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
+  "unboxed-containers" = dontDistribute super."unboxed-containers";
+  "unbreak" = dontDistribute super."unbreak";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "ungadtagger" = dontDistribute super."ungadtagger";
+  "uni-events" = dontDistribute super."uni-events";
+  "uni-graphs" = dontDistribute super."uni-graphs";
+  "uni-htk" = dontDistribute super."uni-htk";
+  "uni-posixutil" = dontDistribute super."uni-posixutil";
+  "uni-reactor" = dontDistribute super."uni-reactor";
+  "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph";
+  "uni-util" = dontDistribute super."uni-util";
+  "unicode" = dontDistribute super."unicode";
+  "unicode-names" = dontDistribute super."unicode-names";
+  "unicode-normalization" = dontDistribute super."unicode-normalization";
+  "unicode-prelude" = dontDistribute super."unicode-prelude";
+  "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
+  "unicode-symbols" = dontDistribute super."unicode-symbols";
+  "unicoder" = dontDistribute super."unicoder";
+  "uniform-io" = dontDistribute super."uniform-io";
+  "uniform-pair" = dontDistribute super."uniform-pair";
+  "union-find-array" = dontDistribute super."union-find-array";
+  "union-map" = dontDistribute super."union-map";
+  "unique" = dontDistribute super."unique";
+  "unique-logic" = dontDistribute super."unique-logic";
+  "unique-logic-tf" = dontDistribute super."unique-logic-tf";
+  "uniqueid" = dontDistribute super."uniqueid";
+  "unit" = dontDistribute super."unit";
+  "units" = dontDistribute super."units";
+  "units-attoparsec" = dontDistribute super."units-attoparsec";
+  "units-defs" = dontDistribute super."units-defs";
+  "units-parser" = dontDistribute super."units-parser";
+  "unittyped" = dontDistribute super."unittyped";
+  "universal-binary" = dontDistribute super."universal-binary";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-fcntl" = dontDistribute super."unix-fcntl";
+  "unix-handle" = dontDistribute super."unix-handle";
+  "unix-io-extra" = dontDistribute super."unix-io-extra";
+  "unix-memory" = dontDistribute super."unix-memory";
+  "unix-process-conduit" = dontDistribute super."unix-process-conduit";
+  "unix-pty-light" = dontDistribute super."unix-pty-light";
+  "unlambda" = dontDistribute super."unlambda";
+  "unlit" = dontDistribute super."unlit";
+  "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
+  "unordered-graphs" = dontDistribute super."unordered-graphs";
+  "unpack-funcs" = dontDistribute super."unpack-funcs";
+  "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin";
+  "unsafe" = dontDistribute super."unsafe";
+  "unsafe-promises" = dontDistribute super."unsafe-promises";
+  "unsafely" = dontDistribute super."unsafely";
+  "unsafeperformst" = dontDistribute super."unsafeperformst";
+  "unscramble" = dontDistribute super."unscramble";
+  "unusable-pkg" = dontDistribute super."unusable-pkg";
+  "uom-plugin" = dontDistribute super."uom-plugin";
+  "up" = dontDistribute super."up";
+  "up-grade" = dontDistribute super."up-grade";
+  "uploadcare" = dontDistribute super."uploadcare";
+  "upskirt" = dontDistribute super."upskirt";
+  "ureader" = dontDistribute super."ureader";
+  "urembed" = dontDistribute super."urembed";
+  "uri" = dontDistribute super."uri";
+  "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-enumerator" = dontDistribute super."uri-enumerator";
+  "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
+  "uri-template" = dontDistribute super."uri-template";
+  "url-generic" = dontDistribute super."url-generic";
+  "urlcheck" = dontDistribute super."urlcheck";
+  "urldecode" = dontDistribute super."urldecode";
+  "urldisp-happstack" = dontDistribute super."urldisp-happstack";
+  "urlencoded" = dontDistribute super."urlencoded";
+  "urn" = dontDistribute super."urn";
+  "urxml" = dontDistribute super."urxml";
+  "usb" = dontDistribute super."usb";
+  "usb-enumerator" = dontDistribute super."usb-enumerator";
+  "usb-hid" = dontDistribute super."usb-hid";
+  "usb-id-database" = dontDistribute super."usb-id-database";
+  "usb-iteratee" = dontDistribute super."usb-iteratee";
+  "usb-safe" = dontDistribute super."usb-safe";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "uu-cco" = dontDistribute super."uu-cco";
+  "uu-cco-examples" = dontDistribute super."uu-cco-examples";
+  "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
+  "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib";
+  "uu-options" = dontDistribute super."uu-options";
+  "uu-tc" = dontDistribute super."uu-tc";
+  "uuagc" = dontDistribute super."uuagc";
+  "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap";
+  "uuagc-cabal" = dontDistribute super."uuagc-cabal";
+  "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
+  "uuagd" = dontDistribute super."uuagd";
+  "uuid-aeson" = dontDistribute super."uuid-aeson";
+  "uuid-le" = dontDistribute super."uuid-le";
+  "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uulib" = dontDistribute super."uulib";
+  "uvector" = dontDistribute super."uvector";
+  "uvector-algorithms" = dontDistribute super."uvector-algorithms";
+  "uxadt" = dontDistribute super."uxadt";
+  "uzbl-with-source" = dontDistribute super."uzbl-with-source";
+  "v4l2" = dontDistribute super."v4l2";
+  "v4l2-examples" = dontDistribute super."v4l2-examples";
+  "vacuum" = dontDistribute super."vacuum";
+  "vacuum-cairo" = dontDistribute super."vacuum-cairo";
+  "vacuum-graphviz" = dontDistribute super."vacuum-graphviz";
+  "vacuum-opengl" = dontDistribute super."vacuum-opengl";
+  "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph";
+  "vado" = dontDistribute super."vado";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validations" = dontDistribute super."validations";
+  "value-supply" = dontDistribute super."value-supply";
+  "vampire" = dontDistribute super."vampire";
+  "var" = dontDistribute super."var";
+  "varan" = dontDistribute super."varan";
+  "variable-precision" = dontDistribute super."variable-precision";
+  "variables" = dontDistribute super."variables";
+  "varying" = dontDistribute super."varying";
+  "vaultaire-common" = dontDistribute super."vaultaire-common";
+  "vcache" = dontDistribute super."vcache";
+  "vcache-trie" = dontDistribute super."vcache-trie";
+  "vcard" = dontDistribute super."vcard";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "vect-floating" = dontDistribute super."vect-floating";
+  "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
+  "vect-opengl" = dontDistribute super."vect-opengl";
+  "vector-binary" = dontDistribute super."vector-binary";
+  "vector-bytestring" = dontDistribute super."vector-bytestring";
+  "vector-clock" = dontDistribute super."vector-clock";
+  "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-functorlazy" = dontDistribute super."vector-functorlazy";
+  "vector-heterogenous" = dontDistribute super."vector-heterogenous";
+  "vector-instances-collections" = dontDistribute super."vector-instances-collections";
+  "vector-mmap" = dontDistribute super."vector-mmap";
+  "vector-random" = dontDistribute super."vector-random";
+  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "vector-space-points" = dontDistribute super."vector-space-points";
+  "vector-static" = dontDistribute super."vector-static";
+  "vector-strategies" = dontDistribute super."vector-strategies";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = dontDistribute super."versions";
+  "vhdl" = dontDistribute super."vhdl";
+  "views" = dontDistribute super."views";
+  "vigilance" = dontDistribute super."vigilance";
+  "vimeta" = dontDistribute super."vimeta";
+  "vimus" = dontDistribute super."vimus";
+  "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
+  "virthualenv" = dontDistribute super."virthualenv";
+  "visibility" = dontDistribute super."visibility";
+  "vision" = dontDistribute super."vision";
+  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
+  "visual-prof" = dontDistribute super."visual-prof";
+  "vivid" = dontDistribute super."vivid";
+  "vk-aws-route53" = dontDistribute super."vk-aws-route53";
+  "vk-posix-pty" = dontDistribute super."vk-posix-pty";
+  "vocabulary-kadma" = dontDistribute super."vocabulary-kadma";
+  "vorbiscomment" = dontDistribute super."vorbiscomment";
+  "vowpal-utils" = dontDistribute super."vowpal-utils";
+  "voyeur" = dontDistribute super."voyeur";
+  "vrpn" = dontDistribute super."vrpn";
+  "vte" = dontDistribute super."vte";
+  "vtegtk3" = dontDistribute super."vtegtk3";
+  "vty-examples" = dontDistribute super."vty-examples";
+  "vty-menu" = dontDistribute super."vty-menu";
+  "vty-ui" = dontDistribute super."vty-ui";
+  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "waddle" = dontDistribute super."waddle";
+  "wai-accept-language" = dontDistribute super."wai-accept-language";
+  "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-devel" = dontDistribute super."wai-devel";
+  "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
+  "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
+  "wai-graceful" = dontDistribute super."wai-graceful";
+  "wai-handler-devel" = dontDistribute super."wai-handler-devel";
+  "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
+  "wai-handler-snap" = dontDistribute super."wai-handler-snap";
+  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
+  "wai-hastache" = dontDistribute super."wai-hastache";
+  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-lens" = dontDistribute super."wai-lens";
+  "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
+  "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
+  "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
+  "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
+  "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
+  "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
+  "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac";
+  "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
+  "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
+  "wai-static-cache" = dontDistribute super."wai-static-cache";
+  "wai-static-pages" = dontDistribute super."wai-static-pages";
+  "wai-test" = dontDistribute super."wai-test";
+  "wai-thrift" = dontDistribute super."wai-thrift";
+  "wai-throttler" = dontDistribute super."wai-throttler";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavesurfer" = dontDistribute super."wavesurfer";
+  "wavy" = dontDistribute super."wavy";
+  "wcwidth" = dontDistribute super."wcwidth";
+  "weather-api" = dontDistribute super."weather-api";
+  "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell";
+  "web-css" = dontDistribute super."web-css";
+  "web-encodings" = dontDistribute super."web-encodings";
+  "web-mongrel2" = dontDistribute super."web-mongrel2";
+  "web-page" = dontDistribute super."web-page";
+  "web-routes-mtl" = dontDistribute super."web-routes-mtl";
+  "web-routes-quasi" = dontDistribute super."web-routes-quasi";
+  "web-routes-regular" = dontDistribute super."web-routes-regular";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "webapi" = dontDistribute super."webapi";
+  "webapp" = dontDistribute super."webapp";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-snoy" = dontDistribute super."webdriver-snoy";
+  "webfinger-client" = dontDistribute super."webfinger-client";
+  "webidl" = dontDistribute super."webidl";
+  "webify" = dontDistribute super."webify";
+  "webkit" = dontDistribute super."webkit";
+  "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
+  "webkitgtk3" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "webwire" = dontDistribute super."webwire";
+  "wedding-announcement" = dontDistribute super."wedding-announcement";
+  "wedged" = dontDistribute super."wedged";
+  "weighted-regexp" = dontDistribute super."weighted-regexp";
+  "weighted-search" = dontDistribute super."weighted-search";
+  "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
+  "wheb-mongo" = dontDistribute super."wheb-mongo";
+  "wheb-redis" = dontDistribute super."wheb-redis";
+  "wheb-strapped" = dontDistribute super."wheb-strapped";
+  "while-lang-parser" = dontDistribute super."while-lang-parser";
+  "whim" = dontDistribute super."whim";
+  "whiskers" = dontDistribute super."whiskers";
+  "whitespace" = dontDistribute super."whitespace";
+  "whois" = dontDistribute super."whois";
+  "why3" = dontDistribute super."why3";
+  "wigner-symbols" = dontDistribute super."wigner-symbols";
+  "wikipedia4epub" = dontDistribute super."wikipedia4epub";
+  "win-hp-path" = dontDistribute super."win-hp-path";
+  "windowslive" = dontDistribute super."windowslive";
+  "winerror" = dontDistribute super."winerror";
+  "winio" = dontDistribute super."winio";
+  "wiring" = dontDistribute super."wiring";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word24" = dontDistribute super."word24";
+  "wordcloud" = dontDistribute super."wordcloud";
+  "wordexp" = dontDistribute super."wordexp";
+  "words" = dontDistribute super."words";
+  "wordsearch" = dontDistribute super."wordsearch";
+  "wordsetdiff" = dontDistribute super."wordsetdiff";
+  "workflow-osx" = dontDistribute super."workflow-osx";
+  "wp-archivebot" = dontDistribute super."wp-archivebot";
+  "wraparound" = dontDistribute super."wraparound";
+  "wraxml" = dontDistribute super."wraxml";
+  "wreq-sb" = dontDistribute super."wreq-sb";
+  "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
+  "wsedit" = dontDistribute super."wsedit";
+  "wtk" = dontDistribute super."wtk";
+  "wtk-gtk" = dontDistribute super."wtk-gtk";
+  "wumpus-basic" = dontDistribute super."wumpus-basic";
+  "wumpus-core" = dontDistribute super."wumpus-core";
+  "wumpus-drawing" = dontDistribute super."wumpus-drawing";
+  "wumpus-microprint" = dontDistribute super."wumpus-microprint";
+  "wumpus-tree" = dontDistribute super."wumpus-tree";
+  "wuss" = dontDistribute super."wuss";
+  "wx" = dontDistribute super."wx";
+  "wxAsteroids" = dontDistribute super."wxAsteroids";
+  "wxFruit" = dontDistribute super."wxFruit";
+  "wxc" = dontDistribute super."wxc";
+  "wxcore" = dontDistribute super."wxcore";
+  "wxdirect" = dontDistribute super."wxdirect";
+  "wxhnotepad" = dontDistribute super."wxhnotepad";
+  "wxturtle" = dontDistribute super."wxturtle";
+  "wybor" = dontDistribute super."wybor";
+  "wyvern" = dontDistribute super."wyvern";
+  "x-dsp" = dontDistribute super."x-dsp";
+  "x11-xim" = dontDistribute super."x11-xim";
+  "x11-xinput" = dontDistribute super."x11-xinput";
+  "x509-util" = dontDistribute super."x509-util";
+  "xattr" = dontDistribute super."xattr";
+  "xbattbar" = dontDistribute super."xbattbar";
+  "xcb-types" = dontDistribute super."xcb-types";
+  "xcffib" = dontDistribute super."xcffib";
+  "xchat-plugin" = dontDistribute super."xchat-plugin";
+  "xcp" = dontDistribute super."xcp";
+  "xdg-userdirs" = dontDistribute super."xdg-userdirs";
+  "xdot" = dontDistribute super."xdot";
+  "xfconf" = dontDistribute super."xfconf";
+  "xhaskell-library" = dontDistribute super."xhaskell-library";
+  "xhb" = dontDistribute super."xhb";
+  "xhb-atom-cache" = dontDistribute super."xhb-atom-cache";
+  "xhb-ewmh" = dontDistribute super."xhb-ewmh";
+  "xhtml" = doDistribute super."xhtml_3000_2_1";
+  "xhtml-combinators" = dontDistribute super."xhtml-combinators";
+  "xilinx-lava" = dontDistribute super."xilinx-lava";
+  "xine" = dontDistribute super."xine";
+  "xing-api" = dontDistribute super."xing-api";
+  "xinput-conduit" = dontDistribute super."xinput-conduit";
+  "xkbcommon" = dontDistribute super."xkbcommon";
+  "xkcd" = dontDistribute super."xkcd";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
+  "xml-enumerator" = dontDistribute super."xml-enumerator";
+  "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
+  "xml-extractors" = dontDistribute super."xml-extractors";
+  "xml-helpers" = dontDistribute super."xml-helpers";
+  "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens";
+  "xml-monad" = dontDistribute super."xml-monad";
+  "xml-parsec" = dontDistribute super."xml-parsec";
+  "xml-picklers" = dontDistribute super."xml-picklers";
+  "xml-pipe" = dontDistribute super."xml-pipe";
+  "xml-prettify" = dontDistribute super."xml-prettify";
+  "xml-push" = dontDistribute super."xml-push";
+  "xml-query" = dontDistribute super."xml-query";
+  "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit";
+  "xml-query-xml-types" = dontDistribute super."xml-query-xml-types";
+  "xml2html" = dontDistribute super."xml2html";
+  "xml2json" = dontDistribute super."xml2json";
+  "xml2x" = dontDistribute super."xml2x";
+  "xmltv" = dontDistribute super."xmltv";
+  "xmms2-client" = dontDistribute super."xmms2-client";
+  "xmms2-client-glib" = dontDistribute super."xmms2-client-glib";
+  "xmobar" = dontDistribute super."xmobar";
+  "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch";
+  "xmonad-contrib" = dontDistribute super."xmonad-contrib";
+  "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch";
+  "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl";
+  "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper";
+  "xmonad-eval" = dontDistribute super."xmonad-eval";
+  "xmonad-extras" = dontDistribute super."xmonad-extras";
+  "xmonad-screenshot" = dontDistribute super."xmonad-screenshot";
+  "xmonad-utils" = dontDistribute super."xmonad-utils";
+  "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper";
+  "xmonad-windownames" = dontDistribute super."xmonad-windownames";
+  "xmpipe" = dontDistribute super."xmpipe";
+  "xorshift" = dontDistribute super."xorshift";
+  "xosd" = dontDistribute super."xosd";
+  "xournal-builder" = dontDistribute super."xournal-builder";
+  "xournal-convert" = dontDistribute super."xournal-convert";
+  "xournal-parser" = dontDistribute super."xournal-parser";
+  "xournal-render" = dontDistribute super."xournal-render";
+  "xournal-types" = dontDistribute super."xournal-types";
+  "xsact" = dontDistribute super."xsact";
+  "xsd" = dontDistribute super."xsd";
+  "xsha1" = dontDistribute super."xsha1";
+  "xslt" = dontDistribute super."xslt";
+  "xtc" = dontDistribute super."xtc";
+  "xtest" = dontDistribute super."xtest";
+  "xturtle" = dontDistribute super."xturtle";
+  "xxhash" = dontDistribute super."xxhash";
+  "y0l0bot" = dontDistribute super."y0l0bot";
+  "yabi" = dontDistribute super."yabi";
+  "yabi-muno" = dontDistribute super."yabi-muno";
+  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
+  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
+  "yajl" = dontDistribute super."yajl";
+  "yajl-enumerator" = dontDistribute super."yajl-enumerator";
+  "yall" = dontDistribute super."yall";
+  "yamemo" = dontDistribute super."yamemo";
+  "yaml-config" = dontDistribute super."yaml-config";
+  "yaml-light-lens" = dontDistribute super."yaml-light-lens";
+  "yaml-rpc" = dontDistribute super."yaml-rpc";
+  "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
+  "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
+  "yaml2owl" = dontDistribute super."yaml2owl";
+  "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
+  "yampa-canvas" = dontDistribute super."yampa-canvas";
+  "yampa-glfw" = dontDistribute super."yampa-glfw";
+  "yampa-glut" = dontDistribute super."yampa-glut";
+  "yampa2048" = dontDistribute super."yampa2048";
+  "yaop" = dontDistribute super."yaop";
+  "yap" = dontDistribute super."yap";
+  "yarr" = dontDistribute super."yarr";
+  "yarr-image-io" = dontDistribute super."yarr-image-io";
+  "yate" = dontDistribute super."yate";
+  "yavie" = dontDistribute super."yavie";
+  "ycextra" = dontDistribute super."ycextra";
+  "yeganesh" = dontDistribute super."yeganesh";
+  "yeller" = dontDistribute super."yeller";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
+  "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
+  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
+  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
+  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
+  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
+  "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
+  "yesod-comments" = dontDistribute super."yesod-comments";
+  "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
+  "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-crud" = dontDistribute super."yesod-crud";
+  "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
+  "yesod-csp" = dontDistribute super."yesod-csp";
+  "yesod-datatables" = dontDistribute super."yesod-datatables";
+  "yesod-dsl" = dontDistribute super."yesod-dsl";
+  "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form-json" = dontDistribute super."yesod-form-json";
+  "yesod-goodies" = dontDistribute super."yesod-goodies";
+  "yesod-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
+  "yesod-paginate" = dontDistribute super."yesod-paginate";
+  "yesod-pagination" = dontDistribute super."yesod-pagination";
+  "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-platform" = dontDistribute super."yesod-platform";
+  "yesod-pnotify" = dontDistribute super."yesod-pnotify";
+  "yesod-pure" = dontDistribute super."yesod-pure";
+  "yesod-purescript" = dontDistribute super."yesod-purescript";
+  "yesod-raml" = dontDistribute super."yesod-raml";
+  "yesod-raml-bin" = dontDistribute super."yesod-raml-bin";
+  "yesod-raml-docs" = dontDistribute super."yesod-raml-docs";
+  "yesod-raml-mock" = dontDistribute super."yesod-raml-mock";
+  "yesod-recaptcha" = dontDistribute super."yesod-recaptcha";
+  "yesod-routes" = dontDistribute super."yesod-routes";
+  "yesod-routes-flow" = dontDistribute super."yesod-routes-flow";
+  "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript";
+  "yesod-rst" = dontDistribute super."yesod-rst";
+  "yesod-s3" = dontDistribute super."yesod-s3";
+  "yesod-sass" = dontDistribute super."yesod-sass";
+  "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test-json" = dontDistribute super."yesod-test-json";
+  "yesod-tls" = dontDistribute super."yesod-tls";
+  "yesod-transloadit" = dontDistribute super."yesod-transloadit";
+  "yesod-vend" = dontDistribute super."yesod-vend";
+  "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra";
+  "yesod-worker" = dontDistribute super."yesod-worker";
+  "yet-another-logger" = dontDistribute super."yet-another-logger";
+  "yhccore" = dontDistribute super."yhccore";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-snippet" = dontDistribute super."yi-snippet";
+  "yi-solarized" = dontDistribute super."yi-solarized";
+  "yi-spolsky" = dontDistribute super."yi-spolsky";
+  "yi-vty" = dontDistribute super."yi-vty";
+  "yices" = dontDistribute super."yices";
+  "yices-easy" = dontDistribute super."yices-easy";
+  "yices-painless" = dontDistribute super."yices-painless";
+  "yjftp" = dontDistribute super."yjftp";
+  "yjftp-libs" = dontDistribute super."yjftp-libs";
+  "yjsvg" = dontDistribute super."yjsvg";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
+  "yoko" = dontDistribute super."yoko";
+  "york-lava" = dontDistribute super."york-lava";
+  "youtube" = dontDistribute super."youtube";
+  "yql" = dontDistribute super."yql";
+  "yst" = dontDistribute super."yst";
+  "yuiGrid" = dontDistribute super."yuiGrid";
+  "yuuko" = dontDistribute super."yuuko";
+  "yxdb-utils" = dontDistribute super."yxdb-utils";
+  "z3" = dontDistribute super."z3";
+  "zalgo" = dontDistribute super."zalgo";
+  "zampolit" = dontDistribute super."zampolit";
+  "zasni-gerna" = dontDistribute super."zasni-gerna";
+  "zcache" = dontDistribute super."zcache";
+  "zenc" = dontDistribute super."zenc";
+  "zendesk-api" = dontDistribute super."zendesk-api";
+  "zeno" = dontDistribute super."zeno";
+  "zerobin" = dontDistribute super."zerobin";
+  "zeromq-haskell" = dontDistribute super."zeromq-haskell";
+  "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
+  "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeroth" = dontDistribute super."zeroth";
+  "zigbee-znet25" = dontDistribute super."zigbee-znet25";
+  "zip-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "zippo" = dontDistribute super."zippo";
+  "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zmcat" = dontDistribute super."zmcat";
+  "zmidi-core" = dontDistribute super."zmidi-core";
+  "zmidi-score" = dontDistribute super."zmidi-score";
+  "zmqat" = dontDistribute super."zmqat";
+  "zoneinfo" = dontDistribute super."zoneinfo";
+  "zoom" = dontDistribute super."zoom";
+  "zoom-cache" = dontDistribute super."zoom-cache";
+  "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm";
+  "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile";
+  "zoom-refs" = dontDistribute super."zoom-refs";
+  "zot" = dontDistribute super."zot";
+  "zsh-battery" = dontDistribute super."zsh-battery";
+  "ztail" = dontDistribute super."ztail";
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
new file mode 100644
index 0000000000000..8a68bd9a2736d
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -0,0 +1,7646 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # core libraries provided by the compiler
+  Cabal = null;
+  array = null;
+  base = null;
+  bin-package-db = null;
+  binary = null;
+  bytestring = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  time = null;
+  transformers = null;
+  unix = null;
+
+  # lts-5.2 packages
+  "3d-graphics-examples" = dontDistribute super."3d-graphics-examples";
+  "3dmodels" = dontDistribute super."3dmodels";
+  "4Blocks" = dontDistribute super."4Blocks";
+  "AAI" = dontDistribute super."AAI";
+  "ABList" = dontDistribute super."ABList";
+  "AC-Angle" = dontDistribute super."AC-Angle";
+  "AC-Boolean" = dontDistribute super."AC-Boolean";
+  "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform";
+  "AC-Colour" = dontDistribute super."AC-Colour";
+  "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK";
+  "AC-HalfInteger" = dontDistribute super."AC-HalfInteger";
+  "AC-MiniTest" = dontDistribute super."AC-MiniTest";
+  "AC-PPM" = dontDistribute super."AC-PPM";
+  "AC-Random" = dontDistribute super."AC-Random";
+  "AC-Terminal" = dontDistribute super."AC-Terminal";
+  "AC-VanillaArray" = dontDistribute super."AC-VanillaArray";
+  "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy";
+  "ACME" = dontDistribute super."ACME";
+  "ADPfusion" = dontDistribute super."ADPfusion";
+  "AERN-Basics" = dontDistribute super."AERN-Basics";
+  "AERN-Net" = dontDistribute super."AERN-Net";
+  "AERN-Real" = dontDistribute super."AERN-Real";
+  "AERN-Real-Double" = dontDistribute super."AERN-Real-Double";
+  "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval";
+  "AERN-RnToRm" = dontDistribute super."AERN-RnToRm";
+  "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot";
+  "AES" = dontDistribute super."AES";
+  "AGI" = dontDistribute super."AGI";
+  "ALUT" = dontDistribute super."ALUT";
+  "AMI" = dontDistribute super."AMI";
+  "ANum" = dontDistribute super."ANum";
+  "ASN1" = dontDistribute super."ASN1";
+  "AVar" = dontDistribute super."AVar";
+  "AWin32Console" = dontDistribute super."AWin32Console";
+  "AbortT-monadstf" = dontDistribute super."AbortT-monadstf";
+  "AbortT-mtl" = dontDistribute super."AbortT-mtl";
+  "AbortT-transformers" = dontDistribute super."AbortT-transformers";
+  "ActionKid" = dontDistribute super."ActionKid";
+  "Adaptive" = dontDistribute super."Adaptive";
+  "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade";
+  "Advgame" = dontDistribute super."Advgame";
+  "AesonBson" = dontDistribute super."AesonBson";
+  "Agata" = dontDistribute super."Agata";
+  "Agda-executable" = dontDistribute super."Agda-executable";
+  "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlgorithmW" = dontDistribute super."AlgorithmW";
+  "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
+  "Allure" = dontDistribute super."Allure";
+  "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter";
+  "Animas" = dontDistribute super."Animas";
+  "Annotations" = dontDistribute super."Annotations";
+  "Ansi2Html" = dontDistribute super."Ansi2Html";
+  "ApplePush" = dontDistribute super."ApplePush";
+  "AppleScript" = dontDistribute super."AppleScript";
+  "ApproxFun-hs" = dontDistribute super."ApproxFun-hs";
+  "ArrayRef" = dontDistribute super."ArrayRef";
+  "ArrowVHDL" = dontDistribute super."ArrowVHDL";
+  "AspectAG" = dontDistribute super."AspectAG";
+  "AttoBencode" = dontDistribute super."AttoBencode";
+  "AttoJson" = dontDistribute super."AttoJson";
+  "Attrac" = dontDistribute super."Attrac";
+  "Aurochs" = dontDistribute super."Aurochs";
+  "AutoForms" = dontDistribute super."AutoForms";
+  "AvlTree" = dontDistribute super."AvlTree";
+  "BASIC" = dontDistribute super."BASIC";
+  "BCMtools" = dontDistribute super."BCMtools";
+  "BNFC" = dontDistribute super."BNFC";
+  "BNFC-meta" = dontDistribute super."BNFC-meta";
+  "Baggins" = dontDistribute super."Baggins";
+  "Bang" = dontDistribute super."Bang";
+  "Barracuda" = dontDistribute super."Barracuda";
+  "Befunge93" = dontDistribute super."Befunge93";
+  "BenchmarkHistory" = dontDistribute super."BenchmarkHistory";
+  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
+  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
+  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BigPixel" = dontDistribute super."BigPixel";
+  "Binpack" = dontDistribute super."Binpack";
+  "Biobase" = dontDistribute super."Biobase";
+  "BiobaseBlast" = dontDistribute super."BiobaseBlast";
+  "BiobaseDotP" = dontDistribute super."BiobaseDotP";
+  "BiobaseFR3D" = dontDistribute super."BiobaseFR3D";
+  "BiobaseFasta" = dontDistribute super."BiobaseFasta";
+  "BiobaseInfernal" = dontDistribute super."BiobaseInfernal";
+  "BiobaseMAF" = dontDistribute super."BiobaseMAF";
+  "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData";
+  "BiobaseTurner" = dontDistribute super."BiobaseTurner";
+  "BiobaseTypes" = dontDistribute super."BiobaseTypes";
+  "BiobaseVienna" = dontDistribute super."BiobaseVienna";
+  "BiobaseXNA" = dontDistribute super."BiobaseXNA";
+  "BirdPP" = dontDistribute super."BirdPP";
+  "BitSyntax" = dontDistribute super."BitSyntax";
+  "Bitly" = dontDistribute super."Bitly";
+  "Blobs" = dontDistribute super."Blobs";
+  "BluePrintCSS" = dontDistribute super."BluePrintCSS";
+  "Blueprint" = dontDistribute super."Blueprint";
+  "Bookshelf" = dontDistribute super."Bookshelf";
+  "Bravo" = dontDistribute super."Bravo";
+  "BufferedSocket" = dontDistribute super."BufferedSocket";
+  "Buster" = dontDistribute super."Buster";
+  "CBOR" = dontDistribute super."CBOR";
+  "CC-delcont" = dontDistribute super."CC-delcont";
+  "CC-delcont-alt" = dontDistribute super."CC-delcont-alt";
+  "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe";
+  "CC-delcont-exc" = dontDistribute super."CC-delcont-exc";
+  "CC-delcont-ref" = dontDistribute super."CC-delcont-ref";
+  "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf";
+  "CCA" = dontDistribute super."CCA";
+  "CHXHtml" = dontDistribute super."CHXHtml";
+  "CLASE" = dontDistribute super."CLASE";
+  "CLI" = dontDistribute super."CLI";
+  "CMCompare" = dontDistribute super."CMCompare";
+  "CMQ" = dontDistribute super."CMQ";
+  "COrdering" = dontDistribute super."COrdering";
+  "CPBrainfuck" = dontDistribute super."CPBrainfuck";
+  "CPL" = dontDistribute super."CPL";
+  "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage";
+  "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules";
+  "CSPM-Frontend" = dontDistribute super."CSPM-Frontend";
+  "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter";
+  "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog";
+  "CSPM-cspm" = dontDistribute super."CSPM-cspm";
+  "CTRex" = dontDistribute super."CTRex";
+  "CV" = dontDistribute super."CV";
+  "CabalSearch" = dontDistribute super."CabalSearch";
+  "Capabilities" = dontDistribute super."Capabilities";
+  "Cardinality" = dontDistribute super."Cardinality";
+  "CarneadesDSL" = dontDistribute super."CarneadesDSL";
+  "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung";
+  "Cartesian" = dontDistribute super."Cartesian";
+  "Cascade" = dontDistribute super."Cascade";
+  "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "Chart-gtk" = dontDistribute super."Chart-gtk";
+  "Chart-simple" = dontDistribute super."Chart-simple";
+  "CheatSheet" = dontDistribute super."CheatSheet";
+  "Checked" = dontDistribute super."Checked";
+  "Chitra" = dontDistribute super."Chitra";
+  "ChristmasTree" = dontDistribute super."ChristmasTree";
+  "CirruParser" = dontDistribute super."CirruParser";
+  "ClassLaws" = dontDistribute super."ClassLaws";
+  "ClassyPrelude" = dontDistribute super."ClassyPrelude";
+  "Clean" = dontDistribute super."Clean";
+  "Clipboard" = dontDistribute super."Clipboard";
+  "Coadjute" = dontDistribute super."Coadjute";
+  "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF";
+  "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL";
+  "Combinatorrent" = dontDistribute super."Combinatorrent";
+  "Command" = dontDistribute super."Command";
+  "Commando" = dontDistribute super."Commando";
+  "ComonadSheet" = dontDistribute super."ComonadSheet";
+  "ConcurrentUtils" = dontDistribute super."ConcurrentUtils";
+  "Concurrential" = dontDistribute super."Concurrential";
+  "Condor" = dontDistribute super."Condor";
+  "ConfigFileTH" = dontDistribute super."ConfigFileTH";
+  "Configger" = dontDistribute super."Configger";
+  "Configurable" = dontDistribute super."Configurable";
+  "ConsStream" = dontDistribute super."ConsStream";
+  "Conscript" = dontDistribute super."Conscript";
+  "ConstraintKinds" = dontDistribute super."ConstraintKinds";
+  "Consumer" = dontDistribute super."Consumer";
+  "ContArrow" = dontDistribute super."ContArrow";
+  "ContextAlgebra" = dontDistribute super."ContextAlgebra";
+  "Contract" = dontDistribute super."Contract";
+  "Control-Engine" = dontDistribute super."Control-Engine";
+  "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass";
+  "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2";
+  "CoreDump" = dontDistribute super."CoreDump";
+  "CoreErlang" = dontDistribute super."CoreErlang";
+  "CoreFoundation" = dontDistribute super."CoreFoundation";
+  "Coroutine" = dontDistribute super."Coroutine";
+  "CouchDB" = dontDistribute super."CouchDB";
+  "Craft3e" = dontDistribute super."Craft3e";
+  "Crypto" = dontDistribute super."Crypto";
+  "CurryDB" = dontDistribute super."CurryDB";
+  "DAG-Tournament" = dontDistribute super."DAG-Tournament";
+  "DBlimited" = dontDistribute super."DBlimited";
+  "DBus" = dontDistribute super."DBus";
+  "DCFL" = dontDistribute super."DCFL";
+  "DMuCheck" = dontDistribute super."DMuCheck";
+  "DOM" = dontDistribute super."DOM";
+  "DP" = dontDistribute super."DP";
+  "DPM" = dontDistribute super."DPM";
+  "DSA" = dontDistribute super."DSA";
+  "DSH" = dontDistribute super."DSH";
+  "DSTM" = dontDistribute super."DSTM";
+  "DTC" = dontDistribute super."DTC";
+  "Dangerous" = dontDistribute super."Dangerous";
+  "Dao" = dontDistribute super."Dao";
+  "DarcsHelpers" = dontDistribute super."DarcsHelpers";
+  "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent";
+  "Data-Rope" = dontDistribute super."Data-Rope";
+  "DataTreeView" = dontDistribute super."DataTreeView";
+  "Deadpan-DDP" = dontDistribute super."Deadpan-DDP";
+  "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers";
+  "DecisionTree" = dontDistribute super."DecisionTree";
+  "DeepArrow" = dontDistribute super."DeepArrow";
+  "DefendTheKing" = dontDistribute super."DefendTheKing";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "DifferenceLogic" = dontDistribute super."DifferenceLogic";
+  "DifferentialEvolution" = dontDistribute super."DifferentialEvolution";
+  "Digit" = dontDistribute super."Digit";
+  "DigitalOcean" = dontDistribute super."DigitalOcean";
+  "DimensionalHash" = dontDistribute super."DimensionalHash";
+  "DirectSound" = dontDistribute super."DirectSound";
+  "DisTract" = dontDistribute super."DisTract";
+  "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem";
+  "Dish" = dontDistribute super."Dish";
+  "Dist" = dontDistribute super."Dist";
+  "DistanceTransform" = dontDistribute super."DistanceTransform";
+  "DistanceUnits" = dontDistribute super."DistanceUnits";
+  "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment";
+  "DocTest" = dontDistribute super."DocTest";
+  "Docs" = dontDistribute super."Docs";
+  "DrHylo" = dontDistribute super."DrHylo";
+  "DrIFT" = dontDistribute super."DrIFT";
+  "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized";
+  "Dung" = dontDistribute super."Dung";
+  "Dust" = dontDistribute super."Dust";
+  "Dust-crypto" = dontDistribute super."Dust-crypto";
+  "Dust-tools" = dontDistribute super."Dust-tools";
+  "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap";
+  "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp";
+  "DysFRP" = dontDistribute super."DysFRP";
+  "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
+  "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
+  "EEConfig" = dontDistribute super."EEConfig";
+  "EdisonAPI" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "EditTimeReport" = dontDistribute super."EditTimeReport";
+  "EitherT" = dontDistribute super."EitherT";
+  "Elm" = dontDistribute super."Elm";
+  "Emping" = dontDistribute super."Emping";
+  "Encode" = dontDistribute super."Encode";
+  "EnumContainers" = dontDistribute super."EnumContainers";
+  "EnumMap" = dontDistribute super."EnumMap";
+  "Eq" = dontDistribute super."Eq";
+  "EqualitySolver" = dontDistribute super."EqualitySolver";
+  "EsounD" = dontDistribute super."EsounD";
+  "EstProgress" = dontDistribute super."EstProgress";
+  "EtaMOO" = dontDistribute super."EtaMOO";
+  "Etage" = dontDistribute super."Etage";
+  "Etage-Graph" = dontDistribute super."Etage-Graph";
+  "Eternal10Seconds" = dontDistribute super."Eternal10Seconds";
+  "Etherbunny" = dontDistribute super."Etherbunny";
+  "EuroIT" = dontDistribute super."EuroIT";
+  "Euterpea" = dontDistribute super."Euterpea";
+  "EventSocket" = dontDistribute super."EventSocket";
+  "Extra" = dontDistribute super."Extra";
+  "FComp" = dontDistribute super."FComp";
+  "FM-SBLEX" = dontDistribute super."FM-SBLEX";
+  "FModExRaw" = dontDistribute super."FModExRaw";
+  "FPretty" = dontDistribute super."FPretty";
+  "FTGL" = dontDistribute super."FTGL";
+  "FTGL-bytestring" = dontDistribute super."FTGL-bytestring";
+  "FTPLine" = dontDistribute super."FTPLine";
+  "Facts" = dontDistribute super."Facts";
+  "FailureT" = dontDistribute super."FailureT";
+  "FastxPipe" = dontDistribute super."FastxPipe";
+  "FermatsLastMargin" = dontDistribute super."FermatsLastMargin";
+  "FerryCore" = dontDistribute super."FerryCore";
+  "Feval" = dontDistribute super."Feval";
+  "FieldTrip" = dontDistribute super."FieldTrip";
+  "FileManip" = dontDistribute super."FileManip";
+  "FileManipCompat" = dontDistribute super."FileManipCompat";
+  "FilePather" = dontDistribute super."FilePather";
+  "FileSystem" = dontDistribute super."FileSystem";
+  "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo";
+  "Finance-Treasury" = dontDistribute super."Finance-Treasury";
+  "FiniteMap" = dontDistribute super."FiniteMap";
+  "FirstOrderTheory" = dontDistribute super."FirstOrderTheory";
+  "FixedPoint-simple" = dontDistribute super."FixedPoint-simple";
+  "Flippi" = dontDistribute super."Flippi";
+  "Focus" = dontDistribute super."Focus";
+  "Folly" = dontDistribute super."Folly";
+  "ForSyDe" = dontDistribute super."ForSyDe";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frank" = dontDistribute super."Frank";
+  "FreeTypeGL" = dontDistribute super."FreeTypeGL";
+  "FunGEn" = dontDistribute super."FunGEn";
+  "Fungi" = dontDistribute super."Fungi";
+  "GA" = dontDistribute super."GA";
+  "GGg" = dontDistribute super."GGg";
+  "GHood" = dontDistribute super."GHood";
+  "GLFW" = dontDistribute super."GLFW";
+  "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
+  "GLFW-task" = dontDistribute super."GLFW-task";
+  "GLHUI" = dontDistribute super."GLHUI";
+  "GLM" = dontDistribute super."GLM";
+  "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
+  "GTALib" = dontDistribute super."GTALib";
+  "Gamgine" = dontDistribute super."Gamgine";
+  "Ganymede" = dontDistribute super."Ganymede";
+  "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration";
+  "GeBoP" = dontDistribute super."GeBoP";
+  "GenI" = dontDistribute super."GenI";
+  "GenSmsPdu" = dontDistribute super."GenSmsPdu";
+  "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe";
+  "GenussFold" = dontDistribute super."GenussFold";
+  "GeoIp" = dontDistribute super."GeoIp";
+  "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage";
+  "Geodetic" = dontDistribute super."Geodetic";
+  "GeomPredicates" = dontDistribute super."GeomPredicates";
+  "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
+  "GiST" = dontDistribute super."GiST";
+  "Gifcurry" = dontDistribute super."Gifcurry";
+  "GiveYouAHead" = dontDistribute super."GiveYouAHead";
+  "GlomeTrace" = dontDistribute super."GlomeTrace";
+  "GlomeVec" = dontDistribute super."GlomeVec";
+  "GlomeView" = dontDistribute super."GlomeView";
+  "GoogleChart" = dontDistribute super."GoogleChart";
+  "GoogleDirections" = dontDistribute super."GoogleDirections";
+  "GoogleSB" = dontDistribute super."GoogleSB";
+  "GoogleSuggest" = dontDistribute super."GoogleSuggest";
+  "GoogleTranslate" = dontDistribute super."GoogleTranslate";
+  "GotoT-transformers" = dontDistribute super."GotoT-transformers";
+  "GrammarProducts" = dontDistribute super."GrammarProducts";
+  "Graph500" = dontDistribute super."Graph500";
+  "GraphHammer" = dontDistribute super."GraphHammer";
+  "GraphHammer-examples" = dontDistribute super."GraphHammer-examples";
+  "Graphalyze" = dontDistribute super."Graphalyze";
+  "Grempa" = dontDistribute super."Grempa";
+  "GroteTrap" = dontDistribute super."GroteTrap";
+  "Grow" = dontDistribute super."Grow";
+  "GrowlNotify" = dontDistribute super."GrowlNotify";
+  "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics";
+  "GtkGLTV" = dontDistribute super."GtkGLTV";
+  "GtkTV" = dontDistribute super."GtkTV";
+  "GuiHaskell" = dontDistribute super."GuiHaskell";
+  "GuiTV" = dontDistribute super."GuiTV";
+  "HARM" = dontDistribute super."HARM";
+  "HAppS-Data" = dontDistribute super."HAppS-Data";
+  "HAppS-IxSet" = dontDistribute super."HAppS-IxSet";
+  "HAppS-Server" = dontDistribute super."HAppS-Server";
+  "HAppS-State" = dontDistribute super."HAppS-State";
+  "HAppS-Util" = dontDistribute super."HAppS-Util";
+  "HAppSHelpers" = dontDistribute super."HAppSHelpers";
+  "HCL" = dontDistribute super."HCL";
+  "HCard" = dontDistribute super."HCard";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "HDRUtils" = dontDistribute super."HDRUtils";
+  "HERA" = dontDistribute super."HERA";
+  "HFrequencyQueue" = dontDistribute super."HFrequencyQueue";
+  "HFuse" = dontDistribute super."HFuse";
+  "HGL" = dontDistribute super."HGL";
+  "HGamer3D" = dontDistribute super."HGamer3D";
+  "HGamer3D-API" = dontDistribute super."HGamer3D-API";
+  "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio";
+  "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding";
+  "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding";
+  "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding";
+  "HGamer3D-Common" = dontDistribute super."HGamer3D-Common";
+  "HGamer3D-Data" = dontDistribute super."HGamer3D-Data";
+  "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding";
+  "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI";
+  "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D";
+  "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem";
+  "HGamer3D-Network" = dontDistribute super."HGamer3D-Network";
+  "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding";
+  "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding";
+  "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding";
+  "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding";
+  "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent";
+  "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire";
+  "HGraphStorage" = dontDistribute super."HGraphStorage";
+  "HHDL" = dontDistribute super."HHDL";
+  "HJScript" = dontDistribute super."HJScript";
+  "HJVM" = dontDistribute super."HJVM";
+  "HJavaScript" = dontDistribute super."HJavaScript";
+  "HLearn-algebra" = dontDistribute super."HLearn-algebra";
+  "HLearn-approximation" = dontDistribute super."HLearn-approximation";
+  "HLearn-classification" = dontDistribute super."HLearn-classification";
+  "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
+  "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HListPP" = dontDistribute super."HListPP";
+  "HLogger" = dontDistribute super."HLogger";
+  "HMM" = dontDistribute super."HMM";
+  "HMap" = dontDistribute super."HMap";
+  "HNM" = dontDistribute super."HNM";
+  "HODE" = dontDistribute super."HODE";
+  "HOpenCV" = dontDistribute super."HOpenCV";
+  "HPath" = dontDistribute super."HPath";
+  "HPi" = dontDistribute super."HPi";
+  "HPlot" = dontDistribute super."HPlot";
+  "HPong" = dontDistribute super."HPong";
+  "HROOT" = dontDistribute super."HROOT";
+  "HROOT-core" = dontDistribute super."HROOT-core";
+  "HROOT-graf" = dontDistribute super."HROOT-graf";
+  "HROOT-hist" = dontDistribute super."HROOT-hist";
+  "HROOT-io" = dontDistribute super."HROOT-io";
+  "HROOT-math" = dontDistribute super."HROOT-math";
+  "HRay" = dontDistribute super."HRay";
+  "HSFFIG" = dontDistribute super."HSFFIG";
+  "HSGEP" = dontDistribute super."HSGEP";
+  "HSH" = dontDistribute super."HSH";
+  "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSlippyMap" = dontDistribute super."HSlippyMap";
+  "HSmarty" = dontDistribute super."HSmarty";
+  "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
+  "HSvm" = dontDistribute super."HSvm";
+  "HTTP-Simple" = dontDistribute super."HTTP-Simple";
+  "HTab" = dontDistribute super."HTab";
+  "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit-Diff" = dontDistribute super."HUnit-Diff";
+  "HUnit-Plus" = dontDistribute super."HUnit-Plus";
+  "HUnit-approx" = dontDistribute super."HUnit-approx";
+  "HXMPP" = dontDistribute super."HXMPP";
+  "HXQ" = dontDistribute super."HXQ";
+  "HaLeX" = dontDistribute super."HaLeX";
+  "HaMinitel" = dontDistribute super."HaMinitel";
+  "HaPy" = dontDistribute super."HaPy";
+  "HaTeX-meta" = dontDistribute super."HaTeX-meta";
+  "HaTeX-qq" = dontDistribute super."HaTeX-qq";
+  "HaVSA" = dontDistribute super."HaVSA";
+  "Hach" = dontDistribute super."Hach";
+  "HackMail" = dontDistribute super."HackMail";
+  "Haggressive" = dontDistribute super."Haggressive";
+  "HandlerSocketClient" = dontDistribute super."HandlerSocketClient";
+  "Hangman" = dontDistribute super."Hangman";
+  "HarmTrace" = dontDistribute super."HarmTrace";
+  "HarmTrace-Base" = dontDistribute super."HarmTrace-Base";
+  "HasGP" = dontDistribute super."HasGP";
+  "Haschoo" = dontDistribute super."Haschoo";
+  "Hashell" = dontDistribute super."Hashell";
+  "HaskRel" = dontDistribute super."HaskRel";
+  "HaskellForMaths" = dontDistribute super."HaskellForMaths";
+  "HaskellLM" = dontDistribute super."HaskellLM";
+  "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellTorrent" = dontDistribute super."HaskellTorrent";
+  "HaskellTutorials" = dontDistribute super."HaskellTutorials";
+  "Haskelloids" = dontDistribute super."Haskelloids";
+  "Hate" = dontDistribute super."Hate";
+  "Hawk" = dontDistribute super."Hawk";
+  "Hayoo" = dontDistribute super."Hayoo";
+  "Hclip" = dontDistribute super."Hclip";
+  "Hedi" = dontDistribute super."Hedi";
+  "HerbiePlugin" = dontDistribute super."HerbiePlugin";
+  "Hermes" = dontDistribute super."Hermes";
+  "Hieroglyph" = dontDistribute super."Hieroglyph";
+  "HiggsSet" = dontDistribute super."HiggsSet";
+  "Hipmunk" = dontDistribute super."Hipmunk";
+  "HipmunkPlayground" = dontDistribute super."HipmunkPlayground";
+  "Hish" = dontDistribute super."Hish";
+  "Histogram" = dontDistribute super."Histogram";
+  "Hmpf" = dontDistribute super."Hmpf";
+  "Hoed" = dontDistribute super."Hoed";
+  "HoleyMonoid" = dontDistribute super."HoleyMonoid";
+  "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution";
+  "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce";
+  "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine";
+  "Holumbus-Storage" = dontDistribute super."Holumbus-Storage";
+  "Homology" = dontDistribute super."Homology";
+  "HongoDB" = dontDistribute super."HongoDB";
+  "HostAndPort" = dontDistribute super."HostAndPort";
+  "Hricket" = dontDistribute super."Hricket";
+  "Hs2lib" = dontDistribute super."Hs2lib";
+  "HsASA" = dontDistribute super."HsASA";
+  "HsHaruPDF" = dontDistribute super."HsHaruPDF";
+  "HsHyperEstraier" = dontDistribute super."HsHyperEstraier";
+  "HsJudy" = dontDistribute super."HsJudy";
+  "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system";
+  "HsParrot" = dontDistribute super."HsParrot";
+  "HsPerl5" = dontDistribute super."HsPerl5";
+  "HsSVN" = dontDistribute super."HsSVN";
+  "HsTools" = dontDistribute super."HsTools";
+  "Hsed" = dontDistribute super."Hsed";
+  "Hsmtlib" = dontDistribute super."Hsmtlib";
+  "HueAPI" = dontDistribute super."HueAPI";
+  "HulkImport" = dontDistribute super."HulkImport";
+  "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres";
+  "IDynamic" = dontDistribute super."IDynamic";
+  "IFS" = dontDistribute super."IFS";
+  "INblobs" = dontDistribute super."INblobs";
+  "IOR" = dontDistribute super."IOR";
+  "IORefCAS" = dontDistribute super."IORefCAS";
+  "IOSpec" = dontDistribute super."IOSpec";
+  "IcoGrid" = dontDistribute super."IcoGrid";
+  "Imlib" = dontDistribute super."Imlib";
+  "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
+  "IndentParser" = dontDistribute super."IndentParser";
+  "IndexedList" = dontDistribute super."IndexedList";
+  "InfixApplicative" = dontDistribute super."InfixApplicative";
+  "Interpolation" = dontDistribute super."Interpolation";
+  "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JunkDB" = dontDistribute super."JunkDB";
+  "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
+  "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables";
+  "JustParse" = dontDistribute super."JustParse";
+  "KMP" = dontDistribute super."KMP";
+  "KSP" = dontDistribute super."KSP";
+  "Kalman" = dontDistribute super."Kalman";
+  "KdTree" = dontDistribute super."KdTree";
+  "Ketchup" = dontDistribute super."Ketchup";
+  "KiCS" = dontDistribute super."KiCS";
+  "KiCS-debugger" = dontDistribute super."KiCS-debugger";
+  "KiCS-prophecy" = dontDistribute super."KiCS-prophecy";
+  "Kleislify" = dontDistribute super."Kleislify";
+  "Konf" = dontDistribute super."Konf";
+  "Kriens" = dontDistribute super."Kriens";
+  "KyotoCabinet" = dontDistribute super."KyotoCabinet";
+  "L-seed" = dontDistribute super."L-seed";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "LambdaHack" = dontDistribute super."LambdaHack";
+  "LambdaINet" = dontDistribute super."LambdaINet";
+  "LambdaNet" = dontDistribute super."LambdaNet";
+  "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote";
+  "LambdaShell" = dontDistribute super."LambdaShell";
+  "Lambdajudge" = dontDistribute super."Lambdajudge";
+  "Lambdaya" = dontDistribute super."Lambdaya";
+  "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
+  "Lastik" = dontDistribute super."Lastik";
+  "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "Limit" = dontDistribute super."Limit";
+  "LinearSplit" = dontDistribute super."LinearSplit";
+  "LinguisticsTypes" = dontDistribute super."LinguisticsTypes";
+  "LinkChecker" = dontDistribute super."LinkChecker";
+  "ListTree" = dontDistribute super."ListTree";
+  "ListWriter" = dontDistribute super."ListWriter";
+  "ListZipper" = dontDistribute super."ListZipper";
+  "Logic" = dontDistribute super."Logic";
+  "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees";
+  "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI";
+  "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network";
+  "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
+  "LslPlus" = dontDistribute super."LslPlus";
+  "Lucu" = dontDistribute super."Lucu";
+  "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
+  "MHask" = dontDistribute super."MHask";
+  "MSQueue" = dontDistribute super."MSQueue";
+  "MTGBuilder" = dontDistribute super."MTGBuilder";
+  "MagicHaskeller" = dontDistribute super."MagicHaskeller";
+  "MailchimpSimple" = dontDistribute super."MailchimpSimple";
+  "MaybeT" = dontDistribute super."MaybeT";
+  "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf";
+  "MaybeT-transformers" = dontDistribute super."MaybeT-transformers";
+  "MazesOfMonad" = dontDistribute super."MazesOfMonad";
+  "MeanShift" = dontDistribute super."MeanShift";
+  "Measure" = dontDistribute super."Measure";
+  "MetaHDBC" = dontDistribute super."MetaHDBC";
+  "MetaObject" = dontDistribute super."MetaObject";
+  "Metrics" = dontDistribute super."Metrics";
+  "Mhailist" = dontDistribute super."Mhailist";
+  "Michelangelo" = dontDistribute super."Michelangelo";
+  "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator";
+  "MiniAgda" = dontDistribute super."MiniAgda";
+  "MissingK" = dontDistribute super."MissingK";
+  "MissingM" = dontDistribute super."MissingM";
+  "MissingPy" = dontDistribute super."MissingPy";
+  "Modulo" = dontDistribute super."Modulo";
+  "Moe" = dontDistribute super."Moe";
+  "MoeDict" = dontDistribute super."MoeDict";
+  "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl";
+  "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign";
+  "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
+  "MonadCompose" = dontDistribute super."MonadCompose";
+  "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
+  "MonadStack" = dontDistribute super."MonadStack";
+  "Monadius" = dontDistribute super."Monadius";
+  "Monaris" = dontDistribute super."Monaris";
+  "Monatron" = dontDistribute super."Monatron";
+  "Monatron-IO" = dontDistribute super."Monatron-IO";
+  "Monocle" = dontDistribute super."Monocle";
+  "MorseCode" = dontDistribute super."MorseCode";
+  "MuCheck" = dontDistribute super."MuCheck";
+  "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit";
+  "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec";
+  "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck";
+  "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck";
+  "Munkres" = dontDistribute super."Munkres";
+  "Munkres-simple" = dontDistribute super."Munkres-simple";
+  "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid";
+  "MyPrimes" = dontDistribute super."MyPrimes";
+  "NGrams" = dontDistribute super."NGrams";
+  "NTRU" = dontDistribute super."NTRU";
+  "NXT" = dontDistribute super."NXT";
+  "NXTDSL" = dontDistribute super."NXTDSL";
+  "NanoProlog" = dontDistribute super."NanoProlog";
+  "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets";
+  "NaturalSort" = dontDistribute super."NaturalSort";
+  "NearContextAlgebra" = dontDistribute super."NearContextAlgebra";
+  "Neks" = dontDistribute super."Neks";
+  "NestedFunctor" = dontDistribute super."NestedFunctor";
+  "NestedSampling" = dontDistribute super."NestedSampling";
+  "NetSNMP" = dontDistribute super."NetSNMP";
+  "NewBinary" = dontDistribute super."NewBinary";
+  "Ninjas" = dontDistribute super."Ninjas";
+  "NoSlow" = dontDistribute super."NoSlow";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "Noise" = dontDistribute super."Noise";
+  "Nomyx" = dontDistribute super."Nomyx";
+  "Nomyx-Core" = dontDistribute super."Nomyx-Core";
+  "Nomyx-Language" = dontDistribute super."Nomyx-Language";
+  "Nomyx-Rules" = dontDistribute super."Nomyx-Rules";
+  "Nomyx-Web" = dontDistribute super."Nomyx-Web";
+  "NonEmpty" = dontDistribute super."NonEmpty";
+  "NonEmptyList" = dontDistribute super."NonEmptyList";
+  "NumLazyByteString" = dontDistribute super."NumLazyByteString";
+  "NumberSieves" = dontDistribute super."NumberSieves";
+  "Numbers" = dontDistribute super."Numbers";
+  "Nussinov78" = dontDistribute super."Nussinov78";
+  "Nutri" = dontDistribute super."Nutri";
+  "OGL" = dontDistribute super."OGL";
+  "OSM" = dontDistribute super."OSM";
+  "OTP" = dontDistribute super."OTP";
+  "Object" = dontDistribute super."Object";
+  "ObjectIO" = dontDistribute super."ObjectIO";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
+  "OpenSCAD" = dontDistribute super."OpenSCAD";
+  "OpenVG" = dontDistribute super."OpenVG";
+  "OpenVGRaw" = dontDistribute super."OpenVGRaw";
+  "Operads" = dontDistribute super."Operads";
+  "OptDir" = dontDistribute super."OptDir";
+  "OrPatterns" = dontDistribute super."OrPatterns";
+  "OrchestrateDB" = dontDistribute super."OrchestrateDB";
+  "OrderedBits" = dontDistribute super."OrderedBits";
+  "Ordinals" = dontDistribute super."Ordinals";
+  "PArrows" = dontDistribute super."PArrows";
+  "PBKDF2" = dontDistribute super."PBKDF2";
+  "PCLT" = dontDistribute super."PCLT";
+  "PCLT-DB" = dontDistribute super."PCLT-DB";
+  "PDBtools" = dontDistribute super."PDBtools";
+  "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
+  "PageIO" = dontDistribute super."PageIO";
+  "Paillier" = dontDistribute super."Paillier";
+  "PandocAgda" = dontDistribute super."PandocAgda";
+  "Paraiso" = dontDistribute super."Paraiso";
+  "Parry" = dontDistribute super."Parry";
+  "ParsecTools" = dontDistribute super."ParsecTools";
+  "ParserFunction" = dontDistribute super."ParserFunction";
+  "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures";
+  "PasswordGenerator" = dontDistribute super."PasswordGenerator";
+  "PastePipe" = dontDistribute super."PastePipe";
+  "Pathfinder" = dontDistribute super."Pathfinder";
+  "Peano" = dontDistribute super."Peano";
+  "PeanoWitnesses" = dontDistribute super."PeanoWitnesses";
+  "PerfectHash" = dontDistribute super."PerfectHash";
+  "PermuteEffects" = dontDistribute super."PermuteEffects";
+  "Phsu" = dontDistribute super."Phsu";
+  "Pipe" = dontDistribute super."Pipe";
+  "Piso" = dontDistribute super."Piso";
+  "PlayHangmanGame" = dontDistribute super."PlayHangmanGame";
+  "PlayingCards" = dontDistribute super."PlayingCards";
+  "Plot-ho-matic" = dontDistribute super."Plot-ho-matic";
+  "PlslTools" = dontDistribute super."PlslTools";
+  "Plural" = dontDistribute super."Plural";
+  "Pollutocracy" = dontDistribute super."Pollutocracy";
+  "PortFusion" = dontDistribute super."PortFusion";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "Printf-TH" = dontDistribute super."Printf-TH";
+  "PriorityChansConverger" = dontDistribute super."PriorityChansConverger";
+  "ProbabilityMonads" = dontDistribute super."ProbabilityMonads";
+  "PropLogic" = dontDistribute super."PropLogic";
+  "Proper" = dontDistribute super."Proper";
+  "ProxN" = dontDistribute super."ProxN";
+  "Pugs" = dontDistribute super."Pugs";
+  "Pup-Events" = dontDistribute super."Pup-Events";
+  "Pup-Events-Client" = dontDistribute super."Pup-Events-Client";
+  "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo";
+  "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
+  "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
+  "QIO" = dontDistribute super."QIO";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickCheck-safe" = dontDistribute super."QuickCheck-safe";
+  "Quickson" = dontDistribute super."Quickson";
+  "R-pandoc" = dontDistribute super."R-pandoc";
+  "RANSAC" = dontDistribute super."RANSAC";
+  "RBTree" = dontDistribute super."RBTree";
+  "RESTng" = dontDistribute super."RESTng";
+  "RFC1751" = dontDistribute super."RFC1751";
+  "RJson" = dontDistribute super."RJson";
+  "RMP" = dontDistribute super."RMP";
+  "RNAFold" = dontDistribute super."RNAFold";
+  "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
+  "RNAdesign" = dontDistribute super."RNAdesign";
+  "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "Semantique" = dontDistribute super."Semantique";
+  "Semigroup" = dontDistribute super."Semigroup";
+  "SeqAlign" = dontDistribute super."SeqAlign";
+  "SessionLogger" = dontDistribute super."SessionLogger";
+  "ShellCheck" = dontDistribute super."ShellCheck";
+  "Shellac" = dontDistribute super."Shellac";
+  "Shellac-compatline" = dontDistribute super."Shellac-compatline";
+  "Shellac-editline" = dontDistribute super."Shellac-editline";
+  "Shellac-haskeline" = dontDistribute super."Shellac-haskeline";
+  "Shellac-readline" = dontDistribute super."Shellac-readline";
+  "ShowF" = dontDistribute super."ShowF";
+  "Shrub" = dontDistribute super."Shrub";
+  "Shu-thing" = dontDistribute super."Shu-thing";
+  "SimpleAES" = dontDistribute super."SimpleAES";
+  "SimpleEA" = dontDistribute super."SimpleEA";
+  "SimpleGL" = dontDistribute super."SimpleGL";
+  "SimpleH" = dontDistribute super."SimpleH";
+  "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
+  "SizeCompare" = dontDistribute super."SizeCompare";
+  "Slides" = dontDistribute super."Slides";
+  "Smooth" = dontDistribute super."Smooth";
+  "SmtLib" = dontDistribute super."SmtLib";
+  "Snusmumrik" = dontDistribute super."Snusmumrik";
+  "SoOSiM" = dontDistribute super."SoOSiM";
+  "SoccerFun" = dontDistribute super."SoccerFun";
+  "SoccerFunGL" = dontDistribute super."SoccerFunGL";
+  "Sonnex" = dontDistribute super."Sonnex";
+  "SourceGraph" = dontDistribute super."SourceGraph";
+  "Southpaw" = dontDistribute super."Southpaw";
+  "SpaceInvaders" = dontDistribute super."SpaceInvaders";
+  "SpacePrivateers" = dontDistribute super."SpacePrivateers";
+  "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "SpreadsheetML" = dontDistribute super."SpreadsheetML";
+  "Sprig" = dontDistribute super."Sprig";
+  "Stasis" = dontDistribute super."Stasis";
+  "StateVar-transformer" = dontDistribute super."StateVar-transformer";
+  "StatisticalMethods" = dontDistribute super."StatisticalMethods";
+  "Stomp" = dontDistribute super."Stomp";
+  "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib";
+  "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "Stream" = dontDistribute super."Stream";
+  "StrictBench" = dontDistribute super."StrictBench";
+  "SuffixStructures" = dontDistribute super."SuffixStructures";
+  "SybWidget" = dontDistribute super."SybWidget";
+  "SyntaxMacros" = dontDistribute super."SyntaxMacros";
+  "Sysmon" = dontDistribute super."Sysmon";
+  "TBC" = dontDistribute super."TBC";
+  "TBit" = dontDistribute super."TBit";
+  "THEff" = dontDistribute super."THEff";
+  "TTTAS" = dontDistribute super."TTTAS";
+  "TV" = dontDistribute super."TV";
+  "TYB" = dontDistribute super."TYB";
+  "TableAlgebra" = dontDistribute super."TableAlgebra";
+  "Tables" = dontDistribute super."Tables";
+  "Tablify" = dontDistribute super."Tablify";
+  "Tainted" = dontDistribute super."Tainted";
+  "Takusen" = dontDistribute super."Takusen";
+  "Tape" = dontDistribute super."Tape";
+  "TeaHS" = dontDistribute super."TeaHS";
+  "Tensor" = dontDistribute super."Tensor";
+  "TernaryTrees" = dontDistribute super."TernaryTrees";
+  "TestExplode" = dontDistribute super."TestExplode";
+  "Theora" = dontDistribute super."Theora";
+  "Thingie" = dontDistribute super."Thingie";
+  "ThreadObjects" = dontDistribute super."ThreadObjects";
+  "Thrift" = dontDistribute super."Thrift";
+  "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe";
+  "TicTacToe" = dontDistribute super."TicTacToe";
+  "TigerHash" = dontDistribute super."TigerHash";
+  "TimePiece" = dontDistribute super."TimePiece";
+  "TinyLaunchbury" = dontDistribute super."TinyLaunchbury";
+  "TinyURL" = dontDistribute super."TinyURL";
+  "Titim" = dontDistribute super."Titim";
+  "Top" = dontDistribute super."Top";
+  "Tournament" = dontDistribute super."Tournament";
+  "TraceUtils" = dontDistribute super."TraceUtils";
+  "TransformersStepByStep" = dontDistribute super."TransformersStepByStep";
+  "Transhare" = dontDistribute super."Transhare";
+  "TreeCounter" = dontDistribute super."TreeCounter";
+  "TreeStructures" = dontDistribute super."TreeStructures";
+  "TreeT" = dontDistribute super."TreeT";
+  "Treiber" = dontDistribute super."Treiber";
+  "TrendGraph" = dontDistribute super."TrendGraph";
+  "TrieMap" = dontDistribute super."TrieMap";
+  "Twofish" = dontDistribute super."Twofish";
+  "TypeClass" = dontDistribute super."TypeClass";
+  "TypeCompose" = dontDistribute super."TypeCompose";
+  "TypeIlluminator" = dontDistribute super."TypeIlluminator";
+  "TypeNat" = dontDistribute super."TypeNat";
+  "TypingTester" = dontDistribute super."TypingTester";
+  "UISF" = dontDistribute super."UISF";
+  "UMM" = dontDistribute super."UMM";
+  "URLT" = dontDistribute super."URLT";
+  "URLb" = dontDistribute super."URLb";
+  "UTFTConverter" = dontDistribute super."UTFTConverter";
+  "Unique" = dontDistribute super."Unique";
+  "Unixutils-shadow" = dontDistribute super."Unixutils-shadow";
+  "Updater" = dontDistribute super."Updater";
+  "UrlDisp" = dontDistribute super."UrlDisp";
+  "Useful" = dontDistribute super."Useful";
+  "UtilityTM" = dontDistribute super."UtilityTM";
+  "VKHS" = dontDistribute super."VKHS";
+  "Validation" = dontDistribute super."Validation";
+  "Vec" = dontDistribute super."Vec";
+  "Vec-Boolean" = dontDistribute super."Vec-Boolean";
+  "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
+  "Vec-Transform" = dontDistribute super."Vec-Transform";
+  "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "Vulkan" = dontDistribute super."Vulkan";
+  "WAVE" = dontDistribute super."WAVE";
+  "WL500gPControl" = dontDistribute super."WL500gPControl";
+  "WL500gPLib" = dontDistribute super."WL500gPLib";
+  "WMSigner" = dontDistribute super."WMSigner";
+  "WURFL" = dontDistribute super."WURFL";
+  "WXDiffCtrl" = dontDistribute super."WXDiffCtrl";
+  "WashNGo" = dontDistribute super."WashNGo";
+  "WaveFront" = dontDistribute super."WaveFront";
+  "Weather" = dontDistribute super."Weather";
+  "WebBits" = dontDistribute super."WebBits";
+  "WebBits-Html" = dontDistribute super."WebBits-Html";
+  "WebBits-multiplate" = dontDistribute super."WebBits-multiplate";
+  "WebCont" = dontDistribute super."WebCont";
+  "WeberLogic" = dontDistribute super."WeberLogic";
+  "Webrexp" = dontDistribute super."Webrexp";
+  "Wheb" = dontDistribute super."Wheb";
+  "WikimediaParser" = dontDistribute super."WikimediaParser";
+  "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server";
+  "Win32-errors" = dontDistribute super."Win32-errors";
+  "Win32-junction-point" = dontDistribute super."Win32-junction-point";
+  "Win32-security" = dontDistribute super."Win32-security";
+  "Win32-services" = dontDistribute super."Win32-services";
+  "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper";
+  "Wired" = dontDistribute super."Wired";
+  "WordAlignment" = dontDistribute super."WordAlignment";
+  "WordNet" = dontDistribute super."WordNet";
+  "WordNet-ghc74" = dontDistribute super."WordNet-ghc74";
+  "Wordlint" = dontDistribute super."Wordlint";
+  "WxGeneric" = dontDistribute super."WxGeneric";
+  "X11-extras" = dontDistribute super."X11-extras";
+  "X11-rm" = dontDistribute super."X11-rm";
+  "X11-xdamage" = dontDistribute super."X11-xdamage";
+  "X11-xfixes" = dontDistribute super."X11-xfixes";
+  "X11-xft" = dontDistribute super."X11-xft";
+  "X11-xshape" = dontDistribute super."X11-xshape";
+  "XAttr" = dontDistribute super."XAttr";
+  "XInput" = dontDistribute super."XInput";
+  "XMMS" = dontDistribute super."XMMS";
+  "XMPP" = dontDistribute super."XMPP";
+  "XSaiga" = dontDistribute super."XSaiga";
+  "Xec" = dontDistribute super."Xec";
+  "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter";
+  "Xorshift128Plus" = dontDistribute super."Xorshift128Plus";
+  "YACPong" = dontDistribute super."YACPong";
+  "YFrob" = dontDistribute super."YFrob";
+  "Yablog" = dontDistribute super."Yablog";
+  "YamlReference" = dontDistribute super."YamlReference";
+  "Yampa-core" = dontDistribute super."Yampa-core";
+  "Yocto" = dontDistribute super."Yocto";
+  "Yogurt" = dontDistribute super."Yogurt";
+  "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone";
+  "ZEBEDDE" = dontDistribute super."ZEBEDDE";
+  "ZFS" = dontDistribute super."ZFS";
+  "ZMachine" = dontDistribute super."ZMachine";
+  "ZipFold" = dontDistribute super."ZipFold";
+  "ZipperAG" = dontDistribute super."ZipperAG";
+  "Zora" = dontDistribute super."Zora";
+  "Zwaluw" = dontDistribute super."Zwaluw";
+  "a50" = dontDistribute super."a50";
+  "abacate" = dontDistribute super."abacate";
+  "abc-puzzle" = dontDistribute super."abc-puzzle";
+  "abcBridge" = dontDistribute super."abcBridge";
+  "abcnotation" = dontDistribute super."abcnotation";
+  "abeson" = dontDistribute super."abeson";
+  "abstract-deque-tests" = dontDistribute super."abstract-deque-tests";
+  "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate";
+  "abt" = dontDistribute super."abt";
+  "ac-machine" = dontDistribute super."ac-machine";
+  "ac-machine-conduit" = dontDistribute super."ac-machine-conduit";
+  "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic";
+  "accelerate-cublas" = dontDistribute super."accelerate-cublas";
+  "accelerate-cuda" = dontDistribute super."accelerate-cuda";
+  "accelerate-cufft" = dontDistribute super."accelerate-cufft";
+  "accelerate-examples" = dontDistribute super."accelerate-examples";
+  "accelerate-fft" = dontDistribute super."accelerate-fft";
+  "accelerate-fftw" = dontDistribute super."accelerate-fftw";
+  "accelerate-fourier" = dontDistribute super."accelerate-fourier";
+  "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark";
+  "accelerate-io" = dontDistribute super."accelerate-io";
+  "accelerate-random" = dontDistribute super."accelerate-random";
+  "accelerate-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "acid-state-dist" = dontDistribute super."acid-state-dist";
+  "acid-state-tls" = dontDistribute super."acid-state-tls";
+  "acl2" = dontDistribute super."acl2";
+  "acme-all-monad" = dontDistribute super."acme-all-monad";
+  "acme-box" = dontDistribute super."acme-box";
+  "acme-cadre" = dontDistribute super."acme-cadre";
+  "acme-cofunctor" = dontDistribute super."acme-cofunctor";
+  "acme-colosson" = dontDistribute super."acme-colosson";
+  "acme-comonad" = dontDistribute super."acme-comonad";
+  "acme-cutegirl" = dontDistribute super."acme-cutegirl";
+  "acme-dont" = dontDistribute super."acme-dont";
+  "acme-flipping-tables" = dontDistribute super."acme-flipping-tables";
+  "acme-grawlix" = dontDistribute super."acme-grawlix";
+  "acme-hq9plus" = dontDistribute super."acme-hq9plus";
+  "acme-http" = dontDistribute super."acme-http";
+  "acme-inator" = dontDistribute super."acme-inator";
+  "acme-io" = dontDistribute super."acme-io";
+  "acme-lolcat" = dontDistribute super."acme-lolcat";
+  "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
+  "acme-memorandom" = dontDistribute super."acme-memorandom";
+  "acme-microwave" = dontDistribute super."acme-microwave";
+  "acme-miscorder" = dontDistribute super."acme-miscorder";
+  "acme-missiles" = dontDistribute super."acme-missiles";
+  "acme-now" = dontDistribute super."acme-now";
+  "acme-numbersystem" = dontDistribute super."acme-numbersystem";
+  "acme-omitted" = dontDistribute super."acme-omitted";
+  "acme-one" = dontDistribute super."acme-one";
+  "acme-operators" = dontDistribute super."acme-operators";
+  "acme-php" = dontDistribute super."acme-php";
+  "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers";
+  "acme-realworld" = dontDistribute super."acme-realworld";
+  "acme-safe" = dontDistribute super."acme-safe";
+  "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel";
+  "acme-strfry" = dontDistribute super."acme-strfry";
+  "acme-stringly-typed" = dontDistribute super."acme-stringly-typed";
+  "acme-strtok" = dontDistribute super."acme-strtok";
+  "acme-timemachine" = dontDistribute super."acme-timemachine";
+  "acme-year" = dontDistribute super."acme-year";
+  "acme-zero" = dontDistribute super."acme-zero";
+  "activehs" = dontDistribute super."activehs";
+  "activehs-base" = dontDistribute super."activehs-base";
+  "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
+  "actor" = dontDistribute super."actor";
+  "adaptive-containers" = dontDistribute super."adaptive-containers";
+  "adaptive-tuple" = dontDistribute super."adaptive-tuple";
+  "adb" = dontDistribute super."adb";
+  "adblock2privoxy" = dontDistribute super."adblock2privoxy";
+  "addLicenseInfo" = dontDistribute super."addLicenseInfo";
+  "adhoc-network" = dontDistribute super."adhoc-network";
+  "adict" = dontDistribute super."adict";
+  "adler32" = dontDistribute super."adler32";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "aeson-schema" = dontDistribute super."aeson-schema";
+  "aeson-serialize" = dontDistribute super."aeson-serialize";
+  "aeson-smart" = dontDistribute super."aeson-smart";
+  "aeson-streams" = dontDistribute super."aeson-streams";
+  "aeson-t" = dontDistribute super."aeson-t";
+  "aeson-toolkit" = dontDistribute super."aeson-toolkit";
+  "aeson-value-parser" = dontDistribute super."aeson-value-parser";
+  "aeson-yak" = dontDistribute super."aeson-yak";
+  "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
+  "afis" = dontDistribute super."afis";
+  "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "agum" = dontDistribute super."agum";
+  "aig" = dontDistribute super."aig";
+  "air" = dontDistribute super."air";
+  "air-extra" = dontDistribute super."air-extra";
+  "air-spec" = dontDistribute super."air-spec";
+  "air-th" = dontDistribute super."air-th";
+  "airbrake" = dontDistribute super."airbrake";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-experiment" = dontDistribute super."aivika-experiment";
+  "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
+  "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
+  "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-transformers" = dontDistribute super."aivika-transformers";
+  "ajhc" = dontDistribute super."ajhc";
+  "al" = dontDistribute super."al";
+  "alea" = dontDistribute super."alea";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "ampersand" = dontDistribute super."ampersand";
+  "amqp-conduit" = dontDistribute super."amqp-conduit";
+  "amrun" = dontDistribute super."amrun";
+  "analyze-client" = dontDistribute super."analyze-client";
+  "anansi" = dontDistribute super."anansi";
+  "anansi-hscolour" = dontDistribute super."anansi-hscolour";
+  "anansi-pandoc" = dontDistribute super."anansi-pandoc";
+  "anatomy" = dontDistribute super."anatomy";
+  "android" = dontDistribute super."android";
+  "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "animalcase" = dontDistribute super."animalcase";
+  "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
+  "ansi-pretty" = dontDistribute super."ansi-pretty";
+  "ansigraph" = dontDistribute super."ansigraph";
+  "antagonist" = dontDistribute super."antagonist";
+  "antfarm" = dontDistribute super."antfarm";
+  "anticiv" = dontDistribute super."anticiv";
+  "antigate" = dontDistribute super."antigate";
+  "antimirov" = dontDistribute super."antimirov";
+  "antiquoter" = dontDistribute super."antiquoter";
+  "antisplice" = dontDistribute super."antisplice";
+  "antlrc" = dontDistribute super."antlrc";
+  "anydbm" = dontDistribute super."anydbm";
+  "aosd" = dontDistribute super."aosd";
+  "ap-reflect" = dontDistribute super."ap-reflect";
+  "apache-md5" = dontDistribute super."apache-md5";
+  "apelsin" = dontDistribute super."apelsin";
+  "api-builder" = dontDistribute super."api-builder";
+  "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
+  "api-tools" = dontDistribute super."api-tools";
+  "apiary-helics" = dontDistribute super."apiary-helics";
+  "apiary-purescript" = dontDistribute super."apiary-purescript";
+  "apis" = dontDistribute super."apis";
+  "apotiki" = dontDistribute super."apotiki";
+  "app-lens" = dontDistribute super."app-lens";
+  "appc" = dontDistribute super."appc";
+  "applicative-extras" = dontDistribute super."applicative-extras";
+  "applicative-fail" = dontDistribute super."applicative-fail";
+  "applicative-numbers" = dontDistribute super."applicative-numbers";
+  "applicative-parsec" = dontDistribute super."applicative-parsec";
+  "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
+  "apportionment" = dontDistribute super."apportionment";
+  "approx-rand-test" = dontDistribute super."approx-rand-test";
+  "approximate-equality" = dontDistribute super."approximate-equality";
+  "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
+  "arb-fft" = dontDistribute super."arb-fft";
+  "arbb-vm" = dontDistribute super."arbb-vm";
+  "archive" = dontDistribute super."archive";
+  "archiver" = dontDistribute super."archiver";
+  "archlinux" = dontDistribute super."archlinux";
+  "archlinux-web" = dontDistribute super."archlinux-web";
+  "archnews" = dontDistribute super."archnews";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon2" = dontDistribute super."argon2";
+  "argparser" = dontDistribute super."argparser";
+  "arguedit" = dontDistribute super."arguedit";
+  "ariadne" = dontDistribute super."ariadne";
+  "arion" = dontDistribute super."arion";
+  "arith-encode" = dontDistribute super."arith-encode";
+  "arithmatic" = dontDistribute super."arithmatic";
+  "arithmetic" = dontDistribute super."arithmetic";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "armada" = dontDistribute super."armada";
+  "arpa" = dontDistribute super."arpa";
+  "array-forth" = dontDistribute super."array-forth";
+  "array-memoize" = dontDistribute super."array-memoize";
+  "array-primops" = dontDistribute super."array-primops";
+  "array-utils" = dontDistribute super."array-utils";
+  "arrow-improve" = dontDistribute super."arrow-improve";
+  "arrowapply-utils" = dontDistribute super."arrowapply-utils";
+  "arrowp" = dontDistribute super."arrowp";
+  "arrows" = dontDistribute super."arrows";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asic" = dontDistribute super."asic";
+  "asil" = dontDistribute super."asil";
+  "asn1-data" = dontDistribute super."asn1-data";
+  "asn1dump" = dontDistribute super."asn1dump";
+  "assembler" = dontDistribute super."assembler";
+  "assert" = dontDistribute super."assert";
+  "assert-failure" = dontDistribute super."assert-failure";
+  "assertions" = dontDistribute super."assertions";
+  "assimp" = dontDistribute super."assimp";
+  "astar" = dontDistribute super."astar";
+  "astrds" = dontDistribute super."astrds";
+  "astview" = dontDistribute super."astview";
+  "astview-utils" = dontDistribute super."astview-utils";
+  "async-extras" = dontDistribute super."async-extras";
+  "async-manager" = dontDistribute super."async-manager";
+  "async-pool" = dontDistribute super."async-pool";
+  "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions";
+  "aterm" = dontDistribute super."aterm";
+  "aterm-utils" = dontDistribute super."aterm-utils";
+  "atl" = dontDistribute super."atl";
+  "atlassian-connect-core" = dontDistribute super."atlassian-connect-core";
+  "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor";
+  "atmos" = dontDistribute super."atmos";
+  "atmos-dimensional" = dontDistribute super."atmos-dimensional";
+  "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atom" = dontDistribute super."atom";
+  "atom-basic" = dontDistribute super."atom-basic";
+  "atom-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "atomo" = dontDistribute super."atomo";
+  "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec-arff" = dontDistribute super."attoparsec-arff";
+  "attoparsec-binary" = dontDistribute super."attoparsec-binary";
+  "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
+  "attoparsec-csv" = dontDistribute super."attoparsec-csv";
+  "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee";
+  "attoparsec-parsec" = dontDistribute super."attoparsec-parsec";
+  "attoparsec-text" = dontDistribute super."attoparsec-text";
+  "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator";
+  "attosplit" = dontDistribute super."attosplit";
+  "atuin" = dontDistribute super."atuin";
+  "audacity" = dontDistribute super."audacity";
+  "audiovisual" = dontDistribute super."audiovisual";
+  "augeas" = dontDistribute super."augeas";
+  "augur" = dontDistribute super."augur";
+  "aur" = dontDistribute super."aur";
+  "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
+  "authenticate-ldap" = dontDistribute super."authenticate-ldap";
+  "authinfo-hs" = dontDistribute super."authinfo-hs";
+  "authoring" = dontDistribute super."authoring";
+  "autonix-deps" = dontDistribute super."autonix-deps";
+  "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
+  "autoproc" = dontDistribute super."autoproc";
+  "avahi" = dontDistribute super."avahi";
+  "avatar-generator" = dontDistribute super."avatar-generator";
+  "average" = dontDistribute super."average";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer";
+  "aws-configuration-tools" = dontDistribute super."aws-configuration-tools";
+  "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit";
+  "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams";
+  "aws-ec2" = dontDistribute super."aws-ec2";
+  "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder";
+  "aws-general" = dontDistribute super."aws-general";
+  "aws-kinesis" = dontDistribute super."aws-kinesis";
+  "aws-kinesis-client" = dontDistribute super."aws-kinesis-client";
+  "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard";
+  "aws-lambda" = dontDistribute super."aws-lambda";
+  "aws-performance-tests" = dontDistribute super."aws-performance-tests";
+  "aws-route53" = dontDistribute super."aws-route53";
+  "aws-sdk" = dontDistribute super."aws-sdk";
+  "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter";
+  "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered";
+  "aws-sign4" = dontDistribute super."aws-sign4";
+  "aws-sns" = dontDistribute super."aws-sns";
+  "azure-acs" = dontDistribute super."azure-acs";
+  "azure-service-api" = dontDistribute super."azure-service-api";
+  "azure-servicebus" = dontDistribute super."azure-servicebus";
+  "azurify" = dontDistribute super."azurify";
+  "b-tree" = dontDistribute super."b-tree";
+  "babylon" = dontDistribute super."babylon";
+  "backdropper" = dontDistribute super."backdropper";
+  "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
+  "backward-state" = dontDistribute super."backward-state";
+  "bacteria" = dontDistribute super."bacteria";
+  "bag" = dontDistribute super."bag";
+  "bamboo" = dontDistribute super."bamboo";
+  "bamboo-launcher" = dontDistribute super."bamboo-launcher";
+  "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight";
+  "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo";
+  "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint";
+  "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
+  "bamse" = dontDistribute super."bamse";
+  "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
+  "banwords" = dontDistribute super."banwords";
+  "barchart" = dontDistribute super."barchart";
+  "barcodes-code128" = dontDistribute super."barcodes-code128";
+  "barecheck" = dontDistribute super."barecheck";
+  "barley" = dontDistribute super."barley";
+  "barrie" = dontDistribute super."barrie";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "benchmark-function" = dontDistribute super."benchmark-function";
+  "bencoding" = dontDistribute super."bencoding";
+  "berkeleydb" = dontDistribute super."berkeleydb";
+  "berp" = dontDistribute super."berp";
+  "bert" = dontDistribute super."bert";
+  "besout" = dontDistribute super."besout";
+  "bet" = dontDistribute super."bet";
+  "betacode" = dontDistribute super."betacode";
+  "between" = dontDistribute super."between";
+  "bf-cata" = dontDistribute super."bf-cata";
+  "bff" = dontDistribute super."bff";
+  "bff-mono" = dontDistribute super."bff-mono";
+  "bgmax" = dontDistribute super."bgmax";
+  "bgzf" = dontDistribute super."bgzf";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
+  "billboard-parser" = dontDistribute super."billboard-parser";
+  "billeksah-forms" = dontDistribute super."billeksah-forms";
+  "billeksah-main" = dontDistribute super."billeksah-main";
+  "billeksah-main-static" = dontDistribute super."billeksah-main-static";
+  "billeksah-pane" = dontDistribute super."billeksah-pane";
+  "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-bits" = dontDistribute super."binary-bits";
+  "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-derive" = dontDistribute super."binary-derive";
+  "binary-enum" = dontDistribute super."binary-enum";
+  "binary-file" = dontDistribute super."binary-file";
+  "binary-generic" = dontDistribute super."binary-generic";
+  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
+  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-protocol" = dontDistribute super."binary-protocol";
+  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-shared" = dontDistribute super."binary-shared";
+  "binary-state" = dontDistribute super."binary-state";
+  "binary-store" = dontDistribute super."binary-store";
+  "binary-streams" = dontDistribute super."binary-streams";
+  "binary-strict" = dontDistribute super."binary-strict";
+  "binarydefer" = dontDistribute super."binarydefer";
+  "bind-marshal" = dontDistribute super."bind-marshal";
+  "binding-core" = dontDistribute super."binding-core";
+  "binding-gtk" = dontDistribute super."binding-gtk";
+  "binding-wx" = dontDistribute super."binding-wx";
+  "bindings" = dontDistribute super."bindings";
+  "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-K8055" = dontDistribute super."bindings-K8055";
+  "bindings-apr" = dontDistribute super."bindings-apr";
+  "bindings-apr-util" = dontDistribute super."bindings-apr-util";
+  "bindings-audiofile" = dontDistribute super."bindings-audiofile";
+  "bindings-bfd" = dontDistribute super."bindings-bfd";
+  "bindings-cctools" = dontDistribute super."bindings-cctools";
+  "bindings-codec2" = dontDistribute super."bindings-codec2";
+  "bindings-common" = dontDistribute super."bindings-common";
+  "bindings-dc1394" = dontDistribute super."bindings-dc1394";
+  "bindings-directfb" = dontDistribute super."bindings-directfb";
+  "bindings-eskit" = dontDistribute super."bindings-eskit";
+  "bindings-fann" = dontDistribute super."bindings-fann";
+  "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth";
+  "bindings-friso" = dontDistribute super."bindings-friso";
+  "bindings-glib" = dontDistribute super."bindings-glib";
+  "bindings-gobject" = dontDistribute super."bindings-gobject";
+  "bindings-gpgme" = dontDistribute super."bindings-gpgme";
+  "bindings-gsl" = dontDistribute super."bindings-gsl";
+  "bindings-gts" = dontDistribute super."bindings-gts";
+  "bindings-hamlib" = dontDistribute super."bindings-hamlib";
+  "bindings-hdf5" = dontDistribute super."bindings-hdf5";
+  "bindings-levmar" = dontDistribute super."bindings-levmar";
+  "bindings-libcddb" = dontDistribute super."bindings-libcddb";
+  "bindings-libffi" = dontDistribute super."bindings-libffi";
+  "bindings-libftdi" = dontDistribute super."bindings-libftdi";
+  "bindings-librrd" = dontDistribute super."bindings-librrd";
+  "bindings-libstemmer" = dontDistribute super."bindings-libstemmer";
+  "bindings-libusb" = dontDistribute super."bindings-libusb";
+  "bindings-libv4l2" = dontDistribute super."bindings-libv4l2";
+  "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2";
+  "bindings-lxc" = dontDistribute super."bindings-lxc";
+  "bindings-mmap" = dontDistribute super."bindings-mmap";
+  "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal";
+  "bindings-nettle" = dontDistribute super."bindings-nettle";
+  "bindings-parport" = dontDistribute super."bindings-parport";
+  "bindings-portaudio" = dontDistribute super."bindings-portaudio";
+  "bindings-potrace" = dontDistribute super."bindings-potrace";
+  "bindings-ppdev" = dontDistribute super."bindings-ppdev";
+  "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd";
+  "bindings-sane" = dontDistribute super."bindings-sane";
+  "bindings-sc3" = dontDistribute super."bindings-sc3";
+  "bindings-sipc" = dontDistribute super."bindings-sipc";
+  "bindings-sophia" = dontDistribute super."bindings-sophia";
+  "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
+  "bindings-svm" = dontDistribute super."bindings-svm";
+  "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-yices" = dontDistribute super."bindings-yices";
+  "bindynamic" = dontDistribute super."bindynamic";
+  "binembed" = dontDistribute super."binembed";
+  "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
+  "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biosff" = dontDistribute super."biosff";
+  "biostockholm" = dontDistribute super."biostockholm";
+  "bird" = dontDistribute super."bird";
+  "bit-array" = dontDistribute super."bit-array";
+  "bit-vector" = dontDistribute super."bit-vector";
+  "bitarray" = dontDistribute super."bitarray";
+  "bitcoin-rpc" = dontDistribute super."bitcoin-rpc";
+  "bitly-cli" = dontDistribute super."bitly-cli";
+  "bitmap" = dontDistribute super."bitmap";
+  "bitmap-opengl" = dontDistribute super."bitmap-opengl";
+  "bitmaps" = dontDistribute super."bitmaps";
+  "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-conduit" = dontDistribute super."bits-conduit";
+  "bits-extras" = dontDistribute super."bits-extras";
+  "bitset" = dontDistribute super."bitset";
+  "bitspeak" = dontDistribute super."bitspeak";
+  "bitstream" = dontDistribute super."bitstream";
+  "bitstring" = dontDistribute super."bitstring";
+  "bittorrent" = dontDistribute super."bittorrent";
+  "bitvec" = dontDistribute super."bitvec";
+  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
+  "bk-tree" = dontDistribute super."bk-tree";
+  "bkr" = dontDistribute super."bkr";
+  "bktrees" = dontDistribute super."bktrees";
+  "bla" = dontDistribute super."bla";
+  "black-jewel" = dontDistribute super."black-jewel";
+  "blacktip" = dontDistribute super."blacktip";
+  "blakesum" = dontDistribute super."blakesum";
+  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blas" = dontDistribute super."blas";
+  "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
+  "blaze-from-html" = dontDistribute super."blaze-from-html";
+  "blaze-html-contrib" = dontDistribute super."blaze-html-contrib";
+  "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat";
+  "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
+  "blaze-json" = dontDistribute super."blaze-json";
+  "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-textual-native" = dontDistribute super."blaze-textual-native";
+  "blazeMarker" = dontDistribute super."blazeMarker";
+  "blink1" = dontDistribute super."blink1";
+  "blip" = dontDistribute super."blip";
+  "bliplib" = dontDistribute super."bliplib";
+  "blocking-transactions" = dontDistribute super."blocking-transactions";
+  "blogination" = dontDistribute super."blogination";
+  "bloodhound" = dontDistribute super."bloodhound";
+  "bloxorz" = dontDistribute super."bloxorz";
+  "blubber" = dontDistribute super."blubber";
+  "blubber-server" = dontDistribute super."blubber-server";
+  "bluetile" = dontDistribute super."bluetile";
+  "bluetileutils" = dontDistribute super."bluetileutils";
+  "blunt" = dontDistribute super."blunt";
+  "board-games" = dontDistribute super."board-games";
+  "bogre-banana" = dontDistribute super."bogre-banana";
+  "bond" = dontDistribute super."bond";
+  "boolean-list" = dontDistribute super."boolean-list";
+  "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
+  "boolexpr" = dontDistribute super."boolexpr";
+  "bools" = dontDistribute super."bools";
+  "boolsimplifier" = dontDistribute super."boolsimplifier";
+  "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "botpp" = dontDistribute super."botpp";
+  "bound-gen" = dontDistribute super."bound-gen";
+  "bounded-tchan" = dontDistribute super."bounded-tchan";
+  "boundingboxes" = dontDistribute super."boundingboxes";
+  "bowntz" = dontDistribute super."bowntz";
+  "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
+  "brainfuck" = dontDistribute super."brainfuck";
+  "brainfuck-monad" = dontDistribute super."brainfuck-monad";
+  "brainfuck-tut" = dontDistribute super."brainfuck-tut";
+  "break" = dontDistribute super."break";
+  "breakout" = dontDistribute super."breakout";
+  "breve" = dontDistribute super."breve";
+  "brians-brain" = dontDistribute super."brians-brain";
+  "brillig" = dontDistribute super."brillig";
+  "broccoli" = dontDistribute super."broccoli";
+  "broker-haskell" = dontDistribute super."broker-haskell";
+  "bsd-sysctl" = dontDistribute super."bsd-sysctl";
+  "bson-generic" = dontDistribute super."bson-generic";
+  "bson-generics" = dontDistribute super."bson-generics";
+  "bson-mapping" = dontDistribute super."bson-mapping";
+  "bspack" = dontDistribute super."bspack";
+  "bsparse" = dontDistribute super."bsparse";
+  "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
+  "buffon" = dontDistribute super."buffon";
+  "bugzilla" = dontDistribute super."bugzilla";
+  "buildable" = dontDistribute super."buildable";
+  "buildbox" = dontDistribute super."buildbox";
+  "buildbox-tools" = dontDistribute super."buildbox-tools";
+  "buildwrapper" = dontDistribute super."buildwrapper";
+  "bullet" = dontDistribute super."bullet";
+  "burst-detection" = dontDistribute super."burst-detection";
+  "bus-pirate" = dontDistribute super."bus-pirate";
+  "buster" = dontDistribute super."buster";
+  "buster-gtk" = dontDistribute super."buster-gtk";
+  "buster-network" = dontDistribute super."buster-network";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
+  "bytestring-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-nums" = dontDistribute super."bytestring-nums";
+  "bytestring-plain" = dontDistribute super."bytestring-plain";
+  "bytestring-rematch" = dontDistribute super."bytestring-rematch";
+  "bytestring-short" = dontDistribute super."bytestring-short";
+  "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "c-dsl" = dontDistribute super."c-dsl";
+  "c-io" = dontDistribute super."c-io";
+  "c-storable-deriving" = dontDistribute super."c-storable-deriving";
+  "c0check" = dontDistribute super."c0check";
+  "c0parser" = dontDistribute super."c0parser";
+  "c10k" = dontDistribute super."c10k";
+  "c2hsc" = dontDistribute super."c2hsc";
+  "cab" = dontDistribute super."cab";
+  "cabal-audit" = dontDistribute super."cabal-audit";
+  "cabal-bounds" = dontDistribute super."cabal-bounds";
+  "cabal-cargs" = dontDistribute super."cabal-cargs";
+  "cabal-constraints" = dontDistribute super."cabal-constraints";
+  "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "cabal-dev" = dontDistribute super."cabal-dev";
+  "cabal-dir" = dontDistribute super."cabal-dir";
+  "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
+  "cabal-ghci" = dontDistribute super."cabal-ghci";
+  "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
+  "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
+  "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
+  "cabal-lenses" = dontDistribute super."cabal-lenses";
+  "cabal-macosx" = dontDistribute super."cabal-macosx";
+  "cabal-meta" = dontDistribute super."cabal-meta";
+  "cabal-mon" = dontDistribute super."cabal-mon";
+  "cabal-nirvana" = dontDistribute super."cabal-nirvana";
+  "cabal-progdeps" = dontDistribute super."cabal-progdeps";
+  "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-scripts" = dontDistribute super."cabal-scripts";
+  "cabal-setup" = dontDistribute super."cabal-setup";
+  "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-test" = dontDistribute super."cabal-test";
+  "cabal-test-bin" = dontDistribute super."cabal-test-bin";
+  "cabal-test-compat" = dontDistribute super."cabal-test-compat";
+  "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck";
+  "cabal-uninstall" = dontDistribute super."cabal-uninstall";
+  "cabal-upload" = dontDistribute super."cabal-upload";
+  "cabal2arch" = dontDistribute super."cabal2arch";
+  "cabal2doap" = dontDistribute super."cabal2doap";
+  "cabal2ebuild" = dontDistribute super."cabal2ebuild";
+  "cabal2ghci" = dontDistribute super."cabal2ghci";
+  "cabal2nix" = dontDistribute super."cabal2nix";
+  "cabal2spec" = dontDistribute super."cabal2spec";
+  "cabalQuery" = dontDistribute super."cabalQuery";
+  "cabalg" = dontDistribute super."cabalg";
+  "cabalgraph" = dontDistribute super."cabalgraph";
+  "cabalmdvrpm" = dontDistribute super."cabalmdvrpm";
+  "cabalrpmdeps" = dontDistribute super."cabalrpmdeps";
+  "cabalvchk" = dontDistribute super."cabalvchk";
+  "cabin" = dontDistribute super."cabin";
+  "cabocha" = dontDistribute super."cabocha";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "cairo-appbase" = dontDistribute super."cairo-appbase";
+  "cake" = dontDistribute super."cake";
+  "cake3" = dontDistribute super."cake3";
+  "cakyrespa" = dontDistribute super."cakyrespa";
+  "cal3d" = dontDistribute super."cal3d";
+  "cal3d-examples" = dontDistribute super."cal3d-examples";
+  "cal3d-opengl" = dontDistribute super."cal3d-opengl";
+  "calc" = dontDistribute super."calc";
+  "caldims" = dontDistribute super."caldims";
+  "caledon" = dontDistribute super."caledon";
+  "call" = dontDistribute super."call";
+  "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything";
+  "camh" = dontDistribute super."camh";
+  "campfire" = dontDistribute super."campfire";
+  "canonical-filepath" = dontDistribute super."canonical-filepath";
+  "canteven-config" = dontDistribute super."canteven-config";
+  "canteven-listen-http" = dontDistribute super."canteven-listen-http";
+  "canteven-log" = dontDistribute super."canteven-log";
+  "canteven-template" = dontDistribute super."canteven-template";
+  "cantor" = dontDistribute super."cantor";
+  "cao" = dontDistribute super."cao";
+  "cap" = dontDistribute super."cap";
+  "capped-list" = dontDistribute super."capped-list";
+  "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
+  "caramia" = dontDistribute super."caramia";
+  "carboncopy" = dontDistribute super."carboncopy";
+  "carettah" = dontDistribute super."carettah";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
+  "casadi-bindings" = dontDistribute super."casadi-bindings";
+  "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
+  "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
+  "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal";
+  "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface";
+  "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
+  "cascading" = dontDistribute super."cascading";
+  "case-conversion" = dontDistribute super."case-conversion";
+  "cash" = dontDistribute super."cash";
+  "casing" = dontDistribute super."casing";
+  "cassandra-cql" = dontDistribute super."cassandra-cql";
+  "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava-conduit" = dontDistribute super."cassava-conduit";
+  "cassava-streams" = dontDistribute super."cassava-streams";
+  "cassette" = dontDistribute super."cassette";
+  "cassy" = dontDistribute super."cassy";
+  "castle" = dontDistribute super."castle";
+  "casui" = dontDistribute super."casui";
+  "catamorphism" = dontDistribute super."catamorphism";
+  "catch-fd" = dontDistribute super."catch-fd";
+  "categorical-algebra" = dontDistribute super."categorical-algebra";
+  "categories" = dontDistribute super."categories";
+  "category-extras" = dontDistribute super."category-extras";
+  "cayley-dickson" = dontDistribute super."cayley-dickson";
+  "cblrepo" = dontDistribute super."cblrepo";
+  "cci" = dontDistribute super."cci";
+  "ccnx" = dontDistribute super."ccnx";
+  "cctools-workqueue" = dontDistribute super."cctools-workqueue";
+  "cedict" = dontDistribute super."cedict";
+  "cef" = dontDistribute super."cef";
+  "ceilometer-common" = dontDistribute super."ceilometer-common";
+  "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
+  "cerberus" = dontDistribute super."cerberus";
+  "cereal-derive" = dontDistribute super."cereal-derive";
+  "cereal-enumerator" = dontDistribute super."cereal-enumerator";
+  "cereal-ieee754" = dontDistribute super."cereal-ieee754";
+  "cereal-plus" = dontDistribute super."cereal-plus";
+  "cereal-text" = dontDistribute super."cereal-text";
+  "certificate" = dontDistribute super."certificate";
+  "cf" = dontDistribute super."cf";
+  "cfipu" = dontDistribute super."cfipu";
+  "cflp" = dontDistribute super."cflp";
+  "cfopu" = dontDistribute super."cfopu";
+  "cg" = dontDistribute super."cg";
+  "cgen" = dontDistribute super."cgen";
+  "cgi-undecidable" = dontDistribute super."cgi-undecidable";
+  "cgi-utils" = dontDistribute super."cgi-utils";
+  "cgrep" = dontDistribute super."cgrep";
+  "chain-codes" = dontDistribute super."chain-codes";
+  "chalk" = dontDistribute super."chalk";
+  "chalkboard" = dontDistribute super."chalkboard";
+  "chalkboard-viewer" = dontDistribute super."chalkboard-viewer";
+  "chalmers-lava2000" = dontDistribute super."chalmers-lava2000";
+  "chan-split" = dontDistribute super."chan-split";
+  "change-monger" = dontDistribute super."change-monger";
+  "charade" = dontDistribute super."charade";
+  "charsetdetect" = dontDistribute super."charsetdetect";
+  "chart-histogram" = dontDistribute super."chart-histogram";
+  "chaselev-deque" = dontDistribute super."chaselev-deque";
+  "chatter" = dontDistribute super."chatter";
+  "chatty" = dontDistribute super."chatty";
+  "chatty-text" = dontDistribute super."chatty-text";
+  "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
+  "check-pvp" = dontDistribute super."check-pvp";
+  "checked" = dontDistribute super."checked";
+  "chell-hunit" = dontDistribute super."chell-hunit";
+  "chesshs" = dontDistribute super."chesshs";
+  "chevalier-common" = dontDistribute super."chevalier-common";
+  "chp" = dontDistribute super."chp";
+  "chp-mtl" = dontDistribute super."chp-mtl";
+  "chp-plus" = dontDistribute super."chp-plus";
+  "chp-spec" = dontDistribute super."chp-spec";
+  "chp-transformers" = dontDistribute super."chp-transformers";
+  "chronograph" = dontDistribute super."chronograph";
+  "chu2" = dontDistribute super."chu2";
+  "chuchu" = dontDistribute super."chuchu";
+  "chunks" = dontDistribute super."chunks";
+  "chunky" = dontDistribute super."chunky";
+  "church-list" = dontDistribute super."church-list";
+  "cil" = dontDistribute super."cil";
+  "cinvoke" = dontDistribute super."cinvoke";
+  "cio" = dontDistribute super."cio";
+  "cipher-rc5" = dontDistribute super."cipher-rc5";
+  "ciphersaber2" = dontDistribute super."ciphersaber2";
+  "circ" = dontDistribute super."circ";
+  "cirru-parser" = dontDistribute super."cirru-parser";
+  "citation-resolve" = dontDistribute super."citation-resolve";
+  "citeproc-hs" = dontDistribute super."citeproc-hs";
+  "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter";
+  "cityhash" = dontDistribute super."cityhash";
+  "cjk" = dontDistribute super."cjk";
+  "clac" = dontDistribute super."clac";
+  "clafer" = dontDistribute super."clafer";
+  "claferIG" = dontDistribute super."claferIG";
+  "claferwiki" = dontDistribute super."claferwiki";
+  "clang-pure" = dontDistribute super."clang-pure";
+  "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
+  "clash" = dontDistribute super."clash";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
+  "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
+  "cld2" = dontDistribute super."cld2";
+  "clean-home" = dontDistribute super."clean-home";
+  "clean-unions" = dontDistribute super."clean-unions";
+  "cless" = dontDistribute super."cless";
+  "clevercss" = dontDistribute super."clevercss";
+  "cli" = dontDistribute super."cli";
+  "click-clack" = dontDistribute super."click-clack";
+  "clifford" = dontDistribute super."clifford";
+  "clippard" = dontDistribute super."clippard";
+  "clipper" = dontDistribute super."clipper";
+  "clippings" = dontDistribute super."clippings";
+  "clist" = dontDistribute super."clist";
+  "clocked" = dontDistribute super."clocked";
+  "clogparse" = dontDistribute super."clogparse";
+  "clone-all" = dontDistribute super."clone-all";
+  "closure" = dontDistribute super."closure";
+  "cloud-haskell" = dontDistribute super."cloud-haskell";
+  "cloudfront-signer" = dontDistribute super."cloudfront-signer";
+  "cloudyfs" = dontDistribute super."cloudyfs";
+  "cltw" = dontDistribute super."cltw";
+  "clua" = dontDistribute super."clua";
+  "cluss" = dontDistribute super."cluss";
+  "clustertools" = dontDistribute super."clustertools";
+  "clutterhs" = dontDistribute super."clutterhs";
+  "cmaes" = dontDistribute super."cmaes";
+  "cmath" = dontDistribute super."cmath";
+  "cmathml3" = dontDistribute super."cmathml3";
+  "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "cmu" = dontDistribute super."cmu";
+  "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
+  "cndict" = dontDistribute super."cndict";
+  "codec" = dontDistribute super."codec";
+  "codec-libevent" = dontDistribute super."codec-libevent";
+  "codec-mbox" = dontDistribute super."codec-mbox";
+  "codecov-haskell" = dontDistribute super."codecov-haskell";
+  "codemonitor" = dontDistribute super."codemonitor";
+  "codepad" = dontDistribute super."codepad";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "coinbase-exchange" = dontDistribute super."coinbase-exchange";
+  "colada" = dontDistribute super."colada";
+  "colchis" = dontDistribute super."colchis";
+  "collada-output" = dontDistribute super."collada-output";
+  "collada-types" = dontDistribute super."collada-types";
+  "collapse-util" = dontDistribute super."collapse-util";
+  "collection-json" = dontDistribute super."collection-json";
+  "collections" = dontDistribute super."collections";
+  "collections-api" = dontDistribute super."collections-api";
+  "collections-base-instances" = dontDistribute super."collections-base-instances";
+  "colock" = dontDistribute super."colock";
+  "colorize-haskell" = dontDistribute super."colorize-haskell";
+  "colors" = dontDistribute super."colors";
+  "coltrane" = dontDistribute super."coltrane";
+  "com" = dontDistribute super."com";
+  "combinat" = dontDistribute super."combinat";
+  "combinat-diagrams" = dontDistribute super."combinat-diagrams";
+  "combinator-interactive" = dontDistribute super."combinator-interactive";
+  "combinatorial-problems" = dontDistribute super."combinatorial-problems";
+  "combinatorics" = dontDistribute super."combinatorics";
+  "combobuffer" = dontDistribute super."combobuffer";
+  "comfort-graph" = dontDistribute super."comfort-graph";
+  "command" = dontDistribute super."command";
+  "command-qq" = dontDistribute super."command-qq";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "comonad-extras" = dontDistribute super."comonad-extras";
+  "comonad-random" = dontDistribute super."comonad-random";
+  "compact-map" = dontDistribute super."compact-map";
+  "compact-socket" = dontDistribute super."compact-socket";
+  "compact-string" = dontDistribute super."compact-string";
+  "compact-string-fix" = dontDistribute super."compact-string-fix";
+  "compare-type" = dontDistribute super."compare-type";
+  "compdata-automata" = dontDistribute super."compdata-automata";
+  "compdata-dags" = dontDistribute super."compdata-dags";
+  "compdata-param" = dontDistribute super."compdata-param";
+  "compensated" = dontDistribute super."compensated";
+  "competition" = dontDistribute super."competition";
+  "compilation" = dontDistribute super."compilation";
+  "complex-generic" = dontDistribute super."complex-generic";
+  "complex-integrate" = dontDistribute super."complex-integrate";
+  "complexity" = dontDistribute super."complexity";
+  "compose-ltr" = dontDistribute super."compose-ltr";
+  "compose-trans" = dontDistribute super."compose-trans";
+  "compression" = dontDistribute super."compression";
+  "compstrat" = dontDistribute super."compstrat";
+  "comptrans" = dontDistribute super."comptrans";
+  "computational-algebra" = dontDistribute super."computational-algebra";
+  "computations" = dontDistribute super."computations";
+  "conceit" = dontDistribute super."conceit";
+  "concorde" = dontDistribute super."concorde";
+  "concraft" = dontDistribute super."concraft";
+  "concraft-hr" = dontDistribute super."concraft-hr";
+  "concraft-pl" = dontDistribute super."concraft-pl";
+  "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser";
+  "concrete-typerep" = dontDistribute super."concrete-typerep";
+  "concurrent-barrier" = dontDistribute super."concurrent-barrier";
+  "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
+  "concurrent-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-sa" = dontDistribute super."concurrent-sa";
+  "concurrent-split" = dontDistribute super."concurrent-split";
+  "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-utilities" = dontDistribute super."concurrent-utilities";
+  "concurrentoutput" = dontDistribute super."concurrentoutput";
+  "cond" = dontDistribute super."cond";
+  "condor" = dontDistribute super."condor";
+  "condorcet" = dontDistribute super."condorcet";
+  "conductive-base" = dontDistribute super."conductive-base";
+  "conductive-clock" = dontDistribute super."conductive-clock";
+  "conductive-hsc3" = dontDistribute super."conductive-hsc3";
+  "conductive-song" = dontDistribute super."conductive-song";
+  "conduit-audio" = dontDistribute super."conduit-audio";
+  "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
+  "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
+  "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
+  "conf" = dontDistribute super."conf";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "confsolve" = dontDistribute super."confsolve";
+  "congruence-relation" = dontDistribute super."congruence-relation";
+  "conjugateGradient" = dontDistribute super."conjugateGradient";
+  "conjure" = dontDistribute super."conjure";
+  "conlogger" = dontDistribute super."conlogger";
+  "connection-pool" = dontDistribute super."connection-pool";
+  "consistent" = dontDistribute super."consistent";
+  "console-program" = dontDistribute super."console-program";
+  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
+  "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "container-classes" = dontDistribute super."container-classes";
+  "containers-benchmark" = dontDistribute super."containers-benchmark";
+  "containers-deepseq" = dontDistribute super."containers-deepseq";
+  "context-free-grammar" = dontDistribute super."context-free-grammar";
+  "context-stack" = dontDistribute super."context-stack";
+  "continue" = dontDistribute super."continue";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "continuum" = dontDistribute super."continuum";
+  "continuum-client" = dontDistribute super."continuum-client";
+  "control-event" = dontDistribute super."control-event";
+  "control-monad-attempt" = dontDistribute super."control-monad-attempt";
+  "control-monad-exception" = dontDistribute super."control-monad-exception";
+  "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd";
+  "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf";
+  "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl";
+  "control-monad-failure" = dontDistribute super."control-monad-failure";
+  "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl";
+  "control-monad-omega" = dontDistribute super."control-monad-omega";
+  "control-monad-queue" = dontDistribute super."control-monad-queue";
+  "control-timeout" = dontDistribute super."control-timeout";
+  "contstuff" = dontDistribute super."contstuff";
+  "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf";
+  "contstuff-transformers" = dontDistribute super."contstuff-transformers";
+  "converge" = dontDistribute super."converge";
+  "conversion" = dontDistribute super."conversion";
+  "conversion-bytestring" = dontDistribute super."conversion-bytestring";
+  "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive";
+  "conversion-text" = dontDistribute super."conversion-text";
+  "convert" = dontDistribute super."convert";
+  "convertible-ascii" = dontDistribute super."convertible-ascii";
+  "convertible-text" = dontDistribute super."convertible-text";
+  "cookbook" = dontDistribute super."cookbook";
+  "coordinate" = dontDistribute super."coordinate";
+  "copilot" = dontDistribute super."copilot";
+  "copilot-c99" = dontDistribute super."copilot-c99";
+  "copilot-cbmc" = dontDistribute super."copilot-cbmc";
+  "copilot-core" = dontDistribute super."copilot-core";
+  "copilot-language" = dontDistribute super."copilot-language";
+  "copilot-libraries" = dontDistribute super."copilot-libraries";
+  "copilot-sbv" = dontDistribute super."copilot-sbv";
+  "copilot-theorem" = dontDistribute super."copilot-theorem";
+  "copr" = dontDistribute super."copr";
+  "core" = dontDistribute super."core";
+  "core-haskell" = dontDistribute super."core-haskell";
+  "corebot-bliki" = dontDistribute super."corebot-bliki";
+  "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
+  "coroutine-iteratee" = dontDistribute super."coroutine-iteratee";
+  "coroutine-object" = dontDistribute super."coroutine-object";
+  "couch-hs" = dontDistribute super."couch-hs";
+  "couch-simple" = dontDistribute super."couch-simple";
+  "couchdb-conduit" = dontDistribute super."couchdb-conduit";
+  "couchdb-enumerator" = dontDistribute super."couchdb-enumerator";
+  "count" = dontDistribute super."count";
+  "countable" = dontDistribute super."countable";
+  "counter" = dontDistribute super."counter";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "cplusplus-th" = dontDistribute super."cplusplus-th";
+  "cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
+  "cpsa" = dontDistribute super."cpsa";
+  "cpuid" = dontDistribute super."cpuid";
+  "cpuperf" = dontDistribute super."cpuperf";
+  "cpython" = dontDistribute super."cpython";
+  "cqrs" = dontDistribute super."cqrs";
+  "cqrs-core" = dontDistribute super."cqrs-core";
+  "cqrs-example" = dontDistribute super."cqrs-example";
+  "cqrs-memory" = dontDistribute super."cqrs-memory";
+  "cqrs-postgresql" = dontDistribute super."cqrs-postgresql";
+  "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3";
+  "cqrs-test" = dontDistribute super."cqrs-test";
+  "cqrs-testkit" = dontDistribute super."cqrs-testkit";
+  "cqrs-types" = dontDistribute super."cqrs-types";
+  "cr" = dontDistribute super."cr";
+  "crack" = dontDistribute super."crack";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "crc16" = dontDistribute super."crc16";
+  "crc16-table" = dontDistribute super."crc16-table";
+  "creatur" = dontDistribute super."creatur";
+  "crf-chain1" = dontDistribute super."crf-chain1";
+  "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained";
+  "crf-chain2-generic" = dontDistribute super."crf-chain2-generic";
+  "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers";
+  "critbit" = dontDistribute super."critbit";
+  "criterion-plus" = dontDistribute super."criterion-plus";
+  "criterion-to-html" = dontDistribute super."criterion-to-html";
+  "crockford" = dontDistribute super."crockford";
+  "crocodile" = dontDistribute super."crocodile";
+  "cron-compat" = dontDistribute super."cron-compat";
+  "cruncher-types" = dontDistribute super."cruncher-types";
+  "crunghc" = dontDistribute super."crunghc";
+  "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks";
+  "crypto-classical" = dontDistribute super."crypto-classical";
+  "crypto-conduit" = dontDistribute super."crypto-conduit";
+  "crypto-enigma" = dontDistribute super."crypto-enigma";
+  "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
+  "crypto-random-effect" = dontDistribute super."crypto-random-effect";
+  "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptsy-api" = dontDistribute super."cryptsy-api";
+  "crystalfontz" = dontDistribute super."crystalfontz";
+  "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
+  "csound-catalog" = dontDistribute super."csound-catalog";
+  "csound-expression" = dontDistribute super."csound-expression";
+  "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic";
+  "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes";
+  "csound-expression-typed" = dontDistribute super."csound-expression-typed";
+  "csound-sampler" = dontDistribute super."csound-sampler";
+  "csp" = dontDistribute super."csp";
+  "cspmchecker" = dontDistribute super."cspmchecker";
+  "css" = dontDistribute super."css";
+  "csv-enumerator" = dontDistribute super."csv-enumerator";
+  "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-to-qif" = dontDistribute super."csv-to-qif";
+  "ctemplate" = dontDistribute super."ctemplate";
+  "ctkl" = dontDistribute super."ctkl";
+  "ctpl" = dontDistribute super."ctpl";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cublas" = dontDistribute super."cublas";
+  "cuboid" = dontDistribute super."cuboid";
+  "cuda" = dontDistribute super."cuda";
+  "cudd" = dontDistribute super."cudd";
+  "cufft" = dontDistribute super."cufft";
+  "curl-aeson" = dontDistribute super."curl-aeson";
+  "curlhs" = dontDistribute super."curlhs";
+  "currency" = dontDistribute super."currency";
+  "current-locale" = dontDistribute super."current-locale";
+  "curry-base" = dontDistribute super."curry-base";
+  "curry-frontend" = dontDistribute super."curry-frontend";
+  "cursedcsv" = dontDistribute super."cursedcsv";
+  "curve25519" = dontDistribute super."curve25519";
+  "curves" = dontDistribute super."curves";
+  "custom-prelude" = dontDistribute super."custom-prelude";
+  "cv-combinators" = dontDistribute super."cv-combinators";
+  "cyclotomic" = dontDistribute super."cyclotomic";
+  "cypher" = dontDistribute super."cypher";
+  "d-bus" = dontDistribute super."d-bus";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs-benchmark" = dontDistribute super."darcs-benchmark";
+  "darcs-beta" = dontDistribute super."darcs-beta";
+  "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
+  "darcs-cabalized" = dontDistribute super."darcs-cabalized";
+  "darcs-fastconvert" = dontDistribute super."darcs-fastconvert";
+  "darcs-graph" = dontDistribute super."darcs-graph";
+  "darcs-monitor" = dontDistribute super."darcs-monitor";
+  "darcs-scripts" = dontDistribute super."darcs-scripts";
+  "darcs2dot" = dontDistribute super."darcs2dot";
+  "darcsden" = dontDistribute super."darcsden";
+  "darcswatch" = dontDistribute super."darcswatch";
+  "darkplaces-demo" = dontDistribute super."darkplaces-demo";
+  "darkplaces-rcon" = dontDistribute super."darkplaces-rcon";
+  "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
+  "darkplaces-text" = dontDistribute super."darkplaces-text";
+  "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
+  "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
+  "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
+  "data-accessor-template" = dontDistribute super."data-accessor-template";
+  "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
+  "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
+  "data-bword" = dontDistribute super."data-bword";
+  "data-carousel" = dontDistribute super."data-carousel";
+  "data-category" = dontDistribute super."data-category";
+  "data-cell" = dontDistribute super."data-cell";
+  "data-checked" = dontDistribute super."data-checked";
+  "data-clist" = dontDistribute super."data-clist";
+  "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
+  "data-construction" = dontDistribute super."data-construction";
+  "data-cycle" = dontDistribute super."data-cycle";
+  "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
+  "data-dispersal" = dontDistribute super."data-dispersal";
+  "data-dword" = dontDistribute super."data-dword";
+  "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
+  "data-endian" = dontDistribute super."data-endian";
+  "data-extend-generic" = dontDistribute super."data-extend-generic";
+  "data-extra" = dontDistribute super."data-extra";
+  "data-filepath" = dontDistribute super."data-filepath";
+  "data-fin" = dontDistribute super."data-fin";
+  "data-fin-simple" = dontDistribute super."data-fin-simple";
+  "data-fix" = dontDistribute super."data-fix";
+  "data-fix-cse" = dontDistribute super."data-fix-cse";
+  "data-flags" = dontDistribute super."data-flags";
+  "data-flagset" = dontDistribute super."data-flagset";
+  "data-fresh" = dontDistribute super."data-fresh";
+  "data-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
+  "data-kiln" = dontDistribute super."data-kiln";
+  "data-layer" = dontDistribute super."data-layer";
+  "data-layout" = dontDistribute super."data-layout";
+  "data-lens" = dontDistribute super."data-lens";
+  "data-lens-fd" = dontDistribute super."data-lens-fd";
+  "data-lens-ixset" = dontDistribute super."data-lens-ixset";
+  "data-lens-template" = dontDistribute super."data-lens-template";
+  "data-list-sequences" = dontDistribute super."data-list-sequences";
+  "data-map-multikey" = dontDistribute super."data-map-multikey";
+  "data-named" = dontDistribute super."data-named";
+  "data-nat" = dontDistribute super."data-nat";
+  "data-object" = dontDistribute super."data-object";
+  "data-object-json" = dontDistribute super."data-object-json";
+  "data-object-yaml" = dontDistribute super."data-object-yaml";
+  "data-or" = dontDistribute super."data-or";
+  "data-partition" = dontDistribute super."data-partition";
+  "data-pprint" = dontDistribute super."data-pprint";
+  "data-quotientref" = dontDistribute super."data-quotientref";
+  "data-r-tree" = dontDistribute super."data-r-tree";
+  "data-ref" = dontDistribute super."data-ref";
+  "data-reify-cse" = dontDistribute super."data-reify-cse";
+  "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
+  "data-rev" = dontDistribute super."data-rev";
+  "data-rope" = dontDistribute super."data-rope";
+  "data-rtuple" = dontDistribute super."data-rtuple";
+  "data-size" = dontDistribute super."data-size";
+  "data-spacepart" = dontDistribute super."data-spacepart";
+  "data-store" = dontDistribute super."data-store";
+  "data-stringmap" = dontDistribute super."data-stringmap";
+  "data-structure-inferrer" = dontDistribute super."data-structure-inferrer";
+  "data-tensor" = dontDistribute super."data-tensor";
+  "data-textual" = dontDistribute super."data-textual";
+  "data-timeout" = dontDistribute super."data-timeout";
+  "data-transform" = dontDistribute super."data-transform";
+  "data-treify" = dontDistribute super."data-treify";
+  "data-type" = dontDistribute super."data-type";
+  "data-util" = dontDistribute super."data-util";
+  "data-variant" = dontDistribute super."data-variant";
+  "database-migrate" = dontDistribute super."database-migrate";
+  "database-study" = dontDistribute super."database-study";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "date-cache" = dontDistribute super."date-cache";
+  "dates" = dontDistribute super."dates";
+  "datetime" = dontDistribute super."datetime";
+  "datetime-sb" = dontDistribute super."datetime-sb";
+  "dawdle" = dontDistribute super."dawdle";
+  "dawg" = dontDistribute super."dawg";
+  "dbcleaner" = dontDistribute super."dbcleaner";
+  "dbf" = dontDistribute super."dbf";
+  "dbjava" = dontDistribute super."dbjava";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "dclabel" = dontDistribute super."dclabel";
+  "dclabel-eci11" = dontDistribute super."dclabel-eci11";
+  "ddc-base" = dontDistribute super."ddc-base";
+  "ddc-build" = dontDistribute super."ddc-build";
+  "ddc-code" = dontDistribute super."ddc-code";
+  "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-eval" = dontDistribute super."ddc-core-eval";
+  "ddc-core-flow" = dontDistribute super."ddc-core-flow";
+  "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
+  "ddc-core-salt" = dontDistribute super."ddc-core-salt";
+  "ddc-core-simpl" = dontDistribute super."ddc-core-simpl";
+  "ddc-core-tetra" = dontDistribute super."ddc-core-tetra";
+  "ddc-driver" = dontDistribute super."ddc-driver";
+  "ddc-interface" = dontDistribute super."ddc-interface";
+  "ddc-source-tetra" = dontDistribute super."ddc-source-tetra";
+  "ddc-tools" = dontDistribute super."ddc-tools";
+  "ddc-war" = dontDistribute super."ddc-war";
+  "ddci-core" = dontDistribute super."ddci-core";
+  "dead-code-detection" = dontDistribute super."dead-code-detection";
+  "dead-simple-json" = dontDistribute super."dead-simple-json";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "decode-utf8" = dontDistribute super."decode-utf8";
+  "decoder-conduit" = dontDistribute super."decoder-conduit";
+  "dedukti" = dontDistribute super."dedukti";
+  "deepcontrol" = dontDistribute super."deepcontrol";
+  "deeplearning-hs" = dontDistribute super."deeplearning-hs";
+  "deepseq-bounded" = dontDistribute super."deepseq-bounded";
+  "deepseq-magic" = dontDistribute super."deepseq-magic";
+  "deepseq-th" = dontDistribute super."deepseq-th";
+  "deepzoom" = dontDistribute super."deepzoom";
+  "defargs" = dontDistribute super."defargs";
+  "definitive-base" = dontDistribute super."definitive-base";
+  "definitive-filesystem" = dontDistribute super."definitive-filesystem";
+  "definitive-graphics" = dontDistribute super."definitive-graphics";
+  "definitive-parser" = dontDistribute super."definitive-parser";
+  "definitive-reactive" = dontDistribute super."definitive-reactive";
+  "definitive-sound" = dontDistribute super."definitive-sound";
+  "deiko-config" = dontDistribute super."deiko-config";
+  "deka" = dontDistribute super."deka";
+  "deka-tests" = dontDistribute super."deka-tests";
+  "delaunay" = dontDistribute super."delaunay";
+  "delicious" = dontDistribute super."delicious";
+  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
+  "delta" = dontDistribute super."delta";
+  "delta-h" = dontDistribute super."delta-h";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "dependent-state" = dontDistribute super."dependent-state";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "derive-monoid" = dontDistribute super."derive-monoid";
+  "derive-topdown" = dontDistribute super."derive-topdown";
+  "derive-trie" = dontDistribute super."derive-trie";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "derp" = dontDistribute super."derp";
+  "derp-lib" = dontDistribute super."derp-lib";
+  "descrilo" = dontDistribute super."descrilo";
+  "despair" = dontDistribute super."despair";
+  "deterministic-game-engine" = dontDistribute super."deterministic-game-engine";
+  "detrospector" = dontDistribute super."detrospector";
+  "deunicode" = dontDistribute super."deunicode";
+  "devil" = dontDistribute super."devil";
+  "dewdrop" = dontDistribute super."dewdrop";
+  "dfrac" = dontDistribute super."dfrac";
+  "dfsbuild" = dontDistribute super."dfsbuild";
+  "dgim" = dontDistribute super."dgim";
+  "dgs" = dontDistribute super."dgs";
+  "dia-base" = dontDistribute super."dia-base";
+  "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
+  "diagrams-pdf" = dontDistribute super."diagrams-pdf";
+  "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "dictparser" = dontDistribute super."dictparser";
+  "diet" = dontDistribute super."diet";
+  "diff-gestalt" = dontDistribute super."diff-gestalt";
+  "diff-parse" = dontDistribute super."diff-parse";
+  "diffarray" = dontDistribute super."diffarray";
+  "diffcabal" = dontDistribute super."diffcabal";
+  "diffdump" = dontDistribute super."diffdump";
+  "digamma" = dontDistribute super."digamma";
+  "digest-pure" = dontDistribute super."digest-pure";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
+  "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
+  "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
+  "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty";
+  "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
+  "digit" = dontDistribute super."digit";
+  "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
+  "dimensional-tf" = dontDistribute super."dimensional-tf";
+  "dingo-core" = dontDistribute super."dingo-core";
+  "dingo-example" = dontDistribute super."dingo-example";
+  "dingo-widgets" = dontDistribute super."dingo-widgets";
+  "diophantine" = dontDistribute super."diophantine";
+  "diplomacy" = dontDistribute super."diplomacy";
+  "diplomacy-server" = dontDistribute super."diplomacy-server";
+  "direct-binary-files" = dontDistribute super."direct-binary-files";
+  "direct-daemonize" = dontDistribute super."direct-daemonize";
+  "direct-fastcgi" = dontDistribute super."direct-fastcgi";
+  "direct-http" = dontDistribute super."direct-http";
+  "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
+  "direct-plugins" = dontDistribute super."direct-plugins";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "discrete-space-map" = dontDistribute super."discrete-space-map";
+  "discrimination" = dontDistribute super."discrimination";
+  "disjoint-set" = dontDistribute super."disjoint-set";
+  "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
+  "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
+  "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
+  "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
+  "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "djembe" = dontDistribute super."djembe";
+  "djinn" = dontDistribute super."djinn";
+  "djinn-th" = dontDistribute super."djinn-th";
+  "dnscache" = dontDistribute super."dnscache";
+  "dnsrbl" = dontDistribute super."dnsrbl";
+  "dnssd" = dontDistribute super."dnssd";
+  "doc-review" = dontDistribute super."doc-review";
+  "doccheck" = dontDistribute super."doccheck";
+  "docidx" = dontDistribute super."docidx";
+  "docker" = dontDistribute super."docker";
+  "dockercook" = dontDistribute super."dockercook";
+  "doctest-discover" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
+  "dom-selector" = dontDistribute super."dom-selector";
+  "domain-auth" = dontDistribute super."domain-auth";
+  "dominion" = dontDistribute super."dominion";
+  "domplate" = dontDistribute super."domplate";
+  "dot2graphml" = dontDistribute super."dot2graphml";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download" = dontDistribute super."download";
+  "download-curl" = dontDistribute super."download-curl";
+  "download-media-content" = dontDistribute super."download-media-content";
+  "dozenal" = dontDistribute super."dozenal";
+  "dozens" = dontDistribute super."dozens";
+  "dph-base" = dontDistribute super."dph-base";
+  "dph-examples" = dontDistribute super."dph-examples";
+  "dph-lifted-base" = dontDistribute super."dph-lifted-base";
+  "dph-lifted-copy" = dontDistribute super."dph-lifted-copy";
+  "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg";
+  "dph-par" = dontDistribute super."dph-par";
+  "dph-prim-interface" = dontDistribute super."dph-prim-interface";
+  "dph-prim-par" = dontDistribute super."dph-prim-par";
+  "dph-prim-seq" = dontDistribute super."dph-prim-seq";
+  "dph-seq" = dontDistribute super."dph-seq";
+  "dpkg" = dontDistribute super."dpkg";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "dropbox-sdk" = dontDistribute super."dropbox-sdk";
+  "dropsolve" = dontDistribute super."dropsolve";
+  "ds-kanren" = dontDistribute super."ds-kanren";
+  "dsh-sql" = dontDistribute super."dsh-sql";
+  "dsmc" = dontDistribute super."dsmc";
+  "dsmc-tools" = dontDistribute super."dsmc-tools";
+  "dson" = dontDistribute super."dson";
+  "dson-parsec" = dontDistribute super."dson-parsec";
+  "dsp" = dontDistribute super."dsp";
+  "dstring" = dontDistribute super."dstring";
+  "dtab" = dontDistribute super."dtab";
+  "dtd" = dontDistribute super."dtd";
+  "dtd-text" = dontDistribute super."dtd-text";
+  "dtd-types" = dontDistribute super."dtd-types";
+  "dtrace" = dontDistribute super."dtrace";
+  "dtw" = dontDistribute super."dtw";
+  "dump" = dontDistribute super."dump";
+  "duplo" = dontDistribute super."duplo";
+  "dvda" = dontDistribute super."dvda";
+  "dvdread" = dontDistribute super."dvdread";
+  "dvi-processing" = dontDistribute super."dvi-processing";
+  "dvorak" = dontDistribute super."dvorak";
+  "dwarf" = dontDistribute super."dwarf";
+  "dwarf-el" = dontDistribute super."dwarf-el";
+  "dwarfadt" = dontDistribute super."dwarfadt";
+  "dx9base" = dontDistribute super."dx9base";
+  "dx9d3d" = dontDistribute super."dx9d3d";
+  "dx9d3dx" = dontDistribute super."dx9d3dx";
+  "dynamic-cabal" = dontDistribute super."dynamic-cabal";
+  "dynamic-graph" = dontDistribute super."dynamic-graph";
+  "dynamic-linker-template" = dontDistribute super."dynamic-linker-template";
+  "dynamic-loader" = dontDistribute super."dynamic-loader";
+  "dynamic-mvector" = dontDistribute super."dynamic-mvector";
+  "dynamic-object" = dontDistribute super."dynamic-object";
+  "dynamic-plot" = dontDistribute super."dynamic-plot";
+  "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynobud" = dontDistribute super."dynobud";
+  "dywapitchtrack" = dontDistribute super."dywapitchtrack";
+  "dzen-utils" = dontDistribute super."dzen-utils";
+  "eager-sockets" = dontDistribute super."eager-sockets";
+  "easy-api" = dontDistribute super."easy-api";
+  "easy-bitcoin" = dontDistribute super."easy-bitcoin";
+  "easyjson" = dontDistribute super."easyjson";
+  "easyplot" = dontDistribute super."easyplot";
+  "easyrender" = dontDistribute super."easyrender";
+  "ebeats" = dontDistribute super."ebeats";
+  "ebnf-bff" = dontDistribute super."ebnf-bff";
+  "ec2-signature" = dontDistribute super."ec2-signature";
+  "ecdsa" = dontDistribute super."ecdsa";
+  "ecma262" = dontDistribute super."ecma262";
+  "ecu" = dontDistribute super."ecu";
+  "ed25519" = dontDistribute super."ed25519";
+  "ed25519-donna" = dontDistribute super."ed25519-donna";
+  "eddie" = dontDistribute super."eddie";
+  "edenmodules" = dontDistribute super."edenmodules";
+  "edenskel" = dontDistribute super."edenskel";
+  "edentv" = dontDistribute super."edentv";
+  "edge" = dontDistribute super."edge";
+  "edis" = dontDistribute super."edis";
+  "edit-lenses" = dontDistribute super."edit-lenses";
+  "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
+  "editable" = dontDistribute super."editable";
+  "editline" = dontDistribute super."editline";
+  "effect-monad" = dontDistribute super."effect-monad";
+  "effective-aspects" = dontDistribute super."effective-aspects";
+  "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
+  "effects" = dontDistribute super."effects";
+  "effects-parser" = dontDistribute super."effects-parser";
+  "effin" = dontDistribute super."effin";
+  "egison" = dontDistribute super."egison";
+  "egison-quote" = dontDistribute super."egison-quote";
+  "egison-tutorial" = dontDistribute super."egison-tutorial";
+  "ehaskell" = dontDistribute super."ehaskell";
+  "ehs" = dontDistribute super."ehs";
+  "eibd-client-simple" = dontDistribute super."eibd-client-simple";
+  "eigen" = dontDistribute super."eigen";
+  "eithers" = dontDistribute super."eithers";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-log" = dontDistribute super."ekg-log";
+  "ekg-push" = dontDistribute super."ekg-push";
+  "ekg-rrd" = dontDistribute super."ekg-rrd";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "electrum-mnemonic" = dontDistribute super."electrum-mnemonic";
+  "elerea" = dontDistribute super."elerea";
+  "elerea-examples" = dontDistribute super."elerea-examples";
+  "elerea-sdl" = dontDistribute super."elerea-sdl";
+  "elevator" = dontDistribute super."elevator";
+  "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "elm-init" = dontDistribute super."elm-init";
+  "elm-make" = dontDistribute super."elm-make";
+  "elm-package" = dontDistribute super."elm-package";
+  "elm-reactor" = dontDistribute super."elm-reactor";
+  "elm-repl" = dontDistribute super."elm-repl";
+  "elm-server" = dontDistribute super."elm-server";
+  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
+  "elocrypt" = dontDistribute super."elocrypt";
+  "emacs-keys" = dontDistribute super."emacs-keys";
+  "email" = dontDistribute super."email";
+  "email-header" = dontDistribute super."email-header";
+  "email-postmark" = dontDistribute super."email-postmark";
+  "email-validator" = dontDistribute super."email-validator";
+  "embeddock" = dontDistribute super."embeddock";
+  "embeddock-example" = dontDistribute super."embeddock-example";
+  "embroidery" = dontDistribute super."embroidery";
+  "emgm" = dontDistribute super."emgm";
+  "empty" = dontDistribute super."empty";
+  "encoding" = dontDistribute super."encoding";
+  "endo" = dontDistribute super."endo";
+  "engine-io-growler" = dontDistribute super."engine-io-growler";
+  "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engineering-units" = dontDistribute super."engineering-units";
+  "enumerable" = dontDistribute super."enumerable";
+  "enumerate" = dontDistribute super."enumerate";
+  "enumeration" = dontDistribute super."enumeration";
+  "enumerator-fd" = dontDistribute super."enumerator-fd";
+  "enumerator-tf" = dontDistribute super."enumerator-tf";
+  "enumfun" = dontDistribute super."enumfun";
+  "enummapmap" = dontDistribute super."enummapmap";
+  "enummapset" = dontDistribute super."enummapset";
+  "enummapset-th" = dontDistribute super."enummapset-th";
+  "enumset" = dontDistribute super."enumset";
+  "env-parser" = dontDistribute super."env-parser";
+  "envparse" = dontDistribute super."envparse";
+  "epanet-haskell" = dontDistribute super."epanet-haskell";
+  "epass" = dontDistribute super."epass";
+  "epic" = dontDistribute super."epic";
+  "epoll" = dontDistribute super."epoll";
+  "eprocess" = dontDistribute super."eprocess";
+  "epub" = dontDistribute super."epub";
+  "epub-metadata" = dontDistribute super."epub-metadata";
+  "epub-tools" = dontDistribute super."epub-tools";
+  "epubname" = dontDistribute super."epubname";
+  "equal-files" = dontDistribute super."equal-files";
+  "equational-reasoning" = dontDistribute super."equational-reasoning";
+  "erd" = dontDistribute super."erd";
+  "erf-native" = dontDistribute super."erf-native";
+  "erlang" = dontDistribute super."erlang";
+  "eros" = dontDistribute super."eros";
+  "eros-client" = dontDistribute super."eros-client";
+  "eros-http" = dontDistribute super."eros-http";
+  "errno" = dontDistribute super."errno";
+  "error-analyze" = dontDistribute super."error-analyze";
+  "error-continuations" = dontDistribute super."error-continuations";
+  "error-list" = dontDistribute super."error-list";
+  "error-loc" = dontDistribute super."error-loc";
+  "error-location" = dontDistribute super."error-location";
+  "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
+  "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "ersatz" = dontDistribute super."ersatz";
+  "ersatz-toysat" = dontDistribute super."ersatz-toysat";
+  "ert" = dontDistribute super."ert";
+  "esotericbot" = dontDistribute super."esotericbot";
+  "ess" = dontDistribute super."ess";
+  "estimator" = dontDistribute super."estimator";
+  "estimators" = dontDistribute super."estimators";
+  "estreps" = dontDistribute super."estreps";
+  "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
+  "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
+  "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
+  "ethereum-rlp" = dontDistribute super."ethereum-rlp";
+  "ety" = dontDistribute super."ety";
+  "euler" = dontDistribute super."euler";
+  "euphoria" = dontDistribute super."euphoria";
+  "eurofxref" = dontDistribute super."eurofxref";
+  "event-driven" = dontDistribute super."event-driven";
+  "event-handlers" = dontDistribute super."event-handlers";
+  "event-list" = dontDistribute super."event-list";
+  "event-monad" = dontDistribute super."event-monad";
+  "eventloop" = dontDistribute super."eventloop";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-pi" = doDistribute super."exact-pi_0_4_1_1";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
+  "exists" = dontDistribute super."exists";
+  "exit-codes" = dontDistribute super."exit-codes";
+  "exp-extended" = dontDistribute super."exp-extended";
+  "exp-pairs" = dontDistribute super."exp-pairs";
+  "expand" = dontDistribute super."expand";
+  "expat-enumerator" = dontDistribute super."expat-enumerator";
+  "expiring-mvar" = dontDistribute super."expiring-mvar";
+  "explain" = dontDistribute super."explain";
+  "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-iomodes" = dontDistribute super."explicit-iomodes";
+  "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
+  "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
+  "explicit-sharing" = dontDistribute super."explicit-sharing";
+  "explore" = dontDistribute super."explore";
+  "exposed-containers" = dontDistribute super."exposed-containers";
+  "expression-parser" = dontDistribute super."expression-parser";
+  "extcore" = dontDistribute super."extcore";
+  "extemp" = dontDistribute super."extemp";
+  "extended-categories" = dontDistribute super."extended-categories";
+  "extended-reals" = dontDistribute super."extended-reals";
+  "extensible" = dontDistribute super."extensible";
+  "extensible-data" = dontDistribute super."extensible-data";
+  "external-sort" = dontDistribute super."external-sort";
+  "extractelf" = dontDistribute super."extractelf";
+  "ez-couch" = dontDistribute super."ez-couch";
+  "faceted" = dontDistribute super."faceted";
+  "factory" = dontDistribute super."factory";
+  "factual-api" = dontDistribute super."factual-api";
+  "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "fair-predicates" = dontDistribute super."fair-predicates";
+  "fake-type" = dontDistribute super."fake-type";
+  "faker" = dontDistribute super."faker";
+  "falling-turnip" = dontDistribute super."falling-turnip";
+  "fallingblocks" = dontDistribute super."fallingblocks";
+  "family-tree" = dontDistribute super."family-tree";
+  "fast-digits" = dontDistribute super."fast-digits";
+  "fast-math" = dontDistribute super."fast-math";
+  "fast-tags" = dontDistribute super."fast-tags";
+  "fast-tagsoup" = dontDistribute super."fast-tagsoup";
+  "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
+  "fdo-trash" = dontDistribute super."fdo-trash";
+  "fec" = dontDistribute super."fec";
+  "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed-cli" = dontDistribute super."feed-cli";
+  "feed-collect" = dontDistribute super."feed-collect";
+  "feed-crawl" = dontDistribute super."feed-crawl";
+  "feed-translator" = dontDistribute super."feed-translator";
+  "feed2lj" = dontDistribute super."feed2lj";
+  "feed2twitter" = dontDistribute super."feed2twitter";
+  "feldspar-compiler" = dontDistribute super."feldspar-compiler";
+  "feldspar-language" = dontDistribute super."feldspar-language";
+  "feldspar-signal" = dontDistribute super."feldspar-signal";
+  "fen2s" = dontDistribute super."fen2s";
+  "fences" = dontDistribute super."fences";
+  "fenfire" = dontDistribute super."fenfire";
+  "fez-conf" = dontDistribute super."fez-conf";
+  "ffeed" = dontDistribute super."ffeed";
+  "fficxx" = dontDistribute super."fficxx";
+  "fficxx-runtime" = dontDistribute super."fficxx-runtime";
+  "ffmpeg-light" = dontDistribute super."ffmpeg-light";
+  "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
+  "fgl-visualize" = dontDistribute super."fgl-visualize";
+  "fibon" = dontDistribute super."fibon";
+  "fibonacci" = dontDistribute super."fibonacci";
+  "fields" = dontDistribute super."fields";
+  "fields-json" = dontDistribute super."fields-json";
+  "fieldwise" = dontDistribute super."fieldwise";
+  "fig" = dontDistribute super."fig";
+  "file-collection" = dontDistribute super."file-collection";
+  "file-command-qq" = dontDistribute super."file-command-qq";
+  "filediff" = dontDistribute super."filediff";
+  "filepath-io-access" = dontDistribute super."filepath-io-access";
+  "filepather" = dontDistribute super."filepather";
+  "filestore" = dontDistribute super."filestore";
+  "filesystem-conduit" = dontDistribute super."filesystem-conduit";
+  "filesystem-enumerator" = dontDistribute super."filesystem-enumerator";
+  "filesystem-trees" = dontDistribute super."filesystem-trees";
+  "filtrable" = dontDistribute super."filtrable";
+  "final" = dontDistribute super."final";
+  "find-conduit" = dontDistribute super."find-conduit";
+  "fingertree-tf" = dontDistribute super."fingertree-tf";
+  "finite-field" = dontDistribute super."finite-field";
+  "finite-typelits" = dontDistribute super."finite-typelits";
+  "first-and-last" = dontDistribute super."first-and-last";
+  "first-class-patterns" = dontDistribute super."first-class-patterns";
+  "firstify" = dontDistribute super."firstify";
+  "fishfood" = dontDistribute super."fishfood";
+  "fit" = dontDistribute super."fit";
+  "fitsio" = dontDistribute super."fitsio";
+  "fix-imports" = dontDistribute super."fix-imports";
+  "fix-parser-simple" = dontDistribute super."fix-parser-simple";
+  "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit";
+  "fixed-length" = dontDistribute super."fixed-length";
+  "fixed-point" = dontDistribute super."fixed-point";
+  "fixed-point-vector" = dontDistribute super."fixed-point-vector";
+  "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space";
+  "fixed-precision" = dontDistribute super."fixed-precision";
+  "fixed-storable-array" = dontDistribute super."fixed-storable-array";
+  "fixed-vector-binary" = dontDistribute super."fixed-vector-binary";
+  "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
+  "fixedprec" = dontDistribute super."fixedprec";
+  "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
+  "fixhs" = dontDistribute super."fixhs";
+  "fixplate" = dontDistribute super."fixplate";
+  "fixpoint" = dontDistribute super."fixpoint";
+  "fixtime" = dontDistribute super."fixtime";
+  "fizz-buzz" = dontDistribute super."fizz-buzz";
+  "flaccuraterip" = dontDistribute super."flaccuraterip";
+  "flamethrower" = dontDistribute super."flamethrower";
+  "flamingra" = dontDistribute super."flamingra";
+  "flat-maybe" = dontDistribute super."flat-maybe";
+  "flat-mcmc" = dontDistribute super."flat-mcmc";
+  "flat-tex" = dontDistribute super."flat-tex";
+  "flexible-time" = dontDistribute super."flexible-time";
+  "flexible-unlit" = dontDistribute super."flexible-unlit";
+  "flexiwrap" = dontDistribute super."flexiwrap";
+  "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck";
+  "flickr" = dontDistribute super."flickr";
+  "flippers" = dontDistribute super."flippers";
+  "flite" = dontDistribute super."flite";
+  "flo" = dontDistribute super."flo";
+  "float-binstring" = dontDistribute super."float-binstring";
+  "floating-bits" = dontDistribute super."floating-bits";
+  "floatshow" = dontDistribute super."floatshow";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "flowdock-api" = dontDistribute super."flowdock-api";
+  "flowdock-rest" = dontDistribute super."flowdock-rest";
+  "flower" = dontDistribute super."flower";
+  "flowlocks-framework" = dontDistribute super."flowlocks-framework";
+  "flowsim" = dontDistribute super."flowsim";
+  "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl-incremental" = dontDistribute super."foldl-incremental";
+  "foldl-transduce" = dontDistribute super."foldl-transduce";
+  "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
+  "folds" = dontDistribute super."folds";
+  "folds-common" = dontDistribute super."folds-common";
+  "follower" = dontDistribute super."follower";
+  "foma" = dontDistribute super."foma";
+  "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6";
+  "foo" = dontDistribute super."foo";
+  "for-free" = dontDistribute super."for-free";
+  "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "fordo" = dontDistribute super."fordo";
+  "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
+  "foreign-var" = dontDistribute super."foreign-var";
+  "forger" = dontDistribute super."forger";
+  "forkable-monad" = dontDistribute super."forkable-monad";
+  "formal" = dontDistribute super."formal";
+  "format" = dontDistribute super."format";
+  "format-status" = dontDistribute super."format-status";
+  "formattable" = dontDistribute super."formattable";
+  "forml" = dontDistribute super."forml";
+  "formlets" = dontDistribute super."formlets";
+  "formlets-hsp" = dontDistribute super."formlets-hsp";
+  "formura" = dontDistribute super."formura";
+  "forth-hll" = dontDistribute super."forth-hll";
+  "foscam-directory" = dontDistribute super."foscam-directory";
+  "foscam-filename" = dontDistribute super."foscam-filename";
+  "foscam-sort" = dontDistribute super."foscam-sort";
+  "fountain" = dontDistribute super."fountain";
+  "fpco-api" = dontDistribute super."fpco-api";
+  "fpipe" = dontDistribute super."fpipe";
+  "fpnla" = dontDistribute super."fpnla";
+  "fpnla-examples" = dontDistribute super."fpnla-examples";
+  "fptest" = dontDistribute super."fptest";
+  "fquery" = dontDistribute super."fquery";
+  "fractal" = dontDistribute super."fractal";
+  "fractals" = dontDistribute super."fractals";
+  "fraction" = dontDistribute super."fraction";
+  "frag" = dontDistribute super."frag";
+  "frame" = dontDistribute super."frame";
+  "frame-markdown" = dontDistribute super."frame-markdown";
+  "franchise" = dontDistribute super."franchise";
+  "free-concurrent" = dontDistribute super."free-concurrent";
+  "free-functors" = dontDistribute super."free-functors";
+  "free-game" = dontDistribute super."free-game";
+  "free-http" = dontDistribute super."free-http";
+  "free-operational" = dontDistribute super."free-operational";
+  "free-theorems" = dontDistribute super."free-theorems";
+  "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples";
+  "free-theorems-seq" = dontDistribute super."free-theorems-seq";
+  "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
+  "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
+  "freekick2" = dontDistribute super."freekick2";
+  "freer" = dontDistribute super."freer";
+  "freesect" = dontDistribute super."freesect";
+  "freesound" = dontDistribute super."freesound";
+  "freetype-simple" = dontDistribute super."freetype-simple";
+  "freetype2" = dontDistribute super."freetype2";
+  "fresh" = dontDistribute super."fresh";
+  "friday" = dontDistribute super."friday";
+  "friday-devil" = dontDistribute super."friday-devil";
+  "friday-juicypixels" = dontDistribute super."friday-juicypixels";
+  "friday-scale-dct" = dontDistribute super."friday-scale-dct";
+  "friendly-time" = dontDistribute super."friendly-time";
+  "frown" = dontDistribute super."frown";
+  "frp-arduino" = dontDistribute super."frp-arduino";
+  "frpnow" = dontDistribute super."frpnow";
+  "frpnow-gloss" = dontDistribute super."frpnow-gloss";
+  "frpnow-gtk" = dontDistribute super."frpnow-gtk";
+  "frquotes" = dontDistribute super."frquotes";
+  "fs-events" = dontDistribute super."fs-events";
+  "fsharp" = dontDistribute super."fsharp";
+  "fsmActions" = dontDistribute super."fsmActions";
+  "fst" = dontDistribute super."fst";
+  "fsutils" = dontDistribute super."fsutils";
+  "fswatcher" = dontDistribute super."fswatcher";
+  "ftdi" = dontDistribute super."ftdi";
+  "ftp-conduit" = dontDistribute super."ftp-conduit";
+  "ftphs" = dontDistribute super."ftphs";
+  "ftree" = dontDistribute super."ftree";
+  "ftshell" = dontDistribute super."ftshell";
+  "fugue" = dontDistribute super."fugue";
+  "full-sessions" = dontDistribute super."full-sessions";
+  "full-text-search" = dontDistribute super."full-text-search";
+  "fullstop" = dontDistribute super."fullstop";
+  "funbot" = dontDistribute super."funbot";
+  "funbot-client" = dontDistribute super."funbot-client";
+  "funbot-ext-events" = dontDistribute super."funbot-ext-events";
+  "funbot-git-hook" = dontDistribute super."funbot-git-hook";
+  "function-combine" = dontDistribute super."function-combine";
+  "function-instances-algebra" = dontDistribute super."function-instances-algebra";
+  "functional-arrow" = dontDistribute super."functional-arrow";
+  "functional-kmp" = dontDistribute super."functional-kmp";
+  "functor-apply" = dontDistribute super."functor-apply";
+  "functor-combo" = dontDistribute super."functor-combo";
+  "functor-infix" = dontDistribute super."functor-infix";
+  "functor-monadic" = dontDistribute super."functor-monadic";
+  "functor-utils" = dontDistribute super."functor-utils";
+  "functorm" = dontDistribute super."functorm";
+  "functors" = dontDistribute super."functors";
+  "funion" = dontDistribute super."funion";
+  "funpat" = dontDistribute super."funpat";
+  "funsat" = dontDistribute super."funsat";
+  "fusion" = dontDistribute super."fusion";
+  "futun" = dontDistribute super."futun";
+  "future" = dontDistribute super."future";
+  "future-resource" = dontDistribute super."future-resource";
+  "fuzzy" = dontDistribute super."fuzzy";
+  "fuzzy-timings" = dontDistribute super."fuzzy-timings";
+  "fuzzytime" = dontDistribute super."fuzzytime";
+  "fwgl" = dontDistribute super."fwgl";
+  "fwgl-glfw" = dontDistribute super."fwgl-glfw";
+  "fwgl-javascript" = dontDistribute super."fwgl-javascript";
+  "g-npm" = dontDistribute super."g-npm";
+  "gact" = dontDistribute super."gact";
+  "game-of-life" = dontDistribute super."game-of-life";
+  "game-probability" = dontDistribute super."game-probability";
+  "game-tree" = dontDistribute super."game-tree";
+  "gameclock" = dontDistribute super."gameclock";
+  "gamma" = dontDistribute super."gamma";
+  "gang-of-threads" = dontDistribute super."gang-of-threads";
+  "garepinoh" = dontDistribute super."garepinoh";
+  "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gbu" = dontDistribute super."gbu";
+  "gc" = dontDistribute super."gc";
+  "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
+  "gconf" = dontDistribute super."gconf";
+  "gdiff" = dontDistribute super."gdiff";
+  "gdiff-ig" = dontDistribute super."gdiff-ig";
+  "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
+  "gearbox" = dontDistribute super."gearbox";
+  "geek" = dontDistribute super."geek";
+  "geek-server" = dontDistribute super."geek-server";
+  "gelatin" = dontDistribute super."gelatin";
+  "gemstone" = dontDistribute super."gemstone";
+  "gencheck" = dontDistribute super."gencheck";
+  "gender" = dontDistribute super."gender";
+  "genders" = dontDistribute super."genders";
+  "general-prelude" = dontDistribute super."general-prelude";
+  "generator" = dontDistribute super."generator";
+  "generators" = dontDistribute super."generators";
+  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "genericserialize" = dontDistribute super."genericserialize";
+  "genetics" = dontDistribute super."genetics";
+  "geni-gui" = dontDistribute super."geni-gui";
+  "geni-util" = dontDistribute super."geni-util";
+  "geniconvert" = dontDistribute super."geniconvert";
+  "genifunctors" = dontDistribute super."genifunctors";
+  "geniplate" = dontDistribute super."geniplate";
+  "geniserver" = dontDistribute super."geniserver";
+  "genprog" = dontDistribute super."genprog";
+  "gentlemark" = dontDistribute super."gentlemark";
+  "geo-resolver" = dontDistribute super."geo-resolver";
+  "geo-uk" = dontDistribute super."geo-uk";
+  "geocalc" = dontDistribute super."geocalc";
+  "geocode-google" = dontDistribute super."geocode-google";
+  "geodetic" = dontDistribute super."geodetic";
+  "geodetics" = dontDistribute super."geodetics";
+  "geohash" = dontDistribute super."geohash";
+  "geoip2" = dontDistribute super."geoip2";
+  "geojson" = dontDistribute super."geojson";
+  "geom2d" = dontDistribute super."geom2d";
+  "getemx" = dontDistribute super."getemx";
+  "getflag" = dontDistribute super."getflag";
+  "getopt-simple" = dontDistribute super."getopt-simple";
+  "gf" = dontDistribute super."gf";
+  "ggtsTC" = dontDistribute super."ggtsTC";
+  "ghc-core" = dontDistribute super."ghc-core";
+  "ghc-core-html" = dontDistribute super."ghc-core-html";
+  "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
+  "ghc-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-imported-from" = dontDistribute super."ghc-imported-from";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-options" = dontDistribute super."ghc-options";
+  "ghc-parmake" = dontDistribute super."ghc-parmake";
+  "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
+  "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
+  "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-simple" = dontDistribute super."ghc-simple";
+  "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
+  "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-vis" = dontDistribute super."ghc-vis";
+  "ghci-diagrams" = dontDistribute super."ghci-diagrams";
+  "ghci-haskeline" = dontDistribute super."ghci-haskeline";
+  "ghci-lib" = dontDistribute super."ghci-lib";
+  "ghci-ng" = dontDistribute super."ghci-ng";
+  "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-freq" = dontDistribute super."git-freq";
+  "git-gpush" = dontDistribute super."git-gpush";
+  "git-jump" = dontDistribute super."git-jump";
+  "git-monitor" = dontDistribute super."git-monitor";
+  "git-object" = dontDistribute super."git-object";
+  "git-repair" = dontDistribute super."git-repair";
+  "git-sanity" = dontDistribute super."git-sanity";
+  "git-vogue" = dontDistribute super."git-vogue";
+  "gitHUD" = dontDistribute super."gitHUD";
+  "gitcache" = dontDistribute super."gitcache";
+  "gitdo" = dontDistribute super."gitdo";
+  "github-backup" = dontDistribute super."github-backup";
+  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-utils" = dontDistribute super."github-utils";
+  "gitignore" = dontDistribute super."gitignore";
+  "gitit" = dontDistribute super."gitit";
+  "gitlib-cmdline" = dontDistribute super."gitlib-cmdline";
+  "gitlib-cross" = dontDistribute super."gitlib-cross";
+  "gitlib-s3" = dontDistribute super."gitlib-s3";
+  "gitlib-sample" = dontDistribute super."gitlib-sample";
+  "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitter" = dontDistribute super."gitter";
+  "gl-capture" = dontDistribute super."gl-capture";
+  "glade" = dontDistribute super."glade";
+  "gladexml-accessor" = dontDistribute super."gladexml-accessor";
+  "glambda" = dontDistribute super."glambda";
+  "glapp" = dontDistribute super."glapp";
+  "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
+  "glider-nlp" = dontDistribute super."glider-nlp";
+  "glintcollider" = dontDistribute super."glintcollider";
+  "gll" = dontDistribute super."gll";
+  "global" = dontDistribute super."global";
+  "global-config" = dontDistribute super."global-config";
+  "global-lock" = dontDistribute super."global-lock";
+  "global-variables" = dontDistribute super."global-variables";
+  "glome-hs" = dontDistribute super."glome-hs";
+  "gloss" = dontDistribute super."gloss";
+  "gloss-accelerate" = dontDistribute super."gloss-accelerate";
+  "gloss-algorithms" = dontDistribute super."gloss-algorithms";
+  "gloss-banana" = dontDistribute super."gloss-banana";
+  "gloss-devil" = dontDistribute super."gloss-devil";
+  "gloss-examples" = dontDistribute super."gloss-examples";
+  "gloss-game" = dontDistribute super."gloss-game";
+  "gloss-juicy" = dontDistribute super."gloss-juicy";
+  "gloss-raster" = dontDistribute super."gloss-raster";
+  "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate";
+  "gloss-rendering" = dontDistribute super."gloss-rendering";
+  "gloss-sodium" = dontDistribute super."gloss-sodium";
+  "glpk-hs" = dontDistribute super."glpk-hs";
+  "glue" = dontDistribute super."glue";
+  "glue-common" = dontDistribute super."glue-common";
+  "glue-core" = dontDistribute super."glue-core";
+  "glue-ekg" = dontDistribute super."glue-ekg";
+  "glue-example" = dontDistribute super."glue-example";
+  "gluturtle" = dontDistribute super."gluturtle";
+  "gmap" = dontDistribute super."gmap";
+  "gmndl" = dontDistribute super."gmndl";
+  "gnome-desktop" = dontDistribute super."gnome-desktop";
+  "gnome-keyring" = dontDistribute super."gnome-keyring";
+  "gnomevfs" = dontDistribute super."gnomevfs";
+  "gnss-converters" = dontDistribute super."gnss-converters";
+  "gnuplot" = dontDistribute super."gnuplot";
+  "goa" = dontDistribute super."goa";
+  "goal-core" = dontDistribute super."goal-core";
+  "goal-geometry" = dontDistribute super."goal-geometry";
+  "goal-probability" = dontDistribute super."goal-probability";
+  "goal-simulation" = dontDistribute super."goal-simulation";
+  "goatee" = dontDistribute super."goatee";
+  "goatee-gtk" = dontDistribute super."goatee-gtk";
+  "gofer-prelude" = dontDistribute super."gofer-prelude";
+  "gogol" = dontDistribute super."gogol";
+  "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer";
+  "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller";
+  "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer";
+  "gogol-admin-directory" = dontDistribute super."gogol-admin-directory";
+  "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration";
+  "gogol-admin-reports" = dontDistribute super."gogol-admin-reports";
+  "gogol-adsense" = dontDistribute super."gogol-adsense";
+  "gogol-adsense-host" = dontDistribute super."gogol-adsense-host";
+  "gogol-affiliates" = dontDistribute super."gogol-affiliates";
+  "gogol-analytics" = dontDistribute super."gogol-analytics";
+  "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise";
+  "gogol-android-publisher" = dontDistribute super."gogol-android-publisher";
+  "gogol-appengine" = dontDistribute super."gogol-appengine";
+  "gogol-apps-activity" = dontDistribute super."gogol-apps-activity";
+  "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar";
+  "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing";
+  "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller";
+  "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks";
+  "gogol-appstate" = dontDistribute super."gogol-appstate";
+  "gogol-autoscaler" = dontDistribute super."gogol-autoscaler";
+  "gogol-bigquery" = dontDistribute super."gogol-bigquery";
+  "gogol-billing" = dontDistribute super."gogol-billing";
+  "gogol-blogger" = dontDistribute super."gogol-blogger";
+  "gogol-books" = dontDistribute super."gogol-books";
+  "gogol-civicinfo" = dontDistribute super."gogol-civicinfo";
+  "gogol-classroom" = dontDistribute super."gogol-classroom";
+  "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace";
+  "gogol-compute" = dontDistribute super."gogol-compute";
+  "gogol-container" = dontDistribute super."gogol-container";
+  "gogol-core" = dontDistribute super."gogol-core";
+  "gogol-customsearch" = dontDistribute super."gogol-customsearch";
+  "gogol-dataflow" = dontDistribute super."gogol-dataflow";
+  "gogol-datastore" = dontDistribute super."gogol-datastore";
+  "gogol-debugger" = dontDistribute super."gogol-debugger";
+  "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager";
+  "gogol-dfareporting" = dontDistribute super."gogol-dfareporting";
+  "gogol-discovery" = dontDistribute super."gogol-discovery";
+  "gogol-dns" = dontDistribute super."gogol-dns";
+  "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids";
+  "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search";
+  "gogol-drive" = dontDistribute super."gogol-drive";
+  "gogol-fitness" = dontDistribute super."gogol-fitness";
+  "gogol-fonts" = dontDistribute super."gogol-fonts";
+  "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch";
+  "gogol-fusiontables" = dontDistribute super."gogol-fusiontables";
+  "gogol-games" = dontDistribute super."gogol-games";
+  "gogol-games-configuration" = dontDistribute super."gogol-games-configuration";
+  "gogol-games-management" = dontDistribute super."gogol-games-management";
+  "gogol-genomics" = dontDistribute super."gogol-genomics";
+  "gogol-gmail" = dontDistribute super."gogol-gmail";
+  "gogol-groups-migration" = dontDistribute super."gogol-groups-migration";
+  "gogol-groups-settings" = dontDistribute super."gogol-groups-settings";
+  "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit";
+  "gogol-latencytest" = dontDistribute super."gogol-latencytest";
+  "gogol-logging" = dontDistribute super."gogol-logging";
+  "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate";
+  "gogol-maps-engine" = dontDistribute super."gogol-maps-engine";
+  "gogol-mirror" = dontDistribute super."gogol-mirror";
+  "gogol-monitoring" = dontDistribute super."gogol-monitoring";
+  "gogol-oauth2" = dontDistribute super."gogol-oauth2";
+  "gogol-pagespeed" = dontDistribute super."gogol-pagespeed";
+  "gogol-partners" = dontDistribute super."gogol-partners";
+  "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner";
+  "gogol-plus" = dontDistribute super."gogol-plus";
+  "gogol-plus-domains" = dontDistribute super."gogol-plus-domains";
+  "gogol-prediction" = dontDistribute super."gogol-prediction";
+  "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon";
+  "gogol-pubsub" = dontDistribute super."gogol-pubsub";
+  "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress";
+  "gogol-replicapool" = dontDistribute super."gogol-replicapool";
+  "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater";
+  "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager";
+  "gogol-resourceviews" = dontDistribute super."gogol-resourceviews";
+  "gogol-shopping-content" = dontDistribute super."gogol-shopping-content";
+  "gogol-siteverification" = dontDistribute super."gogol-siteverification";
+  "gogol-spectrum" = dontDistribute super."gogol-spectrum";
+  "gogol-sqladmin" = dontDistribute super."gogol-sqladmin";
+  "gogol-storage" = dontDistribute super."gogol-storage";
+  "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer";
+  "gogol-tagmanager" = dontDistribute super."gogol-tagmanager";
+  "gogol-taskqueue" = dontDistribute super."gogol-taskqueue";
+  "gogol-translate" = dontDistribute super."gogol-translate";
+  "gogol-urlshortener" = dontDistribute super."gogol-urlshortener";
+  "gogol-useraccounts" = dontDistribute super."gogol-useraccounts";
+  "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools";
+  "gogol-youtube" = dontDistribute super."gogol-youtube";
+  "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics";
+  "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting";
+  "gooey" = dontDistribute super."gooey";
+  "google-dictionary" = dontDistribute super."google-dictionary";
+  "google-drive" = dontDistribute super."google-drive";
+  "google-html5-slide" = dontDistribute super."google-html5-slide";
+  "google-mail-filters" = dontDistribute super."google-mail-filters";
+  "google-oauth2" = dontDistribute super."google-oauth2";
+  "google-search" = dontDistribute super."google-search";
+  "googleplus" = dontDistribute super."googleplus";
+  "googlepolyline" = dontDistribute super."googlepolyline";
+  "gopherbot" = dontDistribute super."gopherbot";
+  "gore-and-ash" = dontDistribute super."gore-and-ash";
+  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
+  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
+  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
+  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
+  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
+  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "gps" = dontDistribute super."gps";
+  "gps2htmlReport" = dontDistribute super."gps2htmlReport";
+  "gpx-conduit" = dontDistribute super."gpx-conduit";
+  "graceful" = dontDistribute super."graceful";
+  "grammar-combinators" = dontDistribute super."grammar-combinators";
+  "grapefruit-examples" = dontDistribute super."grapefruit-examples";
+  "grapefruit-frp" = dontDistribute super."grapefruit-frp";
+  "grapefruit-records" = dontDistribute super."grapefruit-records";
+  "grapefruit-ui" = dontDistribute super."grapefruit-ui";
+  "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
+  "graph-generators" = dontDistribute super."graph-generators";
+  "graph-matchings" = dontDistribute super."graph-matchings";
+  "graph-rewriting" = dontDistribute super."graph-rewriting";
+  "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl";
+  "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl";
+  "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope";
+  "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout";
+  "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski";
+  "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies";
+  "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs";
+  "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww";
+  "graph-serialize" = dontDistribute super."graph-serialize";
+  "graph-utils" = dontDistribute super."graph-utils";
+  "graph-visit" = dontDistribute super."graph-visit";
+  "graphbuilder" = dontDistribute super."graphbuilder";
+  "graphene" = dontDistribute super."graphene";
+  "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators";
+  "graphics-formats-collada" = dontDistribute super."graphics-formats-collada";
+  "graphicsFormats" = dontDistribute super."graphicsFormats";
+  "graphicstools" = dontDistribute super."graphicstools";
+  "graphmod" = dontDistribute super."graphmod";
+  "graphql" = dontDistribute super."graphql";
+  "graphtype" = dontDistribute super."graphtype";
+  "grasp" = dontDistribute super."grasp";
+  "gray-code" = dontDistribute super."gray-code";
+  "gray-extended" = dontDistribute super."gray-extended";
+  "greencard" = dontDistribute super."greencard";
+  "greencard-lib" = dontDistribute super."greencard-lib";
+  "greg-client" = dontDistribute super."greg-client";
+  "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
+  "grid" = dontDistribute super."grid";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "groupoid" = dontDistribute super."groupoid";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk-helpers" = dontDistribute super."gtk-helpers";
+  "gtk-jsinput" = dontDistribute super."gtk-jsinput";
+  "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore";
+  "gtk-mac-integration" = dontDistribute super."gtk-mac-integration";
+  "gtk-serialized-event" = dontDistribute super."gtk-serialized-event";
+  "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view";
+  "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list";
+  "gtk-toy" = dontDistribute super."gtk-toy";
+  "gtk-traymanager" = dontDistribute super."gtk-traymanager";
+  "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade";
+  "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib";
+  "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs";
+  "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk";
+  "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext";
+  "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2";
+  "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th";
+  "gtk2hs-hello" = dontDistribute super."gtk2hs-hello";
+  "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn";
+  "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "gulcii" = dontDistribute super."gulcii";
+  "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis";
+  "gyah-bin" = dontDistribute super."gyah-bin";
+  "h-booru" = dontDistribute super."h-booru";
+  "h-gpgme" = dontDistribute super."h-gpgme";
+  "h2048" = dontDistribute super."h2048";
+  "hArduino" = dontDistribute super."hArduino";
+  "hBDD" = dontDistribute super."hBDD";
+  "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD";
+  "hBDD-CUDD" = dontDistribute super."hBDD-CUDD";
+  "hCsound" = dontDistribute super."hCsound";
+  "hDFA" = dontDistribute super."hDFA";
+  "hF2" = dontDistribute super."hF2";
+  "hGelf" = dontDistribute super."hGelf";
+  "hLLVM" = dontDistribute super."hLLVM";
+  "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_3";
+  "hPDB-examples" = dontDistribute super."hPDB-examples";
+  "hPushover" = dontDistribute super."hPushover";
+  "hR" = dontDistribute super."hR";
+  "hRESP" = dontDistribute super."hRESP";
+  "hS3" = dontDistribute super."hS3";
+  "hScraper" = dontDistribute super."hScraper";
+  "hSimpleDB" = dontDistribute super."hSimpleDB";
+  "hTalos" = dontDistribute super."hTalos";
+  "hTensor" = dontDistribute super."hTensor";
+  "hVOIDP" = dontDistribute super."hVOIDP";
+  "hXmixer" = dontDistribute super."hXmixer";
+  "haar" = dontDistribute super."haar";
+  "hacanon-light" = dontDistribute super."hacanon-light";
+  "hack" = dontDistribute super."hack";
+  "hack-contrib" = dontDistribute super."hack-contrib";
+  "hack-contrib-press" = dontDistribute super."hack-contrib-press";
+  "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack";
+  "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi";
+  "hack-handler-cgi" = dontDistribute super."hack-handler-cgi";
+  "hack-handler-epoll" = dontDistribute super."hack-handler-epoll";
+  "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp";
+  "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi";
+  "hack-handler-happstack" = dontDistribute super."hack-handler-happstack";
+  "hack-handler-hyena" = dontDistribute super."hack-handler-hyena";
+  "hack-handler-kibro" = dontDistribute super."hack-handler-kibro";
+  "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver";
+  "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath";
+  "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession";
+  "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip";
+  "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp";
+  "hack2" = dontDistribute super."hack2";
+  "hack2-contrib" = dontDistribute super."hack2-contrib";
+  "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra";
+  "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server";
+  "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http";
+  "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server";
+  "hack2-handler-warp" = dontDistribute super."hack2-handler-warp";
+  "hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
+  "hackage-diff" = dontDistribute super."hackage-diff";
+  "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-proxy" = dontDistribute super."hackage-proxy";
+  "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
+  "hackage-security" = dontDistribute super."hackage-security";
+  "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
+  "hackage-server" = dontDistribute super."hackage-server";
+  "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackport" = dontDistribute super."hackport";
+  "hactor" = dontDistribute super."hactor";
+  "hactors" = dontDistribute super."hactors";
+  "haddock" = dontDistribute super."haddock";
+  "haddock-leksah" = dontDistribute super."haddock-leksah";
+  "hadoop-formats" = dontDistribute super."hadoop-formats";
+  "hadoop-rpc" = dontDistribute super."hadoop-rpc";
+  "hadoop-tools" = dontDistribute super."hadoop-tools";
+  "haeredes" = dontDistribute super."haeredes";
+  "haggis" = dontDistribute super."haggis";
+  "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
+  "haiji" = dontDistribute super."haiji";
+  "hailgun" = dontDistribute super."hailgun";
+  "hailgun-send" = dontDistribute super."hailgun-send";
+  "hails" = dontDistribute super."hails";
+  "hails-bin" = dontDistribute super."hails-bin";
+  "hairy" = dontDistribute super."hairy";
+  "hakaru" = dontDistribute super."hakaru";
+  "hake" = dontDistribute super."hake";
+  "hakismet" = dontDistribute super."hakismet";
+  "hako" = dontDistribute super."hako";
+  "hakyll-R" = dontDistribute super."hakyll-R";
+  "hakyll-agda" = dontDistribute super."hakyll-agda";
+  "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
+  "hakyll-contrib" = dontDistribute super."hakyll-contrib";
+  "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation";
+  "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links";
+  "hakyll-convert" = dontDistribute super."hakyll-convert";
+  "hakyll-elm" = dontDistribute super."hakyll-elm";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "halberd" = dontDistribute super."halberd";
+  "halfs" = dontDistribute super."halfs";
+  "halipeto" = dontDistribute super."halipeto";
+  "halive" = dontDistribute super."halive";
+  "halma" = dontDistribute super."halma";
+  "haltavista" = dontDistribute super."haltavista";
+  "hamid" = dontDistribute super."hamid";
+  "hampp" = dontDistribute super."hampp";
+  "hamtmap" = dontDistribute super."hamtmap";
+  "hamusic" = dontDistribute super."hamusic";
+  "handa-gdata" = dontDistribute super."handa-gdata";
+  "handa-geodata" = dontDistribute super."handa-geodata";
+  "handa-opengl" = dontDistribute super."handa-opengl";
+  "handle-like" = dontDistribute super."handle-like";
+  "handsy" = dontDistribute super."handsy";
+  "hangman" = dontDistribute super."hangman";
+  "hannahci" = dontDistribute super."hannahci";
+  "hans" = dontDistribute super."hans";
+  "hans-pcap" = dontDistribute super."hans-pcap";
+  "hans-pfq" = dontDistribute super."hans-pfq";
+  "haphviz" = dontDistribute super."haphviz";
+  "happindicator" = dontDistribute super."happindicator";
+  "happindicator3" = dontDistribute super."happindicator3";
+  "happraise" = dontDistribute super."happraise";
+  "happs-hsp" = dontDistribute super."happs-hsp";
+  "happs-hsp-template" = dontDistribute super."happs-hsp-template";
+  "happs-tutorial" = dontDistribute super."happs-tutorial";
+  "happstack" = dontDistribute super."happstack";
+  "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-contrib" = dontDistribute super."happstack-contrib";
+  "happstack-data" = dontDistribute super."happstack-data";
+  "happstack-dlg" = dontDistribute super."happstack-dlg";
+  "happstack-facebook" = dontDistribute super."happstack-facebook";
+  "happstack-fastcgi" = dontDistribute super."happstack-fastcgi";
+  "happstack-fay" = dontDistribute super."happstack-fay";
+  "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax";
+  "happstack-foundation" = dontDistribute super."happstack-foundation";
+  "happstack-hamlet" = dontDistribute super."happstack-hamlet";
+  "happstack-heist" = dontDistribute super."happstack-heist";
+  "happstack-helpers" = dontDistribute super."happstack-helpers";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
+  "happstack-state" = dontDistribute super."happstack-state";
+  "happstack-static-routing" = dontDistribute super."happstack-static-routing";
+  "happstack-util" = dontDistribute super."happstack-util";
+  "happstack-yui" = dontDistribute super."happstack-yui";
+  "happy-meta" = dontDistribute super."happy-meta";
+  "happybara" = dontDistribute super."happybara";
+  "happybara-webkit" = dontDistribute super."happybara-webkit";
+  "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "har" = dontDistribute super."har";
+  "harchive" = dontDistribute super."harchive";
+  "hardware-edsl" = dontDistribute super."hardware-edsl";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harpy" = dontDistribute super."harpy";
+  "has" = dontDistribute super."has";
+  "has-th" = dontDistribute super."has-th";
+  "hascal" = dontDistribute super."hascal";
+  "hascat" = dontDistribute super."hascat";
+  "hascat-lib" = dontDistribute super."hascat-lib";
+  "hascat-setup" = dontDistribute super."hascat-setup";
+  "hascat-system" = dontDistribute super."hascat-system";
+  "hash" = dontDistribute super."hash";
+  "hashable-generics" = dontDistribute super."hashable-generics";
+  "hashabler" = dontDistribute super."hashabler";
+  "hashed-storage" = dontDistribute super."hashed-storage";
+  "hashids" = dontDistribute super."hashids";
+  "hashring" = dontDistribute super."hashring";
+  "hashtables-plus" = dontDistribute super."hashtables-plus";
+  "hasim" = dontDistribute super."hasim";
+  "hask" = dontDistribute super."hask";
+  "hask-home" = dontDistribute super."hask-home";
+  "haskades" = dontDistribute super."haskades";
+  "haskakafka" = dontDistribute super."haskakafka";
+  "haskanoid" = dontDistribute super."haskanoid";
+  "haskarrow" = dontDistribute super."haskarrow";
+  "haskbot-core" = dontDistribute super."haskbot-core";
+  "haskdeep" = dontDistribute super."haskdeep";
+  "haskdogs" = dontDistribute super."haskdogs";
+  "haskeem" = dontDistribute super."haskeem";
+  "haskeline" = doDistribute super."haskeline_0_7_2_2";
+  "haskeline-class" = dontDistribute super."haskeline-class";
+  "haskell-aliyun" = dontDistribute super."haskell-aliyun";
+  "haskell-awk" = dontDistribute super."haskell-awk";
+  "haskell-bcrypt" = dontDistribute super."haskell-bcrypt";
+  "haskell-brainfuck" = dontDistribute super."haskell-brainfuck";
+  "haskell-cnc" = dontDistribute super."haskell-cnc";
+  "haskell-coffee" = dontDistribute super."haskell-coffee";
+  "haskell-compression" = dontDistribute super."haskell-compression";
+  "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
+  "haskell-docs" = dontDistribute super."haskell-docs";
+  "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "haskell-plot" = dontDistribute super."haskell-plot";
+  "haskell-qrencode" = dontDistribute super."haskell-qrencode";
+  "haskell-read-editor" = dontDistribute super."haskell-read-editor";
+  "haskell-reflect" = dontDistribute super."haskell-reflect";
+  "haskell-rules" = dontDistribute super."haskell-rules";
+  "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
+  "haskell-token-utils" = dontDistribute super."haskell-token-utils";
+  "haskell-tor" = dontDistribute super."haskell-tor";
+  "haskell-type-exts" = dontDistribute super."haskell-type-exts";
+  "haskell-typescript" = dontDistribute super."haskell-typescript";
+  "haskell-tyrant" = dontDistribute super."haskell-tyrant";
+  "haskell-updater" = dontDistribute super."haskell-updater";
+  "haskell-xmpp" = dontDistribute super."haskell-xmpp";
+  "haskell2010" = dontDistribute super."haskell2010";
+  "haskell98" = dontDistribute super."haskell98";
+  "haskell98libraries" = dontDistribute super."haskell98libraries";
+  "haskelldb" = dontDistribute super."haskelldb";
+  "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc";
+  "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl";
+  "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf";
+  "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers";
+  "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted";
+  "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic";
+  "haskelldb-flat" = dontDistribute super."haskelldb-flat";
+  "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc";
+  "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql";
+  "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc";
+  "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql";
+  "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3";
+  "haskelldb-hsql" = dontDistribute super."haskelldb-hsql";
+  "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql";
+  "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc";
+  "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle";
+  "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql";
+  "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite";
+  "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3";
+  "haskelldb-th" = dontDistribute super."haskelldb-th";
+  "haskelldb-wx" = dontDistribute super."haskelldb-wx";
+  "haskellscrabble" = dontDistribute super."haskellscrabble";
+  "haskellscript" = dontDistribute super."haskellscript";
+  "haskelm" = dontDistribute super."haskelm";
+  "haskgame" = dontDistribute super."haskgame";
+  "haskheap" = dontDistribute super."haskheap";
+  "haskhol-core" = dontDistribute super."haskhol-core";
+  "haskmon" = dontDistribute super."haskmon";
+  "haskoin" = dontDistribute super."haskoin";
+  "haskoin-core" = dontDistribute super."haskoin-core";
+  "haskoin-crypto" = dontDistribute super."haskoin-crypto";
+  "haskoin-node" = dontDistribute super."haskoin-node";
+  "haskoin-protocol" = dontDistribute super."haskoin-protocol";
+  "haskoin-script" = dontDistribute super."haskoin-script";
+  "haskoin-util" = dontDistribute super."haskoin-util";
+  "haskoin-wallet" = dontDistribute super."haskoin-wallet";
+  "haskoon" = dontDistribute super."haskoon";
+  "haskoon-httpspec" = dontDistribute super."haskoon-httpspec";
+  "haskoon-salvia" = dontDistribute super."haskoon-salvia";
+  "haskore" = dontDistribute super."haskore";
+  "haskore-realtime" = dontDistribute super."haskore-realtime";
+  "haskore-supercollider" = dontDistribute super."haskore-supercollider";
+  "haskore-synthesizer" = dontDistribute super."haskore-synthesizer";
+  "haskore-vintage" = dontDistribute super."haskore-vintage";
+  "hasktags" = dontDistribute super."hasktags";
+  "haslo" = dontDistribute super."haslo";
+  "hasloGUI" = dontDistribute super."hasloGUI";
+  "hasparql-client" = dontDistribute super."hasparql-client";
+  "haspell" = dontDistribute super."haspell";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "hasql-postgres" = dontDistribute super."hasql-postgres";
+  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
+  "hasql-transaction" = dontDistribute super."hasql-transaction";
+  "hastache-aeson" = dontDistribute super."hastache-aeson";
+  "haste" = dontDistribute super."haste";
+  "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-markup" = dontDistribute super."haste-markup";
+  "haste-perch" = dontDistribute super."haste-perch";
+  "hastily" = dontDistribute super."hastily";
+  "hat" = dontDistribute super."hat";
+  "hatex-guide" = dontDistribute super."hatex-guide";
+  "hath" = dontDistribute super."hath";
+  "hatt" = dontDistribute super."hatt";
+  "haverer" = dontDistribute super."haverer";
+  "hawitter" = dontDistribute super."hawitter";
+  "haxl-amazonka" = dontDistribute super."haxl-amazonka";
+  "haxl-facebook" = dontDistribute super."haxl-facebook";
+  "haxparse" = dontDistribute super."haxparse";
+  "haxr-th" = dontDistribute super."haxr-th";
+  "haxy" = dontDistribute super."haxy";
+  "hayland" = dontDistribute super."hayland";
+  "hayoo-cli" = dontDistribute super."hayoo-cli";
+  "hback" = dontDistribute super."hback";
+  "hbayes" = dontDistribute super."hbayes";
+  "hbb" = dontDistribute super."hbb";
+  "hbcd" = dontDistribute super."hbcd";
+  "hbeat" = dontDistribute super."hbeat";
+  "hblas" = dontDistribute super."hblas";
+  "hblock" = dontDistribute super."hblock";
+  "hbro" = dontDistribute super."hbro";
+  "hbro-contrib" = dontDistribute super."hbro-contrib";
+  "hburg" = dontDistribute super."hburg";
+  "hcc" = dontDistribute super."hcc";
+  "hcg-minus" = dontDistribute super."hcg-minus";
+  "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo";
+  "hcheat" = dontDistribute super."hcheat";
+  "hchesslib" = dontDistribute super."hchesslib";
+  "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
+  "hcron" = dontDistribute super."hcron";
+  "hcube" = dontDistribute super."hcube";
+  "hcwiid" = dontDistribute super."hcwiid";
+  "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix";
+  "hdbc-aeson" = dontDistribute super."hdbc-aeson";
+  "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore";
+  "hdbc-tuple" = dontDistribute super."hdbc-tuple";
+  "hdbi" = dontDistribute super."hdbi";
+  "hdbi-conduit" = dontDistribute super."hdbi-conduit";
+  "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
+  "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
+  "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "hedis-config" = dontDistribute super."hedis-config";
+  "hedis-monadic" = dontDistribute super."hedis-monadic";
+  "hedis-pile" = dontDistribute super."hedis-pile";
+  "hedis-simple" = dontDistribute super."hedis-simple";
+  "hedis-tags" = dontDistribute super."hedis-tags";
+  "hedn" = dontDistribute super."hedn";
+  "hein" = dontDistribute super."hein";
+  "heist-aeson" = dontDistribute super."heist-aeson";
+  "heist-async" = dontDistribute super."heist-async";
+  "helics" = dontDistribute super."helics";
+  "helics-wai" = dontDistribute super."helics-wai";
+  "helisp" = dontDistribute super."helisp";
+  "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
+  "hell" = dontDistribute super."hell";
+  "hellage" = dontDistribute super."hellage";
+  "hellnet" = dontDistribute super."hellnet";
+  "hello" = dontDistribute super."hello";
+  "helm" = dontDistribute super."helm";
+  "help-esb" = dontDistribute super."help-esb";
+  "hemkay" = dontDistribute super."hemkay";
+  "hemkay-core" = dontDistribute super."hemkay-core";
+  "hemokit" = dontDistribute super."hemokit";
+  "hen" = dontDistribute super."hen";
+  "henet" = dontDistribute super."henet";
+  "hepevt" = dontDistribute super."hepevt";
+  "her-lexer" = dontDistribute super."her-lexer";
+  "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
+  "herbalizer" = dontDistribute super."herbalizer";
+  "herf-time" = dontDistribute super."herf-time";
+  "hermit" = dontDistribute super."hermit";
+  "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
+  "heroku" = dontDistribute super."heroku";
+  "heroku-persistent" = dontDistribute super."heroku-persistent";
+  "herringbone" = dontDistribute super."herringbone";
+  "herringbone-embed" = dontDistribute super."herringbone-embed";
+  "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesql" = dontDistribute super."hesql";
+  "hetero-map" = dontDistribute super."hetero-map";
+  "hetris" = dontDistribute super."hetris";
+  "heukarya" = dontDistribute super."heukarya";
+  "hevolisa" = dontDistribute super."hevolisa";
+  "hevolisa-dph" = dontDistribute super."hevolisa-dph";
+  "hexdump" = dontDistribute super."hexdump";
+  "hexif" = dontDistribute super."hexif";
+  "hexpat-iteratee" = dontDistribute super."hexpat-iteratee";
+  "hexpat-lens" = dontDistribute super."hexpat-lens";
+  "hexpat-pickle" = dontDistribute super."hexpat-pickle";
+  "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic";
+  "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup";
+  "hexpr" = dontDistribute super."hexpr";
+  "hexquote" = dontDistribute super."hexquote";
+  "heyefi" = dontDistribute super."heyefi";
+  "hfann" = dontDistribute super."hfann";
+  "hfd" = dontDistribute super."hfd";
+  "hfiar" = dontDistribute super."hfiar";
+  "hfmt" = dontDistribute super."hfmt";
+  "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
+  "hfov" = dontDistribute super."hfov";
+  "hfractal" = dontDistribute super."hfractal";
+  "hfusion" = dontDistribute super."hfusion";
+  "hg-buildpackage" = dontDistribute super."hg-buildpackage";
+  "hgal" = dontDistribute super."hgal";
+  "hgalib" = dontDistribute super."hgalib";
+  "hgdbmi" = dontDistribute super."hgdbmi";
+  "hgearman" = dontDistribute super."hgearman";
+  "hgen" = dontDistribute super."hgen";
+  "hgeometric" = dontDistribute super."hgeometric";
+  "hgeometry" = dontDistribute super."hgeometry";
+  "hgithub" = dontDistribute super."hgithub";
+  "hgl-example" = dontDistribute super."hgl-example";
+  "hgom" = dontDistribute super."hgom";
+  "hgopher" = dontDistribute super."hgopher";
+  "hgrev" = dontDistribute super."hgrev";
+  "hgrib" = dontDistribute super."hgrib";
+  "hharp" = dontDistribute super."hharp";
+  "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams";
+  "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions";
+  "hierarchy" = dontDistribute super."hierarchy";
+  "hiernotify" = dontDistribute super."hiernotify";
+  "highWaterMark" = dontDistribute super."highWaterMark";
+  "higher-leveldb" = dontDistribute super."higher-leveldb";
+  "higherorder" = dontDistribute super."higherorder";
+  "highlight-versions" = dontDistribute super."highlight-versions";
+  "highlighter" = dontDistribute super."highlighter";
+  "highlighter2" = dontDistribute super."highlighter2";
+  "hills" = dontDistribute super."hills";
+  "himerge" = dontDistribute super."himerge";
+  "himg" = dontDistribute super."himg";
+  "himpy" = dontDistribute super."himpy";
+  "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
+  "hinduce-classifier" = dontDistribute super."hinduce-classifier";
+  "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
+  "hinduce-examples" = dontDistribute super."hinduce-examples";
+  "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hipbot" = dontDistribute super."hipbot";
+  "hipe" = dontDistribute super."hipe";
+  "hips" = dontDistribute super."hips";
+  "hircules" = dontDistribute super."hircules";
+  "hirt" = dontDistribute super."hirt";
+  "hissmetrics" = dontDistribute super."hissmetrics";
+  "hist-pl" = dontDistribute super."hist-pl";
+  "hist-pl-dawg" = dontDistribute super."hist-pl-dawg";
+  "hist-pl-fusion" = dontDistribute super."hist-pl-fusion";
+  "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon";
+  "hist-pl-lmf" = dontDistribute super."hist-pl-lmf";
+  "hist-pl-transliter" = dontDistribute super."hist-pl-transliter";
+  "hist-pl-types" = dontDistribute super."hist-pl-types";
+  "histogram-fill-binary" = dontDistribute super."histogram-fill-binary";
+  "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal";
+  "historian" = dontDistribute super."historian";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "hjson-query" = dontDistribute super."hjson-query";
+  "hjsonpointer" = dontDistribute super."hjsonpointer";
+  "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlogger" = dontDistribute super."hlogger";
+  "hlongurl" = dontDistribute super."hlongurl";
+  "hls" = dontDistribute super."hls";
+  "hlwm" = dontDistribute super."hlwm";
+  "hly" = dontDistribute super."hly";
+  "hmark" = dontDistribute super."hmark";
+  "hmarkup" = dontDistribute super."hmarkup";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "hmatrix-repa" = dontDistribute super."hmatrix-repa";
+  "hmatrix-special" = dontDistribute super."hmatrix-special";
+  "hmatrix-static" = dontDistribute super."hmatrix-static";
+  "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc";
+  "hmatrix-syntax" = dontDistribute super."hmatrix-syntax";
+  "hmatrix-tests" = dontDistribute super."hmatrix-tests";
+  "hmeap" = dontDistribute super."hmeap";
+  "hmeap-utils" = dontDistribute super."hmeap-utils";
+  "hmemdb" = dontDistribute super."hmemdb";
+  "hmenu" = dontDistribute super."hmenu";
+  "hmidi" = dontDistribute super."hmidi";
+  "hmk" = dontDistribute super."hmk";
+  "hmm" = dontDistribute super."hmm";
+  "hmm-hmatrix" = dontDistribute super."hmm-hmatrix";
+  "hmp3" = dontDistribute super."hmp3";
+  "hmpfr" = dontDistribute super."hmpfr";
+  "hmt" = dontDistribute super."hmt";
+  "hmt-diagrams" = dontDistribute super."hmt-diagrams";
+  "hmumps" = dontDistribute super."hmumps";
+  "hnetcdf" = dontDistribute super."hnetcdf";
+  "hnix" = dontDistribute super."hnix";
+  "hnn" = dontDistribute super."hnn";
+  "hnop" = dontDistribute super."hnop";
+  "ho-rewriting" = dontDistribute super."ho-rewriting";
+  "hoauth" = dontDistribute super."hoauth";
+  "hob" = dontDistribute super."hob";
+  "hobbes" = dontDistribute super."hobbes";
+  "hobbits" = dontDistribute super."hobbits";
+  "hoe" = dontDistribute super."hoe";
+  "hofix-mtl" = dontDistribute super."hofix-mtl";
+  "hog" = dontDistribute super."hog";
+  "hogg" = dontDistribute super."hogg";
+  "hogre" = dontDistribute super."hogre";
+  "hogre-examples" = dontDistribute super."hogre-examples";
+  "hois" = dontDistribute super."hois";
+  "hoist-error" = dontDistribute super."hoist-error";
+  "hold-em" = dontDistribute super."hold-em";
+  "hole" = dontDistribute super."hole";
+  "holey-format" = dontDistribute super."holey-format";
+  "homeomorphic" = dontDistribute super."homeomorphic";
+  "hommage" = dontDistribute super."hommage";
+  "hommage-ds" = dontDistribute super."hommage-ds";
+  "homplexity" = dontDistribute super."homplexity";
+  "honi" = dontDistribute super."honi";
+  "honk" = dontDistribute super."honk";
+  "hoobuddy" = dontDistribute super."hoobuddy";
+  "hood" = dontDistribute super."hood";
+  "hood-off" = dontDistribute super."hood-off";
+  "hood2" = dontDistribute super."hood2";
+  "hoodie" = dontDistribute super."hoodie";
+  "hoodle" = dontDistribute super."hoodle";
+  "hoodle-builder" = dontDistribute super."hoodle-builder";
+  "hoodle-core" = dontDistribute super."hoodle-core";
+  "hoodle-extra" = dontDistribute super."hoodle-extra";
+  "hoodle-parser" = dontDistribute super."hoodle-parser";
+  "hoodle-publish" = dontDistribute super."hoodle-publish";
+  "hoodle-render" = dontDistribute super."hoodle-render";
+  "hoodle-types" = dontDistribute super."hoodle-types";
+  "hoogle-index" = dontDistribute super."hoogle-index";
+  "hooks-dir" = dontDistribute super."hooks-dir";
+  "hoovie" = dontDistribute super."hoovie";
+  "hopencc" = dontDistribute super."hopencc";
+  "hopencl" = dontDistribute super."hopencl";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "hosc-json" = dontDistribute super."hosc-json";
+  "hosc-utils" = dontDistribute super."hosc-utils";
+  "hosts-server" = dontDistribute super."hosts-server";
+  "hothasktags" = dontDistribute super."hothasktags";
+  "hotswap" = dontDistribute super."hotswap";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "hp2any-core" = dontDistribute super."hp2any-core";
+  "hp2any-graph" = dontDistribute super."hp2any-graph";
+  "hp2any-manager" = dontDistribute super."hp2any-manager";
+  "hp2html" = dontDistribute super."hp2html";
+  "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = dontDistribute super."hpack";
+  "hpaco" = dontDistribute super."hpaco";
+  "hpaco-lib" = dontDistribute super."hpaco-lib";
+  "hpage" = dontDistribute super."hpage";
+  "hpapi" = dontDistribute super."hpapi";
+  "hpaste" = dontDistribute super."hpaste";
+  "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "hprotoc-fork" = dontDistribute super."hprotoc-fork";
+  "hps" = dontDistribute super."hps";
+  "hps-cairo" = dontDistribute super."hps-cairo";
+  "hps-kmeans" = dontDistribute super."hps-kmeans";
+  "hpuz" = dontDistribute super."hpuz";
+  "hpygments" = dontDistribute super."hpygments";
+  "hpylos" = dontDistribute super."hpylos";
+  "hpyrg" = dontDistribute super."hpyrg";
+  "hquantlib" = dontDistribute super."hquantlib";
+  "hquery" = dontDistribute super."hquery";
+  "hranker" = dontDistribute super."hranker";
+  "hreader" = dontDistribute super."hreader";
+  "hricket" = dontDistribute super."hricket";
+  "hruby" = dontDistribute super."hruby";
+  "hs-GeoIP" = dontDistribute super."hs-GeoIP";
+  "hs-blake2" = dontDistribute super."hs-blake2";
+  "hs-captcha" = dontDistribute super."hs-captcha";
+  "hs-carbon" = dontDistribute super."hs-carbon";
+  "hs-carbon-examples" = dontDistribute super."hs-carbon-examples";
+  "hs-cdb" = dontDistribute super."hs-cdb";
+  "hs-dotnet" = dontDistribute super."hs-dotnet";
+  "hs-duktape" = dontDistribute super."hs-duktape";
+  "hs-excelx" = dontDistribute super."hs-excelx";
+  "hs-ffmpeg" = dontDistribute super."hs-ffmpeg";
+  "hs-fltk" = dontDistribute super."hs-fltk";
+  "hs-gchart" = dontDistribute super."hs-gchart";
+  "hs-gen-iface" = dontDistribute super."hs-gen-iface";
+  "hs-gizapp" = dontDistribute super."hs-gizapp";
+  "hs-inspector" = dontDistribute super."hs-inspector";
+  "hs-java" = dontDistribute super."hs-java";
+  "hs-json-rpc" = dontDistribute super."hs-json-rpc";
+  "hs-logo" = dontDistribute super."hs-logo";
+  "hs-mesos" = dontDistribute super."hs-mesos";
+  "hs-nombre-generator" = dontDistribute super."hs-nombre-generator";
+  "hs-pgms" = dontDistribute super."hs-pgms";
+  "hs-php-session" = dontDistribute super."hs-php-session";
+  "hs-pkg-config" = dontDistribute super."hs-pkg-config";
+  "hs-pkpass" = dontDistribute super."hs-pkpass";
+  "hs-re" = dontDistribute super."hs-re";
+  "hs-scrape" = dontDistribute super."hs-scrape";
+  "hs-twitter" = dontDistribute super."hs-twitter";
+  "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver";
+  "hs-vcard" = dontDistribute super."hs-vcard";
+  "hs2048" = dontDistribute super."hs2048";
+  "hs2bf" = dontDistribute super."hs2bf";
+  "hs2dot" = dontDistribute super."hs2dot";
+  "hsConfigure" = dontDistribute super."hsConfigure";
+  "hsSqlite3" = dontDistribute super."hsSqlite3";
+  "hsXenCtrl" = dontDistribute super."hsXenCtrl";
+  "hsay" = dontDistribute super."hsay";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "hsbackup" = dontDistribute super."hsbackup";
+  "hsbencher" = dontDistribute super."hsbencher";
+  "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed";
+  "hsbencher-fusion" = dontDistribute super."hsbencher-fusion";
+  "hsc2hs" = dontDistribute super."hsc2hs";
+  "hsc3" = dontDistribute super."hsc3";
+  "hsc3-auditor" = dontDistribute super."hsc3-auditor";
+  "hsc3-cairo" = dontDistribute super."hsc3-cairo";
+  "hsc3-data" = dontDistribute super."hsc3-data";
+  "hsc3-db" = dontDistribute super."hsc3-db";
+  "hsc3-dot" = dontDistribute super."hsc3-dot";
+  "hsc3-forth" = dontDistribute super."hsc3-forth";
+  "hsc3-graphs" = dontDistribute super."hsc3-graphs";
+  "hsc3-lang" = dontDistribute super."hsc3-lang";
+  "hsc3-lisp" = dontDistribute super."hsc3-lisp";
+  "hsc3-plot" = dontDistribute super."hsc3-plot";
+  "hsc3-process" = dontDistribute super."hsc3-process";
+  "hsc3-rec" = dontDistribute super."hsc3-rec";
+  "hsc3-rw" = dontDistribute super."hsc3-rw";
+  "hsc3-server" = dontDistribute super."hsc3-server";
+  "hsc3-sf" = dontDistribute super."hsc3-sf";
+  "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
+  "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
+  "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscamwire" = dontDistribute super."hscamwire";
+  "hscassandra" = dontDistribute super."hscassandra";
+  "hscd" = dontDistribute super."hscd";
+  "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "hsdif" = dontDistribute super."hsdif";
+  "hsdip" = dontDistribute super."hsdip";
+  "hsdns" = dontDistribute super."hsdns";
+  "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsemail-ns" = dontDistribute super."hsemail-ns";
+  "hsenv" = dontDistribute super."hsenv";
+  "hserv" = dontDistribute super."hserv";
+  "hset" = dontDistribute super."hset";
+  "hsfacter" = dontDistribute super."hsfacter";
+  "hsfcsh" = dontDistribute super."hsfcsh";
+  "hsfilt" = dontDistribute super."hsfilt";
+  "hsgnutls" = dontDistribute super."hsgnutls";
+  "hsgnutls-yj" = dontDistribute super."hsgnutls-yj";
+  "hsgsom" = dontDistribute super."hsgsom";
+  "hsgtd" = dontDistribute super."hsgtd";
+  "hsharc" = dontDistribute super."hsharc";
+  "hsilop" = dontDistribute super."hsilop";
+  "hsimport" = dontDistribute super."hsimport";
+  "hsini" = dontDistribute super."hsini";
+  "hskeleton" = dontDistribute super."hskeleton";
+  "hslackbuilder" = dontDistribute super."hslackbuilder";
+  "hslibsvm" = dontDistribute super."hslibsvm";
+  "hslinks" = dontDistribute super."hslinks";
+  "hslogger-reader" = dontDistribute super."hslogger-reader";
+  "hslogger-template" = dontDistribute super."hslogger-template";
+  "hslogger4j" = dontDistribute super."hslogger4j";
+  "hslogstash" = dontDistribute super."hslogstash";
+  "hsmagick" = dontDistribute super."hsmagick";
+  "hsmisc" = dontDistribute super."hsmisc";
+  "hsmtpclient" = dontDistribute super."hsmtpclient";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsnock" = dontDistribute super."hsnock";
+  "hsnoise" = dontDistribute super."hsnoise";
+  "hsns" = dontDistribute super."hsns";
+  "hsnsq" = dontDistribute super."hsnsq";
+  "hsntp" = dontDistribute super."hsntp";
+  "hsoptions" = dontDistribute super."hsoptions";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
+  "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
+  "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
+  "hspec-test-framework" = dontDistribute super."hspec-test-framework";
+  "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
+  "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec2" = dontDistribute super."hspec2";
+  "hspr-sh" = dontDistribute super."hspr-sh";
+  "hspread" = dontDistribute super."hspread";
+  "hspresent" = dontDistribute super."hspresent";
+  "hsprocess" = dontDistribute super."hsprocess";
+  "hsql" = dontDistribute super."hsql";
+  "hsql-mysql" = dontDistribute super."hsql-mysql";
+  "hsql-odbc" = dontDistribute super."hsql-odbc";
+  "hsql-postgresql" = dontDistribute super."hsql-postgresql";
+  "hsql-sqlite3" = dontDistribute super."hsql-sqlite3";
+  "hsqml" = dontDistribute super."hsqml";
+  "hsqml-datamodel" = dontDistribute super."hsqml-datamodel";
+  "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl";
+  "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris";
+  "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes";
+  "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples";
+  "hsqml-morris" = dontDistribute super."hsqml-morris";
+  "hsreadability" = dontDistribute super."hsreadability";
+  "hsseccomp" = dontDistribute super."hsseccomp";
+  "hsshellscript" = dontDistribute super."hsshellscript";
+  "hssourceinfo" = dontDistribute super."hssourceinfo";
+  "hssqlppp" = dontDistribute super."hssqlppp";
+  "hstats" = dontDistribute super."hstats";
+  "hstest" = dontDistribute super."hstest";
+  "hstidy" = dontDistribute super."hstidy";
+  "hstorchat" = dontDistribute super."hstorchat";
+  "hstradeking" = dontDistribute super."hstradeking";
+  "hstyle" = dontDistribute super."hstyle";
+  "hstzaar" = dontDistribute super."hstzaar";
+  "hsubconvert" = dontDistribute super."hsubconvert";
+  "hsverilog" = dontDistribute super."hsverilog";
+  "hswip" = dontDistribute super."hswip";
+  "hsx" = dontDistribute super."hsx";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htags" = dontDistribute super."htags";
+  "htar" = dontDistribute super."htar";
+  "htiled" = dontDistribute super."htiled";
+  "htime" = dontDistribute super."htime";
+  "html-email-validate" = dontDistribute super."html-email-validate";
+  "html-entities" = dontDistribute super."html-entities";
+  "html-kure" = dontDistribute super."html-kure";
+  "html-minimalist" = dontDistribute super."html-minimalist";
+  "html-rules" = dontDistribute super."html-rules";
+  "html-tokenizer" = dontDistribute super."html-tokenizer";
+  "html-truncate" = dontDistribute super."html-truncate";
+  "html2hamlet" = dontDistribute super."html2hamlet";
+  "html5-entity" = dontDistribute super."html5-entity";
+  "htodo" = dontDistribute super."htodo";
+  "htoml" = dontDistribute super."htoml";
+  "htrace" = dontDistribute super."htrace";
+  "hts" = dontDistribute super."hts";
+  "htsn" = dontDistribute super."htsn";
+  "htsn-common" = dontDistribute super."htsn-common";
+  "htsn-import" = dontDistribute super."htsn-import";
+  "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client-auth" = dontDistribute super."http-client-auth";
+  "http-client-conduit" = dontDistribute super."http-client-conduit";
+  "http-client-lens" = dontDistribute super."http-client-lens";
+  "http-client-multipart" = dontDistribute super."http-client-multipart";
+  "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers";
+  "http-client-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "http-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
+  "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
+  "httpspec" = dontDistribute super."httpspec";
+  "htune" = dontDistribute super."htune";
+  "htzaar" = dontDistribute super."htzaar";
+  "hub" = dontDistribute super."hub";
+  "hubigraph" = dontDistribute super."hubigraph";
+  "hubris" = dontDistribute super."hubris";
+  "huckleberry" = dontDistribute super."huckleberry";
+  "huffman" = dontDistribute super."huffman";
+  "hugs2yc" = dontDistribute super."hugs2yc";
+  "hulk" = dontDistribute super."hulk";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-gui" = dontDistribute super."hunit-gui";
+  "hunit-parsec" = dontDistribute super."hunit-parsec";
+  "hunit-rematch" = dontDistribute super."hunit-rematch";
+  "hunp" = dontDistribute super."hunp";
+  "hunt-searchengine" = dontDistribute super."hunt-searchengine";
+  "hunt-server" = dontDistribute super."hunt-server";
+  "hunt-server-cli" = dontDistribute super."hunt-server-cli";
+  "hurdle" = dontDistribute super."hurdle";
+  "husk-scheme" = dontDistribute super."husk-scheme";
+  "husk-scheme-libs" = dontDistribute super."husk-scheme-libs";
+  "husky" = dontDistribute super."husky";
+  "hutton" = dontDistribute super."hutton";
+  "huttons-razor" = dontDistribute super."huttons-razor";
+  "huzzy" = dontDistribute super."huzzy";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hws" = dontDistribute super."hws";
+  "hwsl2" = dontDistribute super."hwsl2";
+  "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector";
+  "hwsl2-reducers" = dontDistribute super."hwsl2-reducers";
+  "hx" = dontDistribute super."hx";
+  "hxmppc" = dontDistribute super."hxmppc";
+  "hxournal" = dontDistribute super."hxournal";
+  "hxt-binary" = dontDistribute super."hxt-binary";
+  "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-extras" = dontDistribute super."hxt-extras";
+  "hxt-filter" = dontDistribute super."hxt-filter";
+  "hxt-xpath" = dontDistribute super."hxt-xpath";
+  "hxt-xslt" = dontDistribute super."hxt-xslt";
+  "hxthelper" = dontDistribute super."hxthelper";
+  "hxweb" = dontDistribute super."hxweb";
+  "hyahtzee" = dontDistribute super."hyahtzee";
+  "hyakko" = dontDistribute super."hyakko";
+  "hybrid" = dontDistribute super."hybrid";
+  "hydra-hs" = dontDistribute super."hydra-hs";
+  "hydra-print" = dontDistribute super."hydra-print";
+  "hydrogen" = dontDistribute super."hydrogen";
+  "hydrogen-cli" = dontDistribute super."hydrogen-cli";
+  "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args";
+  "hydrogen-data" = dontDistribute super."hydrogen-data";
+  "hydrogen-multimap" = dontDistribute super."hydrogen-multimap";
+  "hydrogen-parsing" = dontDistribute super."hydrogen-parsing";
+  "hydrogen-prelude" = dontDistribute super."hydrogen-prelude";
+  "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec";
+  "hydrogen-syntax" = dontDistribute super."hydrogen-syntax";
+  "hydrogen-util" = dontDistribute super."hydrogen-util";
+  "hydrogen-version" = dontDistribute super."hydrogen-version";
+  "hyena" = dontDistribute super."hyena";
+  "hylolib" = dontDistribute super."hylolib";
+  "hylotab" = dontDistribute super."hylotab";
+  "hyloutils" = dontDistribute super."hyloutils";
+  "hyperdrive" = dontDistribute super."hyperdrive";
+  "hyperfunctions" = dontDistribute super."hyperfunctions";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
+  "hzk" = dontDistribute super."hzk";
+  "i18n" = dontDistribute super."i18n";
+  "iCalendar" = dontDistribute super."iCalendar";
+  "iException" = dontDistribute super."iException";
+  "iap-verifier" = dontDistribute super."iap-verifier";
+  "ib-api" = dontDistribute super."ib-api";
+  "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
+  "ideas" = dontDistribute super."ideas";
+  "ideas-math" = dontDistribute super."ideas-math";
+  "idempotent" = dontDistribute super."idempotent";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "ieee" = dontDistribute super."ieee";
+  "ieee-utils" = dontDistribute super."ieee-utils";
+  "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754-parser" = dontDistribute super."ieee754-parser";
+  "ifcxt" = dontDistribute super."ifcxt";
+  "iff" = dontDistribute super."iff";
+  "ifscs" = dontDistribute super."ifscs";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell-display" = dontDistribute super."ihaskell-display";
+  "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "imapget" = dontDistribute super."imapget";
+  "imbib" = dontDistribute super."imbib";
+  "imgurder" = dontDistribute super."imgurder";
+  "imm" = dontDistribute super."imm";
+  "imparse" = dontDistribute super."imparse";
+  "imperative-edsl" = dontDistribute super."imperative-edsl";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
+  "implicit" = dontDistribute super."implicit";
+  "implicit-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "indentparser" = dontDistribute super."indentparser";
+  "index-core" = dontDistribute super."index-core";
+  "indexed" = dontDistribute super."indexed";
+  "indexed-do-notation" = dontDistribute super."indexed-do-notation";
+  "indexed-extras" = dontDistribute super."indexed-extras";
+  "indexed-free" = dontDistribute super."indexed-free";
+  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
+  "indices" = dontDistribute super."indices";
+  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
+  "infer-upstream" = dontDistribute super."infer-upstream";
+  "infernu" = dontDistribute super."infernu";
+  "infinite-search" = dontDistribute super."infinite-search";
+  "infinity" = dontDistribute super."infinity";
+  "infix" = dontDistribute super."infix";
+  "inflist" = dontDistribute super."inflist";
+  "influxdb" = dontDistribute super."influxdb";
+  "informative" = dontDistribute super."informative";
+  "inilist" = dontDistribute super."inilist";
+  "inject" = dontDistribute super."inject";
+  "inject-function" = dontDistribute super."inject-function";
+  "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "instant-aeson" = dontDistribute super."instant-aeson";
+  "instant-bytes" = dontDistribute super."instant-bytes";
+  "instant-deepseq" = dontDistribute super."instant-deepseq";
+  "instant-generics" = dontDistribute super."instant-generics";
+  "instant-hashable" = dontDistribute super."instant-hashable";
+  "instant-zipper" = dontDistribute super."instant-zipper";
+  "instinct" = dontDistribute super."instinct";
+  "instrument-chord" = dontDistribute super."instrument-chord";
+  "int-cast" = dontDistribute super."int-cast";
+  "integer-pure" = dontDistribute super."integer-pure";
+  "intel-aes" = dontDistribute super."intel-aes";
+  "interchangeable" = dontDistribute super."interchangeable";
+  "interleavableGen" = dontDistribute super."interleavableGen";
+  "interleavableIO" = dontDistribute super."interleavableIO";
+  "interleave" = dontDistribute super."interleave";
+  "interlude" = dontDistribute super."interlude";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_3_1";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-streams-http" = dontDistribute super."io-streams-http";
+  "io-throttle" = dontDistribute super."io-throttle";
+  "ioctl" = dontDistribute super."ioctl";
+  "ioref-stable" = dontDistribute super."ioref-stable";
+  "iothread" = dontDistribute super."iothread";
+  "iotransaction" = dontDistribute super."iotransaction";
+  "ip-quoter" = dontDistribute super."ip-quoter";
+  "ipatch" = dontDistribute super."ipatch";
+  "ipc" = dontDistribute super."ipc";
+  "ipcvar" = dontDistribute super."ipcvar";
+  "ipopt-hs" = dontDistribute super."ipopt-hs";
+  "ipprint" = dontDistribute super."ipprint";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-fun-bot" = dontDistribute super."irc-fun-bot";
+  "irc-fun-client" = dontDistribute super."irc-fun-client";
+  "irc-fun-color" = dontDistribute super."irc-fun-color";
+  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "iron-mq" = dontDistribute super."iron-mq";
+  "ironforge" = dontDistribute super."ironforge";
+  "is" = dontDistribute super."is";
+  "isdicom" = dontDistribute super."isdicom";
+  "isevaluated" = dontDistribute super."isevaluated";
+  "isiz" = dontDistribute super."isiz";
+  "ismtp" = dontDistribute super."ismtp";
+  "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
+  "isohunt" = dontDistribute super."isohunt";
+  "itanium-abi" = dontDistribute super."itanium-abi";
+  "iter-stats" = dontDistribute super."iter-stats";
+  "iterIO" = dontDistribute super."iterIO";
+  "iteratee" = dontDistribute super."iteratee";
+  "iteratee-compress" = dontDistribute super."iteratee-compress";
+  "iteratee-mtl" = dontDistribute super."iteratee-mtl";
+  "iteratee-parsec" = dontDistribute super."iteratee-parsec";
+  "iteratee-stm" = dontDistribute super."iteratee-stm";
+  "iterio-server" = dontDistribute super."iterio-server";
+  "ivar-simple" = dontDistribute super."ivar-simple";
+  "ivor" = dontDistribute super."ivor";
+  "ivory" = dontDistribute super."ivory";
+  "ivory-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-examples" = dontDistribute super."ivory-examples";
+  "ivory-hw" = dontDistribute super."ivory-hw";
+  "ivory-opts" = dontDistribute super."ivory-opts";
+  "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-stdlib" = dontDistribute super."ivory-stdlib";
+  "ivy-web" = dontDistribute super."ivy-web";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "iyql" = dontDistribute super."iyql";
+  "j2hs" = dontDistribute super."j2hs";
+  "ja-base-extra" = dontDistribute super."ja-base-extra";
+  "jack" = dontDistribute super."jack";
+  "jack-bindings" = dontDistribute super."jack-bindings";
+  "jackminimix" = dontDistribute super."jackminimix";
+  "jacobi-roots" = dontDistribute super."jacobi-roots";
+  "jail" = dontDistribute super."jail";
+  "jailbreak-cabal" = dontDistribute super."jailbreak-cabal";
+  "jalaali" = dontDistribute super."jalaali";
+  "jalla" = dontDistribute super."jalla";
+  "jammittools" = dontDistribute super."jammittools";
+  "jarfind" = dontDistribute super."jarfind";
+  "java-bridge" = dontDistribute super."java-bridge";
+  "java-bridge-extras" = dontDistribute super."java-bridge-extras";
+  "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
+  "java-reflect" = dontDistribute super."java-reflect";
+  "javasf" = dontDistribute super."javasf";
+  "javav" = dontDistribute super."javav";
+  "jcdecaux-vls" = dontDistribute super."jcdecaux-vls";
+  "jdi" = dontDistribute super."jdi";
+  "jespresso" = dontDistribute super."jespresso";
+  "jobqueue" = dontDistribute super."jobqueue";
+  "join" = dontDistribute super."join";
+  "joinlist" = dontDistribute super."joinlist";
+  "jonathanscard" = dontDistribute super."jonathanscard";
+  "jort" = dontDistribute super."jort";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-b" = dontDistribute super."json-b";
+  "json-encoder" = dontDistribute super."json-encoder";
+  "json-enumerator" = dontDistribute super."json-enumerator";
+  "json-extra" = dontDistribute super."json-extra";
+  "json-fu" = dontDistribute super."json-fu";
+  "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
+  "json-python" = dontDistribute super."json-python";
+  "json-qq" = dontDistribute super."json-qq";
+  "json-rpc" = dontDistribute super."json-rpc";
+  "json-rpc-client" = dontDistribute super."json-rpc-client";
+  "json-rpc-server" = dontDistribute super."json-rpc-server";
+  "json-sop" = dontDistribute super."json-sop";
+  "json-state" = dontDistribute super."json-state";
+  "json-stream" = dontDistribute super."json-stream";
+  "json-togo" = dontDistribute super."json-togo";
+  "json-tools" = dontDistribute super."json-tools";
+  "json-types" = dontDistribute super."json-types";
+  "json2" = dontDistribute super."json2";
+  "json2-hdbc" = dontDistribute super."json2-hdbc";
+  "json2-types" = dontDistribute super."json2-types";
+  "json2yaml" = dontDistribute super."json2yaml";
+  "jsonresume" = dontDistribute super."jsonresume";
+  "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit";
+  "jsonschema-gen" = dontDistribute super."jsonschema-gen";
+  "jsonsql" = dontDistribute super."jsonsql";
+  "jsontsv" = dontDistribute super."jsontsv";
+  "jspath" = dontDistribute super."jspath";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-lava" = dontDistribute super."kansas-lava";
+  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
+  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
+  "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
+  "karakuri" = dontDistribute super."karakuri";
+  "karver" = dontDistribute super."karver";
+  "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
+  "kbq-gu" = dontDistribute super."kbq-gu";
+  "kd-tree" = dontDistribute super."kd-tree";
+  "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
+  "keera-callbacks" = dontDistribute super."keera-callbacks";
+  "keera-hails-i18n" = dontDistribute super."keera-hails-i18n";
+  "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller";
+  "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk";
+  "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel";
+  "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel";
+  "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config";
+  "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk";
+  "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view";
+  "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk";
+  "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs";
+  "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk";
+  "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network";
+  "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling";
+  "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx";
+  "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa";
+  "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses";
+  "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues";
+  "keera-posture" = dontDistribute super."keera-posture";
+  "keiretsu" = dontDistribute super."keiretsu";
+  "kevin" = dontDistribute super."kevin";
+  "keyed" = dontDistribute super."keyed";
+  "keyring" = dontDistribute super."keyring";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "kibro" = dontDistribute super."kibro";
+  "kicad-data" = dontDistribute super."kicad-data";
+  "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
+  "kickchan" = dontDistribute super."kickchan";
+  "kif-parser" = dontDistribute super."kif-parser";
+  "kinds" = dontDistribute super."kinds";
+  "kit" = dontDistribute super."kit";
+  "kmeans-par" = dontDistribute super."kmeans-par";
+  "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knots" = dontDistribute super."knots";
+  "koellner-phonetic" = dontDistribute super."koellner-phonetic";
+  "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
+  "korfu" = dontDistribute super."korfu";
+  "kqueue" = dontDistribute super."kqueue";
+  "krpc" = dontDistribute super."krpc";
+  "ks-test" = dontDistribute super."ks-test";
+  "ktx" = dontDistribute super."ktx";
+  "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate";
+  "kyotocabinet" = dontDistribute super."kyotocabinet";
+  "l-bfgs-b" = dontDistribute super."l-bfgs-b";
+  "labeled-graph" = dontDistribute super."labeled-graph";
+  "labeled-tree" = dontDistribute super."labeled-tree";
+  "laborantin-hs" = dontDistribute super."laborantin-hs";
+  "labyrinth" = dontDistribute super."labyrinth";
+  "labyrinth-server" = dontDistribute super."labyrinth-server";
+  "lackey" = dontDistribute super."lackey";
+  "lagrangian" = dontDistribute super."lagrangian";
+  "laika" = dontDistribute super."laika";
+  "lambda-ast" = dontDistribute super."lambda-ast";
+  "lambda-bridge" = dontDistribute super."lambda-bridge";
+  "lambda-canvas" = dontDistribute super."lambda-canvas";
+  "lambda-devs" = dontDistribute super."lambda-devs";
+  "lambda-options" = dontDistribute super."lambda-options";
+  "lambda-placeholders" = dontDistribute super."lambda-placeholders";
+  "lambda-toolbox" = dontDistribute super."lambda-toolbox";
+  "lambda2js" = dontDistribute super."lambda2js";
+  "lambdaBase" = dontDistribute super."lambdaBase";
+  "lambdaFeed" = dontDistribute super."lambdaFeed";
+  "lambdaLit" = dontDistribute super."lambdaLit";
+  "lambdabot" = dontDistribute super."lambdabot";
+  "lambdabot-core" = dontDistribute super."lambdabot-core";
+  "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins";
+  "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins";
+  "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins";
+  "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins";
+  "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins";
+  "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins";
+  "lambdabot-trusted" = dontDistribute super."lambdabot-trusted";
+  "lambdabot-utils" = dontDistribute super."lambdabot-utils";
+  "lambdacat" = dontDistribute super."lambdacat";
+  "lambdacms-core" = dontDistribute super."lambdacms-core";
+  "lambdacms-media" = dontDistribute super."lambdacms-media";
+  "lambdacube" = dontDistribute super."lambdacube";
+  "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
+  "lambdacube-core" = dontDistribute super."lambdacube-core";
+  "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
+  "lambdacube-engine" = dontDistribute super."lambdacube-engine";
+  "lambdacube-examples" = dontDistribute super."lambdacube-examples";
+  "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "lambdiff" = dontDistribute super."lambdiff";
+  "lame-tester" = dontDistribute super."lame-tester";
+  "language-asn1" = dontDistribute super."language-asn1";
+  "language-bash" = dontDistribute super."language-bash";
+  "language-boogie" = dontDistribute super."language-boogie";
+  "language-c-comments" = dontDistribute super."language-c-comments";
+  "language-c-inline" = dontDistribute super."language-c-inline";
+  "language-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
+  "language-eiffel" = dontDistribute super."language-eiffel";
+  "language-fortran" = dontDistribute super."language-fortran";
+  "language-gcl" = dontDistribute super."language-gcl";
+  "language-go" = dontDistribute super."language-go";
+  "language-guess" = dontDistribute super."language-guess";
+  "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-kort" = dontDistribute super."language-kort";
+  "language-lua" = dontDistribute super."language-lua";
+  "language-lua-qq" = dontDistribute super."language-lua-qq";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-objc" = dontDistribute super."language-objc";
+  "language-openscad" = dontDistribute super."language-openscad";
+  "language-pig" = dontDistribute super."language-pig";
+  "language-puppet" = dontDistribute super."language-puppet";
+  "language-python" = dontDistribute super."language-python";
+  "language-python-colour" = dontDistribute super."language-python-colour";
+  "language-python-test" = dontDistribute super."language-python-test";
+  "language-qux" = dontDistribute super."language-qux";
+  "language-sh" = dontDistribute super."language-sh";
+  "language-slice" = dontDistribute super."language-slice";
+  "language-spelling" = dontDistribute super."language-spelling";
+  "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "launchpad-control" = dontDistribute super."launchpad-control";
+  "lax" = dontDistribute super."lax";
+  "layers" = dontDistribute super."layers";
+  "layers-game" = dontDistribute super."layers-game";
+  "layout" = dontDistribute super."layout";
+  "layout-bootstrap" = dontDistribute super."layout-bootstrap";
+  "lazy-io" = dontDistribute super."lazy-io";
+  "lazyarray" = dontDistribute super."lazyarray";
+  "lazyio" = dontDistribute super."lazyio";
+  "lazysmallcheck" = dontDistribute super."lazysmallcheck";
+  "lazysplines" = dontDistribute super."lazysplines";
+  "lbfgs" = dontDistribute super."lbfgs";
+  "lcs" = dontDistribute super."lcs";
+  "lda" = dontDistribute super."lda";
+  "ldap-client" = dontDistribute super."ldap-client";
+  "ldif" = dontDistribute super."ldif";
+  "leaf" = dontDistribute super."leaf";
+  "leaky" = dontDistribute super."leaky";
+  "leankit-api" = dontDistribute super."leankit-api";
+  "leapseconds-announced" = dontDistribute super."leapseconds-announced";
+  "learn" = dontDistribute super."learn";
+  "learn-physics" = dontDistribute super."learn-physics";
+  "learn-physics-examples" = dontDistribute super."learn-physics-examples";
+  "learning-hmm" = dontDistribute super."learning-hmm";
+  "leetify" = dontDistribute super."leetify";
+  "leksah" = dontDistribute super."leksah";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-sop" = dontDistribute super."lens-sop";
+  "lens-text-encoding" = dontDistribute super."lens-text-encoding";
+  "lens-time" = dontDistribute super."lens-time";
+  "lens-tutorial" = dontDistribute super."lens-tutorial";
+  "lens-utils" = dontDistribute super."lens-utils";
+  "lenses" = dontDistribute super."lenses";
+  "lensref" = dontDistribute super."lensref";
+  "lenz" = dontDistribute super."lenz";
+  "lenz-template" = dontDistribute super."lenz-template";
+  "level-monad" = dontDistribute super."level-monad";
+  "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
+  "levmar" = dontDistribute super."levmar";
+  "levmar-chart" = dontDistribute super."levmar-chart";
+  "lgtk" = dontDistribute super."lgtk";
+  "lha" = dontDistribute super."lha";
+  "lhae" = dontDistribute super."lhae";
+  "lhc" = dontDistribute super."lhc";
+  "lhe" = dontDistribute super."lhe";
+  "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl";
+  "lhs2html" = dontDistribute super."lhs2html";
+  "lhslatex" = dontDistribute super."lhslatex";
+  "libGenI" = dontDistribute super."libGenI";
+  "libarchive-conduit" = dontDistribute super."libarchive-conduit";
+  "libconfig" = dontDistribute super."libconfig";
+  "libcspm" = dontDistribute super."libcspm";
+  "libexpect" = dontDistribute super."libexpect";
+  "libffi" = dontDistribute super."libffi";
+  "libgraph" = dontDistribute super."libgraph";
+  "libhbb" = dontDistribute super."libhbb";
+  "libjenkins" = dontDistribute super."libjenkins";
+  "liblastfm" = dontDistribute super."liblastfm";
+  "liblinear-enumerator" = dontDistribute super."liblinear-enumerator";
+  "libltdl" = dontDistribute super."libltdl";
+  "libmpd" = dontDistribute super."libmpd";
+  "libnvvm" = dontDistribute super."libnvvm";
+  "liboleg" = dontDistribute super."liboleg";
+  "libpafe" = dontDistribute super."libpafe";
+  "libpq" = dontDistribute super."libpq";
+  "librandomorg" = dontDistribute super."librandomorg";
+  "libravatar" = dontDistribute super."libravatar";
+  "libssh2" = dontDistribute super."libssh2";
+  "libssh2-conduit" = dontDistribute super."libssh2-conduit";
+  "libstackexchange" = dontDistribute super."libstackexchange";
+  "libsystemd-daemon" = dontDistribute super."libsystemd-daemon";
+  "libtagc" = dontDistribute super."libtagc";
+  "libvirt-hs" = dontDistribute super."libvirt-hs";
+  "libvorbis" = dontDistribute super."libvorbis";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-threads" = dontDistribute super."lifted-threads";
+  "lifter" = dontDistribute super."lifter";
+  "ligature" = dontDistribute super."ligature";
+  "ligd" = dontDistribute super."ligd";
+  "lighttpd-conf" = dontDistribute super."lighttpd-conf";
+  "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq";
+  "lilypond" = dontDistribute super."lilypond";
+  "limp" = dontDistribute super."limp";
+  "limp-cbc" = dontDistribute super."limp-cbc";
+  "lin-alg" = dontDistribute super."lin-alg";
+  "linda" = dontDistribute super."linda";
+  "lindenmayer" = dontDistribute super."lindenmayer";
+  "line-break" = dontDistribute super."line-break";
+  "line2pdf" = dontDistribute super."line2pdf";
+  "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
+  "linear-circuit" = dontDistribute super."linear-circuit";
+  "linear-grammar" = dontDistribute super."linear-grammar";
+  "linear-maps" = dontDistribute super."linear-maps";
+  "linear-opengl" = dontDistribute super."linear-opengl";
+  "linear-vect" = dontDistribute super."linear-vect";
+  "linearEqSolver" = dontDistribute super."linearEqSolver";
+  "linearscan" = dontDistribute super."linearscan";
+  "linearscan-hoopl" = dontDistribute super."linearscan-hoopl";
+  "linebreak" = dontDistribute super."linebreak";
+  "linguistic-ordinals" = dontDistribute super."linguistic-ordinals";
+  "link-relations" = dontDistribute super."link-relations";
+  "linkchk" = dontDistribute super."linkchk";
+  "linkcore" = dontDistribute super."linkcore";
+  "linkedhashmap" = dontDistribute super."linkedhashmap";
+  "linklater" = dontDistribute super."linklater";
+  "linode" = dontDistribute super."linode";
+  "linux-blkid" = dontDistribute super."linux-blkid";
+  "linux-cgroup" = dontDistribute super."linux-cgroup";
+  "linux-evdev" = dontDistribute super."linux-evdev";
+  "linux-inotify" = dontDistribute super."linux-inotify";
+  "linux-kmod" = dontDistribute super."linux-kmod";
+  "linux-mount" = dontDistribute super."linux-mount";
+  "linux-perf" = dontDistribute super."linux-perf";
+  "linux-ptrace" = dontDistribute super."linux-ptrace";
+  "linux-xattr" = dontDistribute super."linux-xattr";
+  "linx-gateway" = dontDistribute super."linx-gateway";
+  "lio" = dontDistribute super."lio";
+  "lio-eci11" = dontDistribute super."lio-eci11";
+  "lio-fs" = dontDistribute super."lio-fs";
+  "lio-simple" = dontDistribute super."lio-simple";
+  "lipsum-gen" = dontDistribute super."lipsum-gen";
+  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
+  "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "lispparser" = dontDistribute super."lispparser";
+  "list-extras" = dontDistribute super."list-extras";
+  "list-grouping" = dontDistribute super."list-grouping";
+  "list-mux" = dontDistribute super."list-mux";
+  "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
+  "list-t-html-parser" = dontDistribute super."list-t-html-parser";
+  "list-t-http-client" = dontDistribute super."list-t-http-client";
+  "list-t-libcurl" = dontDistribute super."list-t-libcurl";
+  "list-t-text" = dontDistribute super."list-t-text";
+  "list-tries" = dontDistribute super."list-tries";
+  "list-zip-def" = dontDistribute super."list-zip-def";
+  "listlike-instances" = dontDistribute super."listlike-instances";
+  "lists" = dontDistribute super."lists";
+  "listsafe" = dontDistribute super."listsafe";
+  "lit" = dontDistribute super."lit";
+  "literals" = dontDistribute super."literals";
+  "live-sequencer" = dontDistribute super."live-sequencer";
+  "ll-picosat" = dontDistribute super."ll-picosat";
+  "llrbtree" = dontDistribute super."llrbtree";
+  "llsd" = dontDistribute super."llsd";
+  "llvm" = dontDistribute super."llvm";
+  "llvm-analysis" = dontDistribute super."llvm-analysis";
+  "llvm-base" = dontDistribute super."llvm-base";
+  "llvm-base-types" = dontDistribute super."llvm-base-types";
+  "llvm-base-util" = dontDistribute super."llvm-base-util";
+  "llvm-data-interop" = dontDistribute super."llvm-data-interop";
+  "llvm-extra" = dontDistribute super."llvm-extra";
+  "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-general" = dontDistribute super."llvm-general";
+  "llvm-general-pure" = dontDistribute super."llvm-general-pure";
+  "llvm-general-quote" = dontDistribute super."llvm-general-quote";
+  "llvm-ht" = dontDistribute super."llvm-ht";
+  "llvm-pkg-config" = dontDistribute super."llvm-pkg-config";
+  "llvm-pretty" = dontDistribute super."llvm-pretty";
+  "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser";
+  "llvm-tf" = dontDistribute super."llvm-tf";
+  "llvm-tools" = dontDistribute super."llvm-tools";
+  "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
+  "load-env" = dontDistribute super."load-env";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "located-base" = dontDistribute super."located-base";
+  "locators" = dontDistribute super."locators";
+  "loch" = dontDistribute super."loch";
+  "lock-file" = dontDistribute super."lock-file";
+  "locked-poll" = dontDistribute super."locked-poll";
+  "lockfree-queue" = dontDistribute super."lockfree-queue";
+  "log" = dontDistribute super."log";
+  "log-effect" = dontDistribute super."log-effect";
+  "log2json" = dontDistribute super."log2json";
+  "logfloat" = dontDistribute super."logfloat";
+  "logger" = dontDistribute super."logger";
+  "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade-journald" = dontDistribute super."logging-facade-journald";
+  "logic-TPTP" = dontDistribute super."logic-TPTP";
+  "logic-classes" = dontDistribute super."logic-classes";
+  "logicst" = dontDistribute super."logicst";
+  "logplex-parse" = dontDistribute super."logplex-parse";
+  "logsink" = dontDistribute super."logsink";
+  "lojban" = dontDistribute super."lojban";
+  "lojbanParser" = dontDistribute super."lojbanParser";
+  "lojbanXiragan" = dontDistribute super."lojbanXiragan";
+  "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
+  "loli" = dontDistribute super."loli";
+  "lookup-tables" = dontDistribute super."lookup-tables";
+  "loop-effin" = dontDistribute super."loop-effin";
+  "loop-while" = dontDistribute super."loop-while";
+  "loops" = dontDistribute super."loops";
+  "loopy" = dontDistribute super."loopy";
+  "lord" = dontDistribute super."lord";
+  "lorem" = dontDistribute super."lorem";
+  "loris" = dontDistribute super."loris";
+  "loshadka" = dontDistribute super."loshadka";
+  "lostcities" = dontDistribute super."lostcities";
+  "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
+  "ls-usb" = dontDistribute super."ls-usb";
+  "lscabal" = dontDistribute super."lscabal";
+  "lss" = dontDistribute super."lss";
+  "lsystem" = dontDistribute super."lsystem";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "lua-bytecode" = dontDistribute super."lua-bytecode";
+  "luachunk" = dontDistribute super."luachunk";
+  "luautils" = dontDistribute super."luautils";
+  "lub" = dontDistribute super."lub";
+  "lucid-foundation" = dontDistribute super."lucid-foundation";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luka" = dontDistribute super."luka";
+  "lushtags" = dontDistribute super."lushtags";
+  "luthor" = dontDistribute super."luthor";
+  "lvish" = dontDistribute super."lvish";
+  "lvmlib" = dontDistribute super."lvmlib";
+  "lvmrun" = dontDistribute super."lvmrun";
+  "lxc" = dontDistribute super."lxc";
+  "lye" = dontDistribute super."lye";
+  "lz4" = dontDistribute super."lz4";
+  "lzma" = dontDistribute super."lzma";
+  "lzma-clib" = dontDistribute super."lzma-clib";
+  "lzma-enumerator" = dontDistribute super."lzma-enumerator";
+  "lzma-streams" = dontDistribute super."lzma-streams";
+  "maam" = dontDistribute super."maam";
+  "mac" = dontDistribute super."mac";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "machines-zlib" = dontDistribute super."machines-zlib";
+  "macho" = dontDistribute super."macho";
+  "maclight" = dontDistribute super."maclight";
+  "macosx-make-standalone" = dontDistribute super."macosx-make-standalone";
+  "mage" = dontDistribute super."mage";
+  "magico" = dontDistribute super."magico";
+  "magma" = dontDistribute super."magma";
+  "mahoro" = dontDistribute super."mahoro";
+  "maid" = dontDistribute super."maid";
+  "mailbox-count" = dontDistribute super."mailbox-count";
+  "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
+  "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "majordomo" = dontDistribute super."majordomo";
+  "majority" = dontDistribute super."majority";
+  "make-hard-links" = dontDistribute super."make-hard-links";
+  "make-package" = dontDistribute super."make-package";
+  "makedo" = dontDistribute super."makedo";
+  "manatee" = dontDistribute super."manatee";
+  "manatee-all" = dontDistribute super."manatee-all";
+  "manatee-anything" = dontDistribute super."manatee-anything";
+  "manatee-browser" = dontDistribute super."manatee-browser";
+  "manatee-core" = dontDistribute super."manatee-core";
+  "manatee-curl" = dontDistribute super."manatee-curl";
+  "manatee-editor" = dontDistribute super."manatee-editor";
+  "manatee-filemanager" = dontDistribute super."manatee-filemanager";
+  "manatee-imageviewer" = dontDistribute super."manatee-imageviewer";
+  "manatee-ircclient" = dontDistribute super."manatee-ircclient";
+  "manatee-mplayer" = dontDistribute super."manatee-mplayer";
+  "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer";
+  "manatee-processmanager" = dontDistribute super."manatee-processmanager";
+  "manatee-reader" = dontDistribute super."manatee-reader";
+  "manatee-template" = dontDistribute super."manatee-template";
+  "manatee-terminal" = dontDistribute super."manatee-terminal";
+  "manatee-welcome" = dontDistribute super."manatee-welcome";
+  "mancala" = dontDistribute super."mancala";
+  "mandulia" = dontDistribute super."mandulia";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
+  "marionetta" = dontDistribute super."marionetta";
+  "markdown-kate" = dontDistribute super."markdown-kate";
+  "markdown-pap" = dontDistribute super."markdown-pap";
+  "markdown2svg" = dontDistribute super."markdown2svg";
+  "marked-pretty" = dontDistribute super."marked-pretty";
+  "markov" = dontDistribute super."markov";
+  "markov-chain" = dontDistribute super."markov-chain";
+  "markov-processes" = dontDistribute super."markov-processes";
+  "markup-preview" = dontDistribute super."markup-preview";
+  "marmalade-upload" = dontDistribute super."marmalade-upload";
+  "marquise" = dontDistribute super."marquise";
+  "marxup" = dontDistribute super."marxup";
+  "masakazu-bot" = dontDistribute super."masakazu-bot";
+  "mastermind" = dontDistribute super."mastermind";
+  "matchers" = dontDistribute super."matchers";
+  "mathblog" = dontDistribute super."mathblog";
+  "mathgenealogy" = dontDistribute super."mathgenealogy";
+  "mathista" = dontDistribute super."mathista";
+  "mathlink" = dontDistribute super."mathlink";
+  "matlab" = dontDistribute super."matlab";
+  "matrix-market" = dontDistribute super."matrix-market";
+  "matrix-market-pure" = dontDistribute super."matrix-market-pure";
+  "matsuri" = dontDistribute super."matsuri";
+  "maude" = dontDistribute super."maude";
+  "maxent" = dontDistribute super."maxent";
+  "maxsharing" = dontDistribute super."maxsharing";
+  "maybe-justify" = dontDistribute super."maybe-justify";
+  "maybench" = dontDistribute super."maybench";
+  "mbox-tools" = dontDistribute super."mbox-tools";
+  "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples";
+  "mcmc-samplers" = dontDistribute super."mcmc-samplers";
+  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
+  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
+  "mdcat" = dontDistribute super."mdcat";
+  "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
+  "mecab" = dontDistribute super."mecab";
+  "mecha" = dontDistribute super."mecha";
+  "mediawiki" = dontDistribute super."mediawiki";
+  "mediawiki2latex" = dontDistribute super."mediawiki2latex";
+  "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
+  "meep" = dontDistribute super."meep";
+  "mega-sdist" = dontDistribute super."mega-sdist";
+  "meldable-heap" = dontDistribute super."meldable-heap";
+  "melody" = dontDistribute super."melody";
+  "memcache" = dontDistribute super."memcache";
+  "memcache-conduit" = dontDistribute super."memcache-conduit";
+  "memcache-haskell" = dontDistribute super."memcache-haskell";
+  "memcached" = dontDistribute super."memcached";
+  "memexml" = dontDistribute super."memexml";
+  "memo-ptr" = dontDistribute super."memo-ptr";
+  "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memscript" = dontDistribute super."memscript";
+  "mersenne-random" = dontDistribute super."mersenne-random";
+  "messente" = dontDistribute super."messente";
+  "meta-misc" = dontDistribute super."meta-misc";
+  "meta-par" = dontDistribute super."meta-par";
+  "meta-par-accelerate" = dontDistribute super."meta-par-accelerate";
+  "metadata" = dontDistribute super."metadata";
+  "metamorphic" = dontDistribute super."metamorphic";
+  "metaplug" = dontDistribute super."metaplug";
+  "metric" = dontDistribute super."metric";
+  "metricsd-client" = dontDistribute super."metricsd-client";
+  "metronome" = dontDistribute super."metronome";
+  "mezzolens" = dontDistribute super."mezzolens";
+  "mfsolve" = dontDistribute super."mfsolve";
+  "mgeneric" = dontDistribute super."mgeneric";
+  "mi" = dontDistribute super."mi";
+  "microbench" = dontDistribute super."microbench";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microtimer" = dontDistribute super."microtimer";
+  "mida" = dontDistribute super."mida";
+  "midi" = dontDistribute super."midi";
+  "midi-alsa" = dontDistribute super."midi-alsa";
+  "midi-music-box" = dontDistribute super."midi-music-box";
+  "midi-util" = dontDistribute super."midi-util";
+  "midimory" = dontDistribute super."midimory";
+  "midisurface" = dontDistribute super."midisurface";
+  "mighttpd" = dontDistribute super."mighttpd";
+  "mighttpd2" = dontDistribute super."mighttpd2";
+  "mikmod" = dontDistribute super."mikmod";
+  "miku" = dontDistribute super."miku";
+  "milena" = dontDistribute super."milena";
+  "mime" = dontDistribute super."mime";
+  "mime-directory" = dontDistribute super."mime-directory";
+  "mime-string" = dontDistribute super."mime-string";
+  "mines" = dontDistribute super."mines";
+  "minesweeper" = dontDistribute super."minesweeper";
+  "miniball" = dontDistribute super."miniball";
+  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
+  "minimal-configuration" = dontDistribute super."minimal-configuration";
+  "minimorph" = dontDistribute super."minimorph";
+  "minimung" = dontDistribute super."minimung";
+  "minions" = dontDistribute super."minions";
+  "minioperational" = dontDistribute super."minioperational";
+  "miniplex" = dontDistribute super."miniplex";
+  "minirotate" = dontDistribute super."minirotate";
+  "minisat" = dontDistribute super."minisat";
+  "ministg" = dontDistribute super."ministg";
+  "miniutter" = dontDistribute super."miniutter";
+  "minst-idx" = dontDistribute super."minst-idx";
+  "mirror-tweet" = dontDistribute super."mirror-tweet";
+  "missing-py2" = dontDistribute super."missing-py2";
+  "mix-arrows" = dontDistribute super."mix-arrows";
+  "mixed-strategies" = dontDistribute super."mixed-strategies";
+  "mkbndl" = dontDistribute super."mkbndl";
+  "mkcabal" = dontDistribute super."mkcabal";
+  "ml-w" = dontDistribute super."ml-w";
+  "mlist" = dontDistribute super."mlist";
+  "mmtl" = dontDistribute super."mmtl";
+  "mmtl-base" = dontDistribute super."mmtl-base";
+  "moan" = dontDistribute super."moan";
+  "modbus-tcp" = dontDistribute super."modbus-tcp";
+  "modelicaparser" = dontDistribute super."modelicaparser";
+  "modsplit" = dontDistribute super."modsplit";
+  "modular-arithmetic" = dontDistribute super."modular-arithmetic";
+  "modular-prelude" = dontDistribute super."modular-prelude";
+  "modular-prelude-classy" = dontDistribute super."modular-prelude-classy";
+  "module-management" = dontDistribute super."module-management";
+  "modulespection" = dontDistribute super."modulespection";
+  "modulo" = dontDistribute super."modulo";
+  "moe" = dontDistribute super."moe";
+  "mohws" = dontDistribute super."mohws";
+  "monad-abort-fd" = dontDistribute super."monad-abort-fd";
+  "monad-atom" = dontDistribute super."monad-atom";
+  "monad-atom-simple" = dontDistribute super."monad-atom-simple";
+  "monad-bool" = dontDistribute super."monad-bool";
+  "monad-classes" = dontDistribute super."monad-classes";
+  "monad-codec" = dontDistribute super."monad-codec";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_2";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "monad-loops-stm" = dontDistribute super."monad-loops-stm";
+  "monad-lrs" = dontDistribute super."monad-lrs";
+  "monad-memo" = dontDistribute super."monad-memo";
+  "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
+  "monad-open" = dontDistribute super."monad-open";
+  "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_1";
+  "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
+  "monad-param" = dontDistribute super."monad-param";
+  "monad-ran" = dontDistribute super."monad-ran";
+  "monad-resumption" = dontDistribute super."monad-resumption";
+  "monad-state" = dontDistribute super."monad-state";
+  "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
+  "monad-supply" = dontDistribute super."monad-supply";
+  "monad-task" = dontDistribute super."monad-task";
+  "monad-tx" = dontDistribute super."monad-tx";
+  "monad-unify" = dontDistribute super."monad-unify";
+  "monad-wrap" = dontDistribute super."monad-wrap";
+  "monadIO" = dontDistribute super."monadIO";
+  "monadLib-compose" = dontDistribute super."monadLib-compose";
+  "monadacme" = dontDistribute super."monadacme";
+  "monadbi" = dontDistribute super."monadbi";
+  "monadfibre" = dontDistribute super."monadfibre";
+  "monadiccp" = dontDistribute super."monadiccp";
+  "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
+  "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
+  "monadlist" = dontDistribute super."monadlist";
+  "monadloc-pp" = dontDistribute super."monadloc-pp";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidplus" = dontDistribute super."monoidplus";
+  "monoids" = dontDistribute super."monoids";
+  "monomorphic" = dontDistribute super."monomorphic";
+  "montage" = dontDistribute super."montage";
+  "montage-client" = dontDistribute super."montage-client";
+  "monte-carlo" = dontDistribute super."monte-carlo";
+  "moo" = dontDistribute super."moo";
+  "moonshine" = dontDistribute super."moonshine";
+  "morfette" = dontDistribute super."morfette";
+  "morfeusz" = dontDistribute super."morfeusz";
+  "mosaico-lib" = dontDistribute super."mosaico-lib";
+  "mount" = dontDistribute super."mount";
+  "mp" = dontDistribute super."mp";
+  "mp3decoder" = dontDistribute super."mp3decoder";
+  "mpdmate" = dontDistribute super."mpdmate";
+  "mpppc" = dontDistribute super."mpppc";
+  "mpretty" = dontDistribute super."mpretty";
+  "mpris" = dontDistribute super."mpris";
+  "mprover" = dontDistribute super."mprover";
+  "mps" = dontDistribute super."mps";
+  "mpvguihs" = dontDistribute super."mpvguihs";
+  "mqtt-hs" = dontDistribute super."mqtt-hs";
+  "ms" = dontDistribute super."ms";
+  "msgpack" = dontDistribute super."msgpack";
+  "msgpack-aeson" = dontDistribute super."msgpack-aeson";
+  "msgpack-idl" = dontDistribute super."msgpack-idl";
+  "msgpack-rpc" = dontDistribute super."msgpack-rpc";
+  "msh" = dontDistribute super."msh";
+  "msu" = dontDistribute super."msu";
+  "mtgoxapi" = dontDistribute super."mtgoxapi";
+  "mtl-c" = dontDistribute super."mtl-c";
+  "mtl-evil-instances" = dontDistribute super."mtl-evil-instances";
+  "mtl-tf" = dontDistribute super."mtl-tf";
+  "mtl-unleashed" = dontDistribute super."mtl-unleashed";
+  "mtlparse" = dontDistribute super."mtlparse";
+  "mtlx" = dontDistribute super."mtlx";
+  "mtp" = dontDistribute super."mtp";
+  "mtree" = dontDistribute super."mtree";
+  "mucipher" = dontDistribute super."mucipher";
+  "mudbath" = dontDistribute super."mudbath";
+  "muesli" = dontDistribute super."muesli";
+  "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "multifocal" = dontDistribute super."multifocal";
+  "multihash" = dontDistribute super."multihash";
+  "multipart-names" = dontDistribute super."multipart-names";
+  "multipass" = dontDistribute super."multipass";
+  "multiplate-simplified" = dontDistribute super."multiplate-simplified";
+  "multiplicity" = dontDistribute super."multiplicity";
+  "multirec" = dontDistribute super."multirec";
+  "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
+  "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "murmur3" = dontDistribute super."murmur3";
+  "murmurhash3" = dontDistribute super."murmurhash3";
+  "music-articulation" = dontDistribute super."music-articulation";
+  "music-diatonic" = dontDistribute super."music-diatonic";
+  "music-dynamics" = dontDistribute super."music-dynamics";
+  "music-dynamics-literal" = dontDistribute super."music-dynamics-literal";
+  "music-graphics" = dontDistribute super."music-graphics";
+  "music-parts" = dontDistribute super."music-parts";
+  "music-pitch" = dontDistribute super."music-pitch";
+  "music-pitch-literal" = dontDistribute super."music-pitch-literal";
+  "music-preludes" = dontDistribute super."music-preludes";
+  "music-score" = dontDistribute super."music-score";
+  "music-sibelius" = dontDistribute super."music-sibelius";
+  "music-suite" = dontDistribute super."music-suite";
+  "music-util" = dontDistribute super."music-util";
+  "musicbrainz-email" = dontDistribute super."musicbrainz-email";
+  "musicxml" = dontDistribute super."musicxml";
+  "musicxml2" = dontDistribute super."musicxml2";
+  "mustache-haskell" = dontDistribute super."mustache-haskell";
+  "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-iter" = dontDistribute super."mutable-iter";
+  "mute-unmute" = dontDistribute super."mute-unmute";
+  "mvc" = dontDistribute super."mvc";
+  "mvc-updates" = dontDistribute super."mvc-updates";
+  "mvclient" = dontDistribute super."mvclient";
+  "mwc-random-monad" = dontDistribute super."mwc-random-monad";
+  "myTestlll" = dontDistribute super."myTestlll";
+  "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
+  "myo" = dontDistribute super."myo";
+  "mysnapsession" = dontDistribute super."mysnapsession";
+  "mysnapsession-example" = dontDistribute super."mysnapsession-example";
+  "mysql-effect" = dontDistribute super."mysql-effect";
+  "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
+  "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mzv" = dontDistribute super."mzv";
+  "n-m" = dontDistribute super."n-m";
+  "nagios-perfdata" = dontDistribute super."nagios-perfdata";
+  "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg";
+  "named-formlet" = dontDistribute super."named-formlet";
+  "named-lock" = dontDistribute super."named-lock";
+  "named-records" = dontDistribute super."named-records";
+  "namelist" = dontDistribute super."namelist";
+  "names" = dontDistribute super."names";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "nano-hmac" = dontDistribute super."nano-hmac";
+  "nano-md5" = dontDistribute super."nano-md5";
+  "nanoAgda" = dontDistribute super."nanoAgda";
+  "nanocurses" = dontDistribute super."nanocurses";
+  "nanomsg" = dontDistribute super."nanomsg";
+  "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
+  "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "naturalcomp" = dontDistribute super."naturalcomp";
+  "naturals" = dontDistribute super."naturals";
+  "naver-translate" = dontDistribute super."naver-translate";
+  "nbt" = dontDistribute super."nbt";
+  "nc-indicators" = dontDistribute super."nc-indicators";
+  "ncurses" = dontDistribute super."ncurses";
+  "neat" = dontDistribute super."neat";
+  "needle" = dontDistribute super."needle";
+  "neet" = dontDistribute super."neet";
+  "nehe-tuts" = dontDistribute super."nehe-tuts";
+  "neil" = dontDistribute super."neil";
+  "neither" = dontDistribute super."neither";
+  "nemesis" = dontDistribute super."nemesis";
+  "nemesis-titan" = dontDistribute super."nemesis-titan";
+  "nerf" = dontDistribute super."nerf";
+  "nero" = dontDistribute super."nero";
+  "nero-wai" = dontDistribute super."nero-wai";
+  "nero-warp" = dontDistribute super."nero-warp";
+  "nested-routes" = dontDistribute super."nested-routes";
+  "nested-sets" = dontDistribute super."nested-sets";
+  "nestedmap" = dontDistribute super."nestedmap";
+  "net-concurrent" = dontDistribute super."net-concurrent";
+  "netclock" = dontDistribute super."netclock";
+  "netcore" = dontDistribute super."netcore";
+  "netlines" = dontDistribute super."netlines";
+  "netlink" = dontDistribute super."netlink";
+  "netlist" = dontDistribute super."netlist";
+  "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl";
+  "netpbm" = dontDistribute super."netpbm";
+  "netrc" = dontDistribute super."netrc";
+  "netspec" = dontDistribute super."netspec";
+  "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle-frp" = dontDistribute super."nettle-frp";
+  "nettle-netkit" = dontDistribute super."nettle-netkit";
+  "nettle-openflow" = dontDistribute super."nettle-openflow";
+  "netwire" = dontDistribute super."netwire";
+  "netwire-input" = dontDistribute super."netwire-input";
+  "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network-address" = dontDistribute super."network-address";
+  "network-api-support" = dontDistribute super."network-api-support";
+  "network-bitcoin" = dontDistribute super."network-bitcoin";
+  "network-builder" = dontDistribute super."network-builder";
+  "network-bytestring" = dontDistribute super."network-bytestring";
+  "network-conduit" = dontDistribute super."network-conduit";
+  "network-connection" = dontDistribute super."network-connection";
+  "network-data" = dontDistribute super."network-data";
+  "network-dbus" = dontDistribute super."network-dbus";
+  "network-dns" = dontDistribute super."network-dns";
+  "network-enumerator" = dontDistribute super."network-enumerator";
+  "network-fancy" = dontDistribute super."network-fancy";
+  "network-interfacerequest" = dontDistribute super."network-interfacerequest";
+  "network-ip" = dontDistribute super."network-ip";
+  "network-metrics" = dontDistribute super."network-metrics";
+  "network-minihttp" = dontDistribute super."network-minihttp";
+  "network-msg" = dontDistribute super."network-msg";
+  "network-netpacket" = dontDistribute super."network-netpacket";
+  "network-pgi" = dontDistribute super."network-pgi";
+  "network-rpca" = dontDistribute super."network-rpca";
+  "network-server" = dontDistribute super."network-server";
+  "network-service" = dontDistribute super."network-service";
+  "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr";
+  "network-simple-tls" = dontDistribute super."network-simple-tls";
+  "network-socket-options" = dontDistribute super."network-socket-options";
+  "network-stream" = dontDistribute super."network-stream";
+  "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-uri-static" = dontDistribute super."network-uri-static";
+  "network-wai-router" = dontDistribute super."network-wai-router";
+  "network-websocket" = dontDistribute super."network-websocket";
+  "networked-game" = dontDistribute super."networked-game";
+  "newports" = dontDistribute super."newports";
+  "newsynth" = dontDistribute super."newsynth";
+  "newt" = dontDistribute super."newt";
+  "newtype-deriving" = dontDistribute super."newtype-deriving";
+  "newtype-th" = dontDistribute super."newtype-th";
+  "newtyper" = dontDistribute super."newtyper";
+  "nextstep-plist" = dontDistribute super."nextstep-plist";
+  "nf" = dontDistribute super."nf";
+  "ngrams-loader" = dontDistribute super."ngrams-loader";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "nitro" = dontDistribute super."nitro";
+  "nix-eval" = dontDistribute super."nix-eval";
+  "nixfromnpm" = dontDistribute super."nixfromnpm";
+  "nixos-types" = dontDistribute super."nixos-types";
+  "nkjp" = dontDistribute super."nkjp";
+  "nlp-scores" = dontDistribute super."nlp-scores";
+  "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts";
+  "nm" = dontDistribute super."nm";
+  "nme" = dontDistribute super."nme";
+  "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
+  "no-role-annots" = dontDistribute super."no-role-annots";
+  "nofib-analyse" = dontDistribute super."nofib-analyse";
+  "nofib-analyze" = dontDistribute super."nofib-analyze";
+  "noise" = dontDistribute super."noise";
+  "non-empty" = dontDistribute super."non-empty";
+  "non-negative" = dontDistribute super."non-negative";
+  "nondeterminism" = dontDistribute super."nondeterminism";
+  "nonfree" = dontDistribute super."nonfree";
+  "nonlinear-optimization" = dontDistribute super."nonlinear-optimization";
+  "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad";
+  "noodle" = dontDistribute super."noodle";
+  "normaldistribution" = dontDistribute super."normaldistribution";
+  "not-gloss" = dontDistribute super."not-gloss";
+  "not-gloss-examples" = dontDistribute super."not-gloss-examples";
+  "not-in-base" = dontDistribute super."not-in-base";
+  "notcpp" = dontDistribute super."notcpp";
+  "notmuch-haskell" = dontDistribute super."notmuch-haskell";
+  "notmuch-web" = dontDistribute super."notmuch-web";
+  "notzero" = dontDistribute super."notzero";
+  "np-extras" = dontDistribute super."np-extras";
+  "np-linear" = dontDistribute super."np-linear";
+  "nptools" = dontDistribute super."nptools";
+  "nth-prime" = dontDistribute super."nth-prime";
+  "nthable" = dontDistribute super."nthable";
+  "ntp-control" = dontDistribute super."ntp-control";
+  "null-canvas" = dontDistribute super."null-canvas";
+  "nullary" = dontDistribute super."nullary";
+  "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
+  "numbering" = dontDistribute super."numbering";
+  "numerals" = dontDistribute super."numerals";
+  "numerals-base" = dontDistribute super."numerals-base";
+  "numeric-limits" = dontDistribute super."numeric-limits";
+  "numeric-prelude" = dontDistribute super."numeric-prelude";
+  "numeric-qq" = dontDistribute super."numeric-qq";
+  "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
+  "numeric-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype" = dontDistribute super."numtype";
+  "numtype-tf" = dontDistribute super."numtype-tf";
+  "nurbs" = dontDistribute super."nurbs";
+  "nvim-hs" = dontDistribute super."nvim-hs";
+  "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib";
+  "nyan" = dontDistribute super."nyan";
+  "nylas" = dontDistribute super."nylas";
+  "nymphaea" = dontDistribute super."nymphaea";
+  "oauthenticated" = dontDistribute super."oauthenticated";
+  "obdd" = dontDistribute super."obdd";
+  "oberon0" = dontDistribute super."oberon0";
+  "obj" = dontDistribute super."obj";
+  "objectid" = dontDistribute super."objectid";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "oeis" = dontDistribute super."oeis";
+  "off-simple" = dontDistribute super."off-simple";
+  "ohloh-hs" = dontDistribute super."ohloh-hs";
+  "oi" = dontDistribute super."oi";
+  "oidc-client" = dontDistribute super."oidc-client";
+  "ois-input-manager" = dontDistribute super."ois-input-manager";
+  "old-version" = dontDistribute super."old-version";
+  "olwrapper" = dontDistribute super."olwrapper";
+  "omaketex" = dontDistribute super."omaketex";
+  "omega" = dontDistribute super."omega";
+  "omnicodec" = dontDistribute super."omnicodec";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "one-liner" = dontDistribute super."one-liner";
+  "one-time-password" = dontDistribute super."one-time-password";
+  "oneOfN" = dontDistribute super."oneOfN";
+  "oneormore" = dontDistribute super."oneormore";
+  "only" = dontDistribute super."only";
+  "onu-course" = dontDistribute super."onu-course";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "open-symbology" = dontDistribute super."open-symbology";
+  "open-typerep" = dontDistribute super."open-typerep";
+  "open-union" = dontDistribute super."open-union";
+  "open-witness" = dontDistribute super."open-witness";
+  "opencog-atomspace" = dontDistribute super."opencog-atomspace";
+  "opencv-raw" = dontDistribute super."opencv-raw";
+  "opendatatable" = dontDistribute super."opendatatable";
+  "openexchangerates" = dontDistribute super."openexchangerates";
+  "openflow" = dontDistribute super."openflow";
+  "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
+  "opengles" = dontDistribute super."opengles";
+  "openid" = dontDistribute super."openid";
+  "openpgp" = dontDistribute super."openpgp";
+  "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
+  "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
+  "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "openssh-github-keys" = dontDistribute super."openssh-github-keys";
+  "openssl-createkey" = dontDistribute super."openssl-createkey";
+  "opentheory" = dontDistribute super."opentheory";
+  "opentheory-bits" = dontDistribute super."opentheory-bits";
+  "opentheory-byte" = dontDistribute super."opentheory-byte";
+  "opentheory-char" = dontDistribute super."opentheory-char";
+  "opentheory-divides" = dontDistribute super."opentheory-divides";
+  "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci";
+  "opentheory-parser" = dontDistribute super."opentheory-parser";
+  "opentheory-prime" = dontDistribute super."opentheory-prime";
+  "opentheory-primitive" = dontDistribute super."opentheory-primitive";
+  "opentheory-probability" = dontDistribute super."opentheory-probability";
+  "opentheory-stream" = dontDistribute super."opentheory-stream";
+  "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational-alacarte" = dontDistribute super."operational-alacarte";
+  "opml" = dontDistribute super."opml";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "orc" = dontDistribute super."orc";
+  "orchestrate" = dontDistribute super."orchestrate";
+  "orchid" = dontDistribute super."orchid";
+  "orchid-demo" = dontDistribute super."orchid-demo";
+  "ord-adhoc" = dontDistribute super."ord-adhoc";
+  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistics" = dontDistribute super."order-statistics";
+  "ordered" = dontDistribute super."ordered";
+  "orders" = dontDistribute super."orders";
+  "ordrea" = dontDistribute super."ordrea";
+  "organize-imports" = dontDistribute super."organize-imports";
+  "orgmode" = dontDistribute super."orgmode";
+  "orgmode-parse" = dontDistribute super."orgmode-parse";
+  "origami" = dontDistribute super."origami";
+  "os-release" = dontDistribute super."os-release";
+  "osc" = dontDistribute super."osc";
+  "osm-download" = dontDistribute super."osm-download";
+  "oso2pdf" = dontDistribute super."oso2pdf";
+  "osx-ar" = dontDistribute super."osx-ar";
+  "ot" = dontDistribute super."ot";
+  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "packed-dawg" = dontDistribute super."packed-dawg";
+  "packedstring" = dontDistribute super."packedstring";
+  "packer" = dontDistribute super."packer";
+  "packman" = dontDistribute super."packman";
+  "packunused" = dontDistribute super."packunused";
+  "pacman-memcache" = dontDistribute super."pacman-memcache";
+  "padKONTROL" = dontDistribute super."padKONTROL";
+  "pagarme" = dontDistribute super."pagarme";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
+  "pandoc-crossref" = dontDistribute super."pandoc-crossref";
+  "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
+  "pandoc-include" = dontDistribute super."pandoc-include";
+  "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters";
+  "pandoc-lens" = dontDistribute super."pandoc-lens";
+  "pandoc-placetable" = dontDistribute super."pandoc-placetable";
+  "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-unlit" = dontDistribute super."pandoc-unlit";
+  "papillon" = dontDistribute super."papillon";
+  "pappy" = dontDistribute super."pappy";
+  "para" = dontDistribute super."para";
+  "paragon" = dontDistribute super."paragon";
+  "parallel-tasks" = dontDistribute super."parallel-tasks";
+  "parallel-tree-search" = dontDistribute super."parallel-tree-search";
+  "parameterized-data" = dontDistribute super."parameterized-data";
+  "parco" = dontDistribute super."parco";
+  "parco-attoparsec" = dontDistribute super."parco-attoparsec";
+  "parco-parsec" = dontDistribute super."parco-parsec";
+  "parcom-lib" = dontDistribute super."parcom-lib";
+  "parconc-examples" = dontDistribute super."parconc-examples";
+  "parport" = dontDistribute super."parport";
+  "parse-dimacs" = dontDistribute super."parse-dimacs";
+  "parse-help" = dontDistribute super."parse-help";
+  "parsec-extra" = dontDistribute super."parsec-extra";
+  "parsec-numbers" = dontDistribute super."parsec-numbers";
+  "parsec-parsers" = dontDistribute super."parsec-parsers";
+  "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
+  "parsec-trace" = dontDistribute super."parsec-trace";
+  "parsec-utils" = dontDistribute super."parsec-utils";
+  "parsec1" = dontDistribute super."parsec1";
+  "parsec2" = dontDistribute super."parsec2";
+  "parsec3" = dontDistribute super."parsec3";
+  "parsec3-numbers" = dontDistribute super."parsec3-numbers";
+  "parsedate" = dontDistribute super."parsedate";
+  "parsek" = dontDistribute super."parsek";
+  "parsely" = dontDistribute super."parsely";
+  "parser-helper" = dontDistribute super."parser-helper";
+  "parser241" = dontDistribute super."parser241";
+  "parsergen" = dontDistribute super."parsergen";
+  "parsestar" = dontDistribute super."parsestar";
+  "parsimony" = dontDistribute super."parsimony";
+  "partial" = dontDistribute super."partial";
+  "partial-lens" = dontDistribute super."partial-lens";
+  "partial-uri" = dontDistribute super."partial-uri";
+  "partly" = dontDistribute super."partly";
+  "passage" = dontDistribute super."passage";
+  "passwords" = dontDistribute super."passwords";
+  "pastis" = dontDistribute super."pastis";
+  "pasty" = dontDistribute super."pasty";
+  "patch-combinators" = dontDistribute super."patch-combinators";
+  "patch-image" = dontDistribute super."patch-image";
+  "path-io" = doDistribute super."path-io_0_2_0";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "patronscraper" = dontDistribute super."patronscraper";
+  "patterns" = dontDistribute super."patterns";
+  "paymill" = dontDistribute super."paymill";
+  "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops";
+  "paypal-api" = dontDistribute super."paypal-api";
+  "pb" = dontDistribute super."pb";
+  "pbc4hs" = dontDistribute super."pbc4hs";
+  "pbkdf" = dontDistribute super."pbkdf";
+  "pcap-conduit" = dontDistribute super."pcap-conduit";
+  "pcap-enumerator" = dontDistribute super."pcap-enumerator";
+  "pcd-loader" = dontDistribute super."pcd-loader";
+  "pcf" = dontDistribute super."pcf";
+  "pcg-random" = dontDistribute super."pcg-random";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_1";
+  "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_1";
+  "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_1";
+  "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
+  "pdf2line" = dontDistribute super."pdf2line";
+  "pdfsplit" = dontDistribute super."pdfsplit";
+  "pdynload" = dontDistribute super."pdynload";
+  "peakachu" = dontDistribute super."peakachu";
+  "peano" = dontDistribute super."peano";
+  "peano-inf" = dontDistribute super."peano-inf";
+  "pec" = dontDistribute super."pec";
+  "pecoff" = dontDistribute super."pecoff";
+  "peg" = dontDistribute super."peg";
+  "peggy" = dontDistribute super."peggy";
+  "pell" = dontDistribute super."pell";
+  "penn-treebank" = dontDistribute super."penn-treebank";
+  "penny" = dontDistribute super."penny";
+  "penny-bin" = dontDistribute super."penny-bin";
+  "penny-lib" = dontDistribute super."penny-lib";
+  "peparser" = dontDistribute super."peparser";
+  "perceptron" = dontDistribute super."perceptron";
+  "perdure" = dontDistribute super."perdure";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "persistent-equivalence" = dontDistribute super."persistent-equivalence";
+  "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
+  "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
+  "persistent-map" = dontDistribute super."persistent-map";
+  "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-vector" = dontDistribute super."persistent-vector";
+  "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
+  "persona" = dontDistribute super."persona";
+  "persona-idp" = dontDistribute super."persona-idp";
+  "pesca" = dontDistribute super."pesca";
+  "peyotls" = dontDistribute super."peyotls";
+  "peyotls-codec" = dontDistribute super."peyotls-codec";
+  "pez" = dontDistribute super."pez";
+  "pg-harness" = dontDistribute super."pg-harness";
+  "pg-harness-client" = dontDistribute super."pg-harness-client";
+  "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "phone-numbers" = dontDistribute super."phone-numbers";
+  "phone-push" = dontDistribute super."phone-push";
+  "phonetic-code" = dontDistribute super."phonetic-code";
+  "phooey" = dontDistribute super."phooey";
+  "photoname" = dontDistribute super."photoname";
+  "phraskell" = dontDistribute super."phraskell";
+  "phybin" = dontDistribute super."phybin";
+  "pi-calculus" = dontDistribute super."pi-calculus";
+  "pia-forward" = dontDistribute super."pia-forward";
+  "pianola" = dontDistribute super."pianola";
+  "picologic" = dontDistribute super."picologic";
+  "picosat" = dontDistribute super."picosat";
+  "piet" = dontDistribute super."piet";
+  "piki" = dontDistribute super."piki";
+  "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-cellular" = dontDistribute super."pipes-cellular";
+  "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
+  "pipes-cereal" = dontDistribute super."pipes-cereal";
+  "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-conduit" = dontDistribute super."pipes-conduit";
+  "pipes-core" = dontDistribute super."pipes-core";
+  "pipes-courier" = dontDistribute super."pipes-courier";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-network-tls" = dontDistribute super."pipes-network-tls";
+  "pipes-p2p" = dontDistribute super."pipes-p2p";
+  "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-rt" = dontDistribute super."pipes-rt";
+  "pipes-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_2_1";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-websockets" = dontDistribute super."pipes-websockets";
+  "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
+  "pipes-zlib" = dontDistribute super."pipes-zlib";
+  "pisigma" = dontDistribute super."pisigma";
+  "pit" = dontDistribute super."pit";
+  "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
+  "pkcs1" = dontDistribute super."pkcs1";
+  "pkcs7" = dontDistribute super."pkcs7";
+  "pkggraph" = dontDistribute super."pkggraph";
+  "pktree" = dontDistribute super."pktree";
+  "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
+  "planar-graph" = dontDistribute super."planar-graph";
+  "plat" = dontDistribute super."plat";
+  "playlists" = dontDistribute super."playlists";
+  "plist" = dontDistribute super."plist";
+  "plist-buddy" = dontDistribute super."plist-buddy";
+  "plivo" = dontDistribute super."plivo";
+  "plot-lab" = dontDistribute super."plot-lab";
+  "plotfont" = dontDistribute super."plotfont";
+  "plotserver-api" = dontDistribute super."plotserver-api";
+  "plugins" = dontDistribute super."plugins";
+  "plugins-auto" = dontDistribute super."plugins-auto";
+  "plugins-multistage" = dontDistribute super."plugins-multistage";
+  "plumbers" = dontDistribute super."plumbers";
+  "ply-loader" = dontDistribute super."ply-loader";
+  "png-file" = dontDistribute super."png-file";
+  "pngload" = dontDistribute super."pngload";
+  "pngload-fixed" = dontDistribute super."pngload-fixed";
+  "pnm" = dontDistribute super."pnm";
+  "pocket-dns" = dontDistribute super."pocket-dns";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "pointless-haskell" = dontDistribute super."pointless-haskell";
+  "pointless-lenses" = dontDistribute super."pointless-lenses";
+  "pointless-rewrite" = dontDistribute super."pointless-rewrite";
+  "poker-eval" = dontDistribute super."poker-eval";
+  "pokitdok" = dontDistribute super."pokitdok";
+  "polar" = dontDistribute super."polar";
+  "polar-configfile" = dontDistribute super."polar-configfile";
+  "polar-shader" = dontDistribute super."polar-shader";
+  "polh-lexicon" = dontDistribute super."polh-lexicon";
+  "polimorf" = dontDistribute super."polimorf";
+  "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
+  "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
+  "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
+  "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
+  "pony" = dontDistribute super."pony";
+  "pool" = dontDistribute super."pool";
+  "pool-conduit" = dontDistribute super."pool-conduit";
+  "pooled-io" = dontDistribute super."pooled-io";
+  "pop3-client" = dontDistribute super."pop3-client";
+  "popenhs" = dontDistribute super."popenhs";
+  "poppler" = dontDistribute super."poppler";
+  "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache";
+  "portable-lines" = dontDistribute super."portable-lines";
+  "portaudio" = dontDistribute super."portaudio";
+  "porte" = dontDistribute super."porte";
+  "porter" = dontDistribute super."porter";
+  "ports" = dontDistribute super."ports";
+  "ports-tools" = dontDistribute super."ports-tools";
+  "positive" = dontDistribute super."positive";
+  "posix-acl" = dontDistribute super."posix-acl";
+  "posix-escape" = dontDistribute super."posix-escape";
+  "posix-filelock" = dontDistribute super."posix-filelock";
+  "posix-paths" = dontDistribute super."posix-paths";
+  "posix-pty" = dontDistribute super."posix-pty";
+  "posix-timer" = dontDistribute super."posix-timer";
+  "posix-waitpid" = dontDistribute super."posix-waitpid";
+  "possible" = dontDistribute super."possible";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-config" = dontDistribute super."postgresql-config";
+  "postgresql-connector" = dontDistribute super."postgresql-connector";
+  "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
+  "postgresql-cube" = dontDistribute super."postgresql-cube";
+  "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
+  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
+  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-typed" = dontDistribute super."postgresql-typed";
+  "postgrest" = dontDistribute super."postgrest";
+  "postie" = dontDistribute super."postie";
+  "postmark" = dontDistribute super."postmark";
+  "postmaster" = dontDistribute super."postmaster";
+  "potato-tool" = dontDistribute super."potato-tool";
+  "potrace" = dontDistribute super."potrace";
+  "potrace-diagrams" = dontDistribute super."potrace-diagrams";
+  "powermate" = dontDistribute super."powermate";
+  "powerpc" = dontDistribute super."powerpc";
+  "ppm" = dontDistribute super."ppm";
+  "pqc" = dontDistribute super."pqc";
+  "pqueue-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "present" = dontDistribute super."present";
+  "press" = dontDistribute super."press";
+  "presto-hdbc" = dontDistribute super."presto-hdbc";
+  "prettify" = dontDistribute super."prettify";
+  "pretty-compact" = dontDistribute super."pretty-compact";
+  "pretty-error" = dontDistribute super."pretty-error";
+  "pretty-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "printxosd" = dontDistribute super."printxosd";
+  "priority-queue" = dontDistribute super."priority-queue";
+  "priority-sync" = dontDistribute super."priority-sync";
+  "privileged-concurrency" = dontDistribute super."privileged-concurrency";
+  "prizm" = dontDistribute super."prizm";
+  "probability" = dontDistribute super."probability";
+  "probable" = dontDistribute super."probable";
+  "proc" = dontDistribute super."proc";
+  "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_7";
+  "process-iterio" = dontDistribute super."process-iterio";
+  "process-leksah" = dontDistribute super."process-leksah";
+  "process-listlike" = dontDistribute super."process-listlike";
+  "process-progress" = dontDistribute super."process-progress";
+  "process-qq" = dontDistribute super."process-qq";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "processing" = dontDistribute super."processing";
+  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
+  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
+  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
+  "procstat" = dontDistribute super."procstat";
+  "proctest" = dontDistribute super."proctest";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "progress" = dontDistribute super."progress";
+  "progressbar" = dontDistribute super."progressbar";
+  "progression" = dontDistribute super."progression";
+  "progressive" = dontDistribute super."progressive";
+  "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings";
+  "projection" = dontDistribute super."projection";
+  "prolog" = dontDistribute super."prolog";
+  "prolog-graph" = dontDistribute super."prolog-graph";
+  "prolog-graph-lib" = dontDistribute super."prolog-graph-lib";
+  "prologue" = dontDistribute super."prologue";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "propane" = dontDistribute super."propane";
+  "propellor" = dontDistribute super."propellor";
+  "properties" = dontDistribute super."properties";
+  "property-list" = dontDistribute super."property-list";
+  "proplang" = dontDistribute super."proplang";
+  "props" = dontDistribute super."props";
+  "prosper" = dontDistribute super."prosper";
+  "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
+  "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork";
+  "proton-haskell" = dontDistribute super."proton-haskell";
+  "prototype" = dontDistribute super."prototype";
+  "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
+  "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
+  "publicsuffixlist" = dontDistribute super."publicsuffixlist";
+  "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
+  "pubnub" = dontDistribute super."pubnub";
+  "pubsub" = dontDistribute super."pubsub";
+  "puffytools" = dontDistribute super."puffytools";
+  "pugixml" = dontDistribute super."pugixml";
+  "pugs-DrIFT" = dontDistribute super."pugs-DrIFT";
+  "pugs-HsSyck" = dontDistribute super."pugs-HsSyck";
+  "pugs-compat" = dontDistribute super."pugs-compat";
+  "pugs-hsregex" = dontDistribute super."pugs-hsregex";
+  "pulse-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-fft" = dontDistribute super."pure-fft";
+  "pure-priority-queue" = dontDistribute super."pure-priority-queue";
+  "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
+  "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "push-notify" = dontDistribute super."push-notify";
+  "push-notify-ccs" = dontDistribute super."push-notify-ccs";
+  "push-notify-general" = dontDistribute super."push-notify-general";
+  "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pushme" = dontDistribute super."pushme";
+  "putlenses" = dontDistribute super."putlenses";
+  "puzzle-draw" = dontDistribute super."puzzle-draw";
+  "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline";
+  "pvd" = dontDistribute super."pvd";
+  "pwstore-cli" = dontDistribute super."pwstore-cli";
+  "pxsl-tools" = dontDistribute super."pxsl-tools";
+  "pyffi" = dontDistribute super."pyffi";
+  "pyfi" = dontDistribute super."pyfi";
+  "python-pickle" = dontDistribute super."python-pickle";
+  "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator";
+  "qd" = dontDistribute super."qd";
+  "qd-vec" = dontDistribute super."qd-vec";
+  "qed" = dontDistribute super."qed";
+  "qhull-simple" = dontDistribute super."qhull-simple";
+  "qrcode" = dontDistribute super."qrcode";
+  "qt" = dontDistribute super."qt";
+  "quadratic-irrational" = dontDistribute super."quadratic-irrational";
+  "quantfin" = dontDistribute super."quantfin";
+  "quantities" = dontDistribute super."quantities";
+  "quantum-arrow" = dontDistribute super."quantum-arrow";
+  "qudb" = dontDistribute super."qudb";
+  "quenya-verb" = dontDistribute super."quenya-verb";
+  "querystring-pickle" = dontDistribute super."querystring-pickle";
+  "queue" = dontDistribute super."queue";
+  "queuelike" = dontDistribute super."queuelike";
+  "quick-generator" = dontDistribute super."quick-generator";
+  "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
+  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
+  "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
+  "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad";
+  "quickcheck-regex" = dontDistribute super."quickcheck-regex";
+  "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng";
+  "quickcheck-rematch" = dontDistribute super."quickcheck-rematch";
+  "quickcheck-script" = dontDistribute super."quickcheck-script";
+  "quickcheck-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "quiver-bytestring" = dontDistribute super."quiver-bytestring";
+  "quiver-cell" = dontDistribute super."quiver-cell";
+  "quiver-csv" = dontDistribute super."quiver-csv";
+  "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-http" = dontDistribute super."quiver-http";
+  "quoridor-hs" = dontDistribute super."quoridor-hs";
+  "qux" = dontDistribute super."qux";
+  "rabocsv2qif" = dontDistribute super."rabocsv2qif";
+  "rad" = dontDistribute super."rad";
+  "radian" = dontDistribute super."radian";
+  "radium" = dontDistribute super."radium";
+  "radium-formula-parser" = dontDistribute super."radium-formula-parser";
+  "radix" = dontDistribute super."radix";
+  "rados-haskell" = dontDistribute super."rados-haskell";
+  "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
+  "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rake" = dontDistribute super."rake";
+  "rakhana" = dontDistribute super."rakhana";
+  "ralist" = dontDistribute super."ralist";
+  "rallod" = dontDistribute super."rallod";
+  "raml" = dontDistribute super."raml";
+  "rand-vars" = dontDistribute super."rand-vars";
+  "randfile" = dontDistribute super."randfile";
+  "random-access-list" = dontDistribute super."random-access-list";
+  "random-derive" = dontDistribute super."random-derive";
+  "random-eff" = dontDistribute super."random-eff";
+  "random-effin" = dontDistribute super."random-effin";
+  "random-extras" = dontDistribute super."random-extras";
+  "random-hypergeometric" = dontDistribute super."random-hypergeometric";
+  "random-stream" = dontDistribute super."random-stream";
+  "random-variates" = dontDistribute super."random-variates";
+  "randomgen" = dontDistribute super."randomgen";
+  "randproc" = dontDistribute super."randproc";
+  "randsolid" = dontDistribute super."randsolid";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rascal" = dontDistribute super."rascal";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratio-int" = dontDistribute super."ratio-int";
+  "raven-haskell" = dontDistribute super."raven-haskell";
+  "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "rawstring-qm" = dontDistribute super."rawstring-qm";
+  "razom-text-util" = dontDistribute super."razom-text-util";
+  "rbr" = dontDistribute super."rbr";
+  "rclient" = dontDistribute super."rclient";
+  "rcu" = dontDistribute super."rcu";
+  "rdf4h" = dontDistribute super."rdf4h";
+  "rdioh" = dontDistribute super."rdioh";
+  "rdtsc" = dontDistribute super."rdtsc";
+  "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
+  "re2" = dontDistribute super."re2";
+  "react-flux" = dontDistribute super."react-flux";
+  "react-haskell" = dontDistribute super."react-haskell";
+  "reaction-logic" = dontDistribute super."reaction-logic";
+  "reactive" = dontDistribute super."reactive";
+  "reactive-bacon" = dontDistribute super."reactive-bacon";
+  "reactive-balsa" = dontDistribute super."reactive-balsa";
+  "reactive-banana" = dontDistribute super."reactive-banana";
+  "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
+  "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
+  "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
+  "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
+  "reactive-glut" = dontDistribute super."reactive-glut";
+  "reactive-haskell" = dontDistribute super."reactive-haskell";
+  "reactive-io" = dontDistribute super."reactive-io";
+  "reactive-thread" = dontDistribute super."reactive-thread";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
+  "recaptcha" = dontDistribute super."recaptcha";
+  "record" = dontDistribute super."record";
+  "record-aeson" = dontDistribute super."record-aeson";
+  "record-gl" = dontDistribute super."record-gl";
+  "record-preprocessor" = dontDistribute super."record-preprocessor";
+  "record-syntax" = dontDistribute super."record-syntax";
+  "records" = dontDistribute super."records";
+  "records-th" = dontDistribute super."records-th";
+  "recursive-line-count" = dontDistribute super."recursive-line-count";
+  "redHandlers" = dontDistribute super."redHandlers";
+  "reddit" = dontDistribute super."reddit";
+  "redis" = dontDistribute super."redis";
+  "redis-hs" = dontDistribute super."redis-hs";
+  "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-simple" = dontDistribute super."redis-simple";
+  "redo" = dontDistribute super."redo";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "reenact" = dontDistribute super."reenact";
+  "reexport-crypto-random" = dontDistribute super."reexport-crypto-random";
+  "ref" = dontDistribute super."ref";
+  "ref-mtl" = dontDistribute super."ref-mtl";
+  "ref-tf" = dontDistribute super."ref-tf";
+  "refcount" = dontDistribute super."refcount";
+  "reference" = dontDistribute super."reference";
+  "references" = dontDistribute super."references";
+  "refh" = dontDistribute super."refh";
+  "refined" = dontDistribute super."refined";
+  "reflection-extras" = dontDistribute super."reflection-extras";
+  "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
+  "reflex" = dontDistribute super."reflex";
+  "reflex-animation" = dontDistribute super."reflex-animation";
+  "reflex-dom" = dontDistribute super."reflex-dom";
+  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
+  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-deriv" = dontDistribute super."regex-deriv";
+  "regex-dfa" = dontDistribute super."regex-dfa";
+  "regex-easy" = dontDistribute super."regex-easy";
+  "regex-genex" = dontDistribute super."regex-genex";
+  "regex-parsec" = dontDistribute super."regex-parsec";
+  "regex-pderiv" = dontDistribute super."regex-pderiv";
+  "regex-posix-unittest" = dontDistribute super."regex-posix-unittest";
+  "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes";
+  "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter";
+  "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
+  "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
+  "regex-tre" = dontDistribute super."regex-tre";
+  "regex-xmlschema" = dontDistribute super."regex-xmlschema";
+  "regexchar" = dontDistribute super."regexchar";
+  "regexdot" = dontDistribute super."regexdot";
+  "regexp-tries" = dontDistribute super."regexp-tries";
+  "regexpr" = dontDistribute super."regexpr";
+  "regexpr-symbolic" = dontDistribute super."regexpr-symbolic";
+  "regexqq" = dontDistribute super."regexqq";
+  "regional-pointers" = dontDistribute super."regional-pointers";
+  "regions" = dontDistribute super."regions";
+  "regions-monadsfd" = dontDistribute super."regions-monadsfd";
+  "regions-monadstf" = dontDistribute super."regions-monadstf";
+  "regions-mtl" = dontDistribute super."regions-mtl";
+  "regress" = dontDistribute super."regress";
+  "regular" = dontDistribute super."regular";
+  "regular-extras" = dontDistribute super."regular-extras";
+  "regular-web" = dontDistribute super."regular-web";
+  "regular-xmlpickler" = dontDistribute super."regular-xmlpickler";
+  "reheat" = dontDistribute super."reheat";
+  "rehoo" = dontDistribute super."rehoo";
+  "rei" = dontDistribute super."rei";
+  "reified-records" = dontDistribute super."reified-records";
+  "reify" = dontDistribute super."reify";
+  "relacion" = dontDistribute super."relacion";
+  "relation" = dontDistribute super."relation";
+  "relational-postgresql8" = dontDistribute super."relational-postgresql8";
+  "relational-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
+  "remotion" = dontDistribute super."remotion";
+  "renderable" = dontDistribute super."renderable";
+  "reord" = dontDistribute super."reord";
+  "reorderable" = dontDistribute super."reorderable";
+  "repa-array" = dontDistribute super."repa-array";
+  "repa-bytestring" = dontDistribute super."repa-bytestring";
+  "repa-convert" = dontDistribute super."repa-convert";
+  "repa-eval" = dontDistribute super."repa-eval";
+  "repa-examples" = dontDistribute super."repa-examples";
+  "repa-fftw" = dontDistribute super."repa-fftw";
+  "repa-flow" = dontDistribute super."repa-flow";
+  "repa-linear-algebra" = dontDistribute super."repa-linear-algebra";
+  "repa-plugin" = dontDistribute super."repa-plugin";
+  "repa-scalar" = dontDistribute super."repa-scalar";
+  "repa-series" = dontDistribute super."repa-series";
+  "repa-sndfile" = dontDistribute super."repa-sndfile";
+  "repa-stream" = dontDistribute super."repa-stream";
+  "repa-v4l2" = dontDistribute super."repa-v4l2";
+  "repl" = dontDistribute super."repl";
+  "repl-toolkit" = dontDistribute super."repl-toolkit";
+  "repline" = dontDistribute super."repline";
+  "repo-based-blog" = dontDistribute super."repo-based-blog";
+  "repr" = dontDistribute super."repr";
+  "repr-tree-syb" = dontDistribute super."repr-tree-syb";
+  "representable-functors" = dontDistribute super."representable-functors";
+  "representable-profunctors" = dontDistribute super."representable-profunctors";
+  "representable-tries" = dontDistribute super."representable-tries";
+  "request-monad" = dontDistribute super."request-monad";
+  "reserve" = dontDistribute super."reserve";
+  "resistor-cube" = dontDistribute super."resistor-cube";
+  "resource-effect" = dontDistribute super."resource-effect";
+  "resource-embed" = dontDistribute super."resource-embed";
+  "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
+  "resource-pool-monad" = dontDistribute super."resource-pool-monad";
+  "resource-simple" = dontDistribute super."resource-simple";
+  "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retryer" = dontDistribute super."retryer";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-geocoding" = dontDistribute super."reverse-geocoding";
+  "reversi" = dontDistribute super."reversi";
+  "rewrite" = dontDistribute super."rewrite";
+  "rewriting" = dontDistribute super."rewriting";
+  "rex" = dontDistribute super."rex";
+  "rezoom" = dontDistribute super."rezoom";
+  "rfc3339" = dontDistribute super."rfc3339";
+  "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial";
+  "richreports" = dontDistribute super."richreports";
+  "riemann" = dontDistribute super."riemann";
+  "riff" = dontDistribute super."riff";
+  "ring-buffer" = dontDistribute super."ring-buffer";
+  "riot" = dontDistribute super."riot";
+  "ripple" = dontDistribute super."ripple";
+  "ripple-federation" = dontDistribute super."ripple-federation";
+  "risc386" = dontDistribute super."risc386";
+  "rivers" = dontDistribute super."rivers";
+  "rivet" = dontDistribute super."rivet";
+  "rivet-core" = dontDistribute super."rivet-core";
+  "rivet-migration" = dontDistribute super."rivet-migration";
+  "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy";
+  "rlglue" = dontDistribute super."rlglue";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "robin" = dontDistribute super."robin";
+  "robot" = dontDistribute super."robot";
+  "robots-txt" = dontDistribute super."robots-txt";
+  "rocksdb-haskell" = dontDistribute super."rocksdb-haskell";
+  "roguestar" = dontDistribute super."roguestar";
+  "roguestar-engine" = dontDistribute super."roguestar-engine";
+  "roguestar-gl" = dontDistribute super."roguestar-gl";
+  "roguestar-glut" = dontDistribute super."roguestar-glut";
+  "rollbar" = dontDistribute super."rollbar";
+  "roller" = dontDistribute super."roller";
+  "rolling-queue" = dontDistribute super."rolling-queue";
+  "roman-numerals" = dontDistribute super."roman-numerals";
+  "romkan" = dontDistribute super."romkan";
+  "roots" = dontDistribute super."roots";
+  "rope" = dontDistribute super."rope";
+  "rosa" = dontDistribute super."rosa";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "roshask" = dontDistribute super."roshask";
+  "rosso" = dontDistribute super."rosso";
+  "rot13" = dontDistribute super."rot13";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "rounding" = dontDistribute super."rounding";
+  "roundtrip" = dontDistribute super."roundtrip";
+  "roundtrip-aeson" = dontDistribute super."roundtrip-aeson";
+  "roundtrip-string" = dontDistribute super."roundtrip-string";
+  "roundtrip-xml" = dontDistribute super."roundtrip-xml";
+  "route-generator" = dontDistribute super."route-generator";
+  "route-planning" = dontDistribute super."route-planning";
+  "rowrecord" = dontDistribute super."rowrecord";
+  "rpc" = dontDistribute super."rpc";
+  "rpc-framework" = dontDistribute super."rpc-framework";
+  "rpf" = dontDistribute super."rpf";
+  "rpm" = dontDistribute super."rpm";
+  "rsagl" = dontDistribute super."rsagl";
+  "rsagl-frp" = dontDistribute super."rsagl-frp";
+  "rsagl-math" = dontDistribute super."rsagl-math";
+  "rspp" = dontDistribute super."rspp";
+  "rss" = dontDistribute super."rss";
+  "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
+  "rtld" = dontDistribute super."rtld";
+  "rtlsdr" = dontDistribute super."rtlsdr";
+  "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";
+  "rtorrent-state" = dontDistribute super."rtorrent-state";
+  "rubberband" = dontDistribute super."rubberband";
+  "ruby-marshal" = dontDistribute super."ruby-marshal";
+  "ruby-qq" = dontDistribute super."ruby-qq";
+  "ruff" = dontDistribute super."ruff";
+  "ruler" = dontDistribute super."ruler";
+  "ruler-core" = dontDistribute super."ruler-core";
+  "rungekutta" = dontDistribute super."rungekutta";
+  "runghc" = dontDistribute super."runghc";
+  "rwlock" = dontDistribute super."rwlock";
+  "rws" = dontDistribute super."rws";
+  "s-cargot" = dontDistribute super."s-cargot";
+  "safe-access" = dontDistribute super."safe-access";
+  "safe-failure" = dontDistribute super."safe-failure";
+  "safe-failure-cme" = dontDistribute super."safe-failure-cme";
+  "safe-freeze" = dontDistribute super."safe-freeze";
+  "safe-globals" = dontDistribute super."safe-globals";
+  "safe-lazy-io" = dontDistribute super."safe-lazy-io";
+  "safe-length" = dontDistribute super."safe-length";
+  "safe-plugins" = dontDistribute super."safe-plugins";
+  "safe-printf" = dontDistribute super."safe-printf";
+  "safeint" = dontDistribute super."safeint";
+  "safer-file-handles" = dontDistribute super."safer-file-handles";
+  "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
+  "safer-file-handles-text" = dontDistribute super."safer-file-handles-text";
+  "saferoute" = dontDistribute super."saferoute";
+  "sai-shape-syb" = dontDistribute super."sai-shape-syb";
+  "saltine" = dontDistribute super."saltine";
+  "saltine-quickcheck" = dontDistribute super."saltine-quickcheck";
+  "salvia" = dontDistribute super."salvia";
+  "salvia-demo" = dontDistribute super."salvia-demo";
+  "salvia-extras" = dontDistribute super."salvia-extras";
+  "salvia-protocol" = dontDistribute super."salvia-protocol";
+  "salvia-sessions" = dontDistribute super."salvia-sessions";
+  "salvia-websocket" = dontDistribute super."salvia-websocket";
+  "sample-frame" = dontDistribute super."sample-frame";
+  "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "sasl" = dontDistribute super."sasl";
+  "sat" = dontDistribute super."sat";
+  "sat-micro-hs" = dontDistribute super."sat-micro-hs";
+  "satchmo" = dontDistribute super."satchmo";
+  "satchmo-backends" = dontDistribute super."satchmo-backends";
+  "satchmo-examples" = dontDistribute super."satchmo-examples";
+  "satchmo-funsat" = dontDistribute super."satchmo-funsat";
+  "satchmo-minisat" = dontDistribute super."satchmo-minisat";
+  "satchmo-toysat" = dontDistribute super."satchmo-toysat";
+  "sbp" = dontDistribute super."sbp";
+  "sbvPlugin" = dontDistribute super."sbvPlugin";
+  "sc3-rdu" = dontDistribute super."sc3-rdu";
+  "scalable-server" = dontDistribute super."scalable-server";
+  "scaleimage" = dontDistribute super."scaleimage";
+  "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scat" = dontDistribute super."scat";
+  "scc" = dontDistribute super."scc";
+  "scenegraph" = dontDistribute super."scenegraph";
+  "scgi" = dontDistribute super."scgi";
+  "schedevr" = dontDistribute super."schedevr";
+  "schedule-planner" = dontDistribute super."schedule-planner";
+  "schedyield" = dontDistribute super."schedyield";
+  "scholdoc" = dontDistribute super."scholdoc";
+  "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc";
+  "scholdoc-texmath" = dontDistribute super."scholdoc-texmath";
+  "scholdoc-types" = dontDistribute super."scholdoc-types";
+  "schonfinkeling" = dontDistribute super."schonfinkeling";
+  "sci-ratio" = dontDistribute super."sci-ratio";
+  "science-constants" = dontDistribute super."science-constants";
+  "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scion" = dontDistribute super."scion";
+  "scion-browser" = dontDistribute super."scion-browser";
+  "scons2dot" = dontDistribute super."scons2dot";
+  "scope" = dontDistribute super."scope";
+  "scope-cairo" = dontDistribute super."scope-cairo";
+  "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
+  "scotty-binding-play" = dontDistribute super."scotty-binding-play";
+  "scotty-blaze" = dontDistribute super."scotty-blaze";
+  "scotty-cookie" = dontDistribute super."scotty-cookie";
+  "scotty-fay" = dontDistribute super."scotty-fay";
+  "scotty-hastache" = dontDistribute super."scotty-hastache";
+  "scotty-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrz" = dontDistribute super."scrz";
+  "scyther-proof" = dontDistribute super."scyther-proof";
+  "sde-solver" = dontDistribute super."sde-solver";
+  "sdf2p1-parser" = dontDistribute super."sdf2p1-parser";
+  "sdl2-cairo" = dontDistribute super."sdl2-cairo";
+  "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image";
+  "sdl2-compositor" = dontDistribute super."sdl2-compositor";
+  "sdl2-image" = dontDistribute super."sdl2-image";
+  "sdl2-ttf" = dontDistribute super."sdl2-ttf";
+  "sdnv" = dontDistribute super."sdnv";
+  "sdr" = dontDistribute super."sdr";
+  "seacat" = dontDistribute super."seacat";
+  "seal-module" = dontDistribute super."seal-module";
+  "search" = dontDistribute super."search";
+  "sec" = dontDistribute super."sec";
+  "secdh" = dontDistribute super."secdh";
+  "seclib" = dontDistribute super."seclib";
+  "secp256k1" = dontDistribute super."secp256k1";
+  "secret-santa" = dontDistribute super."secret-santa";
+  "secret-sharing" = dontDistribute super."secret-sharing";
+  "secrm" = dontDistribute super."secrm";
+  "secure-sockets" = dontDistribute super."secure-sockets";
+  "sednaDBXML" = dontDistribute super."sednaDBXML";
+  "select" = dontDistribute super."select";
+  "selectors" = dontDistribute super."selectors";
+  "selenium" = dontDistribute super."selenium";
+  "selenium-server" = dontDistribute super."selenium-server";
+  "selfrestart" = dontDistribute super."selfrestart";
+  "selinux" = dontDistribute super."selinux";
+  "semaphore-plus" = dontDistribute super."semaphore-plus";
+  "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups-actions" = dontDistribute super."semigroups-actions";
+  "semiring" = dontDistribute super."semiring";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "sensenet" = dontDistribute super."sensenet";
+  "sentry" = dontDistribute super."sentry";
+  "senza" = dontDistribute super."senza";
+  "separated" = dontDistribute super."separated";
+  "seqaid" = dontDistribute super."seqaid";
+  "seqid" = dontDistribute super."seqid";
+  "seqid-streams" = dontDistribute super."seqid-streams";
+  "seqloc-datafiles" = dontDistribute super."seqloc-datafiles";
+  "sequence" = dontDistribute super."sequence";
+  "sequent-core" = dontDistribute super."sequent-core";
+  "sequential-index" = dontDistribute super."sequential-index";
+  "sequor" = dontDistribute super."sequor";
+  "serial" = dontDistribute super."serial";
+  "serial-test-generators" = dontDistribute super."serial-test-generators";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-with" = dontDistribute super."set-with";
+  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
+  "setops" = dontDistribute super."setops";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
+  "sexp-show" = dontDistribute super."sexp-show";
+  "sexpr" = dontDistribute super."sexpr";
+  "sext" = dontDistribute super."sext";
+  "sfml-audio" = dontDistribute super."sfml-audio";
+  "sfmt" = dontDistribute super."sfmt";
+  "sgd" = dontDistribute super."sgd";
+  "sgf" = dontDistribute super."sgf";
+  "sgrep" = dontDistribute super."sgrep";
+  "sha-streams" = dontDistribute super."sha-streams";
+  "shadower" = dontDistribute super."shadower";
+  "shadowsocks" = dontDistribute super."shadowsocks";
+  "shady-gen" = dontDistribute super."shady-gen";
+  "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake-cabal-build" = dontDistribute super."shake-cabal-build";
+  "shake-extras" = dontDistribute super."shake-extras";
+  "shake-minify" = dontDistribute super."shake-minify";
+  "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
+  "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
+  "shakespeare-css" = dontDistribute super."shakespeare-css";
+  "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
+  "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-text" = dontDistribute super."shakespeare-text";
+  "shana" = dontDistribute super."shana";
+  "shapefile" = dontDistribute super."shapefile";
+  "shapely-data" = dontDistribute super."shapely-data";
+  "sharc-timbre" = dontDistribute super."sharc-timbre";
+  "shared-buffer" = dontDistribute super."shared-buffer";
+  "shared-fields" = dontDistribute super."shared-fields";
+  "shared-memory" = dontDistribute super."shared-memory";
+  "sharedio" = dontDistribute super."sharedio";
+  "she" = dontDistribute super."she";
+  "shelduck" = dontDistribute super."shelduck";
+  "shell-escape" = dontDistribute super."shell-escape";
+  "shell-monad" = dontDistribute super."shell-monad";
+  "shell-pipe" = dontDistribute super."shell-pipe";
+  "shellish" = dontDistribute super."shellish";
+  "shellmate" = dontDistribute super."shellmate";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "shivers-cfg" = dontDistribute super."shivers-cfg";
+  "shoap" = dontDistribute super."shoap";
+  "shortcircuit" = dontDistribute super."shortcircuit";
+  "shorten-strings" = dontDistribute super."shorten-strings";
+  "show" = dontDistribute super."show";
+  "show-type" = dontDistribute super."show-type";
+  "showdown" = dontDistribute super."showdown";
+  "shpider" = dontDistribute super."shpider";
+  "shplit" = dontDistribute super."shplit";
+  "shqq" = dontDistribute super."shqq";
+  "shuffle" = dontDistribute super."shuffle";
+  "sieve" = dontDistribute super."sieve";
+  "sifflet" = dontDistribute super."sifflet";
+  "sifflet-lib" = dontDistribute super."sifflet-lib";
+  "sign" = dontDistribute super."sign";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple-actors" = dontDistribute super."simple-actors";
+  "simple-atom" = dontDistribute super."simple-atom";
+  "simple-bluetooth" = dontDistribute super."simple-bluetooth";
+  "simple-c-value" = dontDistribute super."simple-c-value";
+  "simple-conduit" = dontDistribute super."simple-conduit";
+  "simple-config" = dontDistribute super."simple-config";
+  "simple-css" = dontDistribute super."simple-css";
+  "simple-eval" = dontDistribute super."simple-eval";
+  "simple-firewire" = dontDistribute super."simple-firewire";
+  "simple-form" = dontDistribute super."simple-form";
+  "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm";
+  "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr";
+  "simple-get-opt" = dontDistribute super."simple-get-opt";
+  "simple-index" = dontDistribute super."simple-index";
+  "simple-log" = dontDistribute super."simple-log";
+  "simple-log-syslog" = dontDistribute super."simple-log-syslog";
+  "simple-neural-networks" = dontDistribute super."simple-neural-networks";
+  "simple-nix" = dontDistribute super."simple-nix";
+  "simple-observer" = dontDistribute super."simple-observer";
+  "simple-pascal" = dontDistribute super."simple-pascal";
+  "simple-pipe" = dontDistribute super."simple-pipe";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-sessions" = dontDistribute super."simple-sessions";
+  "simple-sql-parser" = dontDistribute super."simple-sql-parser";
+  "simple-stacked-vm" = dontDistribute super."simple-stacked-vm";
+  "simple-tabular" = dontDistribute super."simple-tabular";
+  "simple-vec3" = dontDistribute super."simple-vec3";
+  "simpleargs" = dontDistribute super."simpleargs";
+  "simpleirc" = dontDistribute super."simpleirc";
+  "simpleirc-lens" = dontDistribute super."simpleirc-lens";
+  "simplenote" = dontDistribute super."simplenote";
+  "simpleprelude" = dontDistribute super."simpleprelude";
+  "simplesmtpclient" = dontDistribute super."simplesmtpclient";
+  "simplessh" = dontDistribute super."simplessh";
+  "simplest-sqlite" = dontDistribute super."simplest-sqlite";
+  "simplex" = dontDistribute super."simplex";
+  "simplex-basic" = dontDistribute super."simplex-basic";
+  "simseq" = dontDistribute super."simseq";
+  "simtreelo" = dontDistribute super."simtreelo";
+  "sindre" = dontDistribute super."sindre";
+  "singleton-nats" = dontDistribute super."singleton-nats";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "sized" = dontDistribute super."sized";
+  "sized-types" = dontDistribute super."sized-types";
+  "sized-vector" = dontDistribute super."sized-vector";
+  "sizes" = dontDistribute super."sizes";
+  "sjsp" = dontDistribute super."sjsp";
+  "skeleton" = dontDistribute super."skeleton";
+  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
+  "skype4hs" = dontDistribute super."skype4hs";
+  "skypelogexport" = dontDistribute super."skypelogexport";
+  "slack" = dontDistribute super."slack";
+  "slack-api" = dontDistribute super."slack-api";
+  "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
+  "slidemews" = dontDistribute super."slidemews";
+  "sloane" = dontDistribute super."sloane";
+  "slot-lambda" = dontDistribute super."slot-lambda";
+  "sloth" = dontDistribute super."sloth";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake-game" = dontDistribute super."snake-game";
+  "snap-accept" = dontDistribute super."snap-accept";
+  "snap-app" = dontDistribute super."snap-app";
+  "snap-auth-cli" = dontDistribute super."snap-auth-cli";
+  "snap-blaze" = dontDistribute super."snap-blaze";
+  "snap-blaze-clay" = dontDistribute super."snap-blaze-clay";
+  "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities";
+  "snap-cors" = dontDistribute super."snap-cors";
+  "snap-elm" = dontDistribute super."snap-elm";
+  "snap-error-collector" = dontDistribute super."snap-error-collector";
+  "snap-extras" = dontDistribute super."snap-extras";
+  "snap-language" = dontDistribute super."snap-language";
+  "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic";
+  "snap-loader-static" = dontDistribute super."snap-loader-static";
+  "snap-predicates" = dontDistribute super."snap-predicates";
+  "snap-testing" = dontDistribute super."snap-testing";
+  "snap-utils" = dontDistribute super."snap-utils";
+  "snap-web-routes" = dontDistribute super."snap-web-routes";
+  "snaplet-acid-state" = dontDistribute super."snaplet-acid-state";
+  "snaplet-actionlog" = dontDistribute super."snaplet-actionlog";
+  "snaplet-amqp" = dontDistribute super."snaplet-amqp";
+  "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid";
+  "snaplet-coffee" = dontDistribute super."snaplet-coffee";
+  "snaplet-css-min" = dontDistribute super."snaplet-css-min";
+  "snaplet-environments" = dontDistribute super."snaplet-environments";
+  "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs";
+  "snaplet-hasql" = dontDistribute super."snaplet-hasql";
+  "snaplet-haxl" = dontDistribute super."snaplet-haxl";
+  "snaplet-hdbc" = dontDistribute super."snaplet-hdbc";
+  "snaplet-hslogger" = dontDistribute super."snaplet-hslogger";
+  "snaplet-i18n" = dontDistribute super."snaplet-i18n";
+  "snaplet-influxdb" = dontDistribute super."snaplet-influxdb";
+  "snaplet-lss" = dontDistribute super."snaplet-lss";
+  "snaplet-mandrill" = dontDistribute super."snaplet-mandrill";
+  "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB";
+  "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic";
+  "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple";
+  "snaplet-oauth" = dontDistribute super."snaplet-oauth";
+  "snaplet-persistent" = dontDistribute super."snaplet-persistent";
+  "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple";
+  "snaplet-postmark" = dontDistribute super."snaplet-postmark";
+  "snaplet-purescript" = dontDistribute super."snaplet-purescript";
+  "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha";
+  "snaplet-redis" = dontDistribute super."snaplet-redis";
+  "snaplet-redson" = dontDistribute super."snaplet-redson";
+  "snaplet-rest" = dontDistribute super."snaplet-rest";
+  "snaplet-riak" = dontDistribute super."snaplet-riak";
+  "snaplet-sass" = dontDistribute super."snaplet-sass";
+  "snaplet-sedna" = dontDistribute super."snaplet-sedna";
+  "snaplet-ses-html" = dontDistribute super."snaplet-ses-html";
+  "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple";
+  "snaplet-stripe" = dontDistribute super."snaplet-stripe";
+  "snaplet-tasks" = dontDistribute super."snaplet-tasks";
+  "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions";
+  "snaplet-wordpress" = dontDistribute super."snaplet-wordpress";
+  "snappy" = dontDistribute super."snappy";
+  "snappy-conduit" = dontDistribute super."snappy-conduit";
+  "snappy-framing" = dontDistribute super."snappy-framing";
+  "snappy-iteratee" = dontDistribute super."snappy-iteratee";
+  "sndfile-enumerators" = dontDistribute super."sndfile-enumerators";
+  "sneakyterm" = dontDistribute super."sneakyterm";
+  "sneathlane-haste" = dontDistribute super."sneathlane-haste";
+  "snippet-extractor" = dontDistribute super."snippet-extractor";
+  "snm" = dontDistribute super."snm";
+  "snow-white" = dontDistribute super."snow-white";
+  "snowball" = dontDistribute super."snowball";
+  "snowglobe" = dontDistribute super."snowglobe";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket-activation" = dontDistribute super."socket-activation";
+  "socket-sctp" = dontDistribute super."socket-sctp";
+  "socketio" = dontDistribute super."socketio";
+  "soegtk" = dontDistribute super."soegtk";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "sorting" = dontDistribute super."sorting";
+  "sorty" = dontDistribute super."sorty";
+  "sound-collage" = dontDistribute super."sound-collage";
+  "sounddelay" = dontDistribute super."sounddelay";
+  "source-code-server" = dontDistribute super."source-code-server";
+  "sousit" = dontDistribute super."sousit";
+  "sox" = dontDistribute super."sox";
+  "soxlib" = dontDistribute super."soxlib";
+  "soyuz" = dontDistribute super."soyuz";
+  "spacefill" = dontDistribute super."spacefill";
+  "spacepart" = dontDistribute super."spacepart";
+  "spaceprobe" = dontDistribute super."spaceprobe";
+  "spanout" = dontDistribute super."spanout";
+  "sparse" = dontDistribute super."sparse";
+  "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
+  "sparsebit" = dontDistribute super."sparsebit";
+  "sparsecheck" = dontDistribute super."sparsecheck";
+  "sparser" = dontDistribute super."sparser";
+  "spata" = dontDistribute super."spata";
+  "spatial-math" = dontDistribute super."spatial-math";
+  "spawn" = dontDistribute super."spawn";
+  "spe" = dontDistribute super."spe";
+  "special-functors" = dontDistribute super."special-functors";
+  "special-keys" = dontDistribute super."special-keys";
+  "specialize-th" = dontDistribute super."specialize-th";
+  "species" = dontDistribute super."species";
+  "speculation-transformers" = dontDistribute super."speculation-transformers";
+  "spelling-suggest" = dontDistribute super."spelling-suggest";
+  "sphero" = dontDistribute super."sphero";
+  "sphinx-cli" = dontDistribute super."sphinx-cli";
+  "spice" = dontDistribute super."spice";
+  "spike" = dontDistribute super."spike";
+  "spine" = dontDistribute super."spine";
+  "spir-v" = dontDistribute super."spir-v";
+  "splay" = dontDistribute super."splay";
+  "splaytree" = dontDistribute super."splaytree";
+  "spline3" = dontDistribute super."spline3";
+  "splines" = dontDistribute super."splines";
+  "split-channel" = dontDistribute super."split-channel";
+  "split-record" = dontDistribute super."split-record";
+  "split-tchan" = dontDistribute super."split-tchan";
+  "splitter" = dontDistribute super."splitter";
+  "splot" = dontDistribute super."splot";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "spsa" = dontDistribute super."spsa";
+  "spy" = dontDistribute super."spy";
+  "sql-simple" = dontDistribute super."sql-simple";
+  "sql-simple-mysql" = dontDistribute super."sql-simple-mysql";
+  "sql-simple-pool" = dontDistribute super."sql-simple-pool";
+  "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql";
+  "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite";
+  "sql-words" = dontDistribute super."sql-words";
+  "sqlite" = dontDistribute super."sqlite";
+  "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed";
+  "sqlvalue-list" = dontDistribute super."sqlvalue-list";
+  "squeeze" = dontDistribute super."squeeze";
+  "sr-extra" = dontDistribute super."sr-extra";
+  "srcinst" = dontDistribute super."srcinst";
+  "srec" = dontDistribute super."srec";
+  "sscgi" = dontDistribute super."sscgi";
+  "ssh" = dontDistribute super."ssh";
+  "sshd-lint" = dontDistribute super."sshd-lint";
+  "sshtun" = dontDistribute super."sshtun";
+  "sssp" = dontDistribute super."sssp";
+  "sstable" = dontDistribute super."sstable";
+  "ssv" = dontDistribute super."ssv";
+  "stable-heap" = dontDistribute super."stable-heap";
+  "stable-maps" = dontDistribute super."stable-maps";
+  "stable-marriage" = dontDistribute super."stable-marriage";
+  "stable-memo" = dontDistribute super."stable-memo";
+  "stable-tree" = dontDistribute super."stable-tree";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
+  "standalone-haddock" = dontDistribute super."standalone-haddock";
+  "star-to-star" = dontDistribute super."star-to-star";
+  "star-to-star-contra" = dontDistribute super."star-to-star-contra";
+  "starling" = dontDistribute super."starling";
+  "starrover2" = dontDistribute super."starrover2";
+  "stash" = dontDistribute super."stash";
+  "state" = dontDistribute super."state";
+  "state-record" = dontDistribute super."state-record";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-firehose" = dontDistribute super."stm-firehose";
+  "stm-io-hooks" = dontDistribute super."stm-io-hooks";
+  "stm-lifted" = dontDistribute super."stm-lifted";
+  "stm-linkedlist" = dontDistribute super."stm-linkedlist";
+  "stm-orelse-io" = dontDistribute super."stm-orelse-io";
+  "stm-promise" = dontDistribute super."stm-promise";
+  "stm-queue-extras" = dontDistribute super."stm-queue-extras";
+  "stm-sbchan" = dontDistribute super."stm-sbchan";
+  "stm-split" = dontDistribute super."stm-split";
+  "stm-tlist" = dontDistribute super."stm-tlist";
+  "stmcontrol" = dontDistribute super."stmcontrol";
+  "stomp-conduit" = dontDistribute super."stomp-conduit";
+  "stomp-patterns" = dontDistribute super."stomp-patterns";
+  "stomp-queue" = dontDistribute super."stomp-queue";
+  "stompl" = dontDistribute super."stompl";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "storable" = dontDistribute super."storable";
+  "storable-record" = dontDistribute super."storable-record";
+  "storable-static-array" = dontDistribute super."storable-static-array";
+  "storable-tuple" = dontDistribute super."storable-tuple";
+  "storablevector" = dontDistribute super."storablevector";
+  "storablevector-carray" = dontDistribute super."storablevector-carray";
+  "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
+  "strict-concurrency" = dontDistribute super."strict-concurrency";
+  "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
+  "strict-identity" = dontDistribute super."strict-identity";
+  "strict-io" = dontDistribute super."strict-io";
+  "strictify" = dontDistribute super."strictify";
+  "strictly" = dontDistribute super."strictly";
+  "string" = dontDistribute super."string";
+  "string-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
+  "stringlike" = dontDistribute super."stringlike";
+  "stringprep" = dontDistribute super."stringprep";
+  "strings" = dontDistribute super."strings";
+  "stringtable-atom" = dontDistribute super."stringtable-atom";
+  "strio" = dontDistribute super."strio";
+  "stripe" = dontDistribute super."stripe";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "structured-haskell-mode" = dontDistribute super."structured-haskell-mode";
+  "structured-mongoDB" = dontDistribute super."structured-mongoDB";
+  "structures" = dontDistribute super."structures";
+  "stunclient" = dontDistribute super."stunclient";
+  "stunts" = dontDistribute super."stunts";
+  "stylized" = dontDistribute super."stylized";
+  "sub-state" = dontDistribute super."sub-state";
+  "subhask" = dontDistribute super."subhask";
+  "subleq-toolchain" = dontDistribute super."subleq-toolchain";
+  "subnet" = dontDistribute super."subnet";
+  "subtitleParser" = dontDistribute super."subtitleParser";
+  "subtitles" = dontDistribute super."subtitles";
+  "success" = doDistribute super."success_0_2_6";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "sunlight" = dontDistribute super."sunlight";
+  "sunroof-compiler" = dontDistribute super."sunroof-compiler";
+  "sunroof-examples" = dontDistribute super."sunroof-examples";
+  "sunroof-server" = dontDistribute super."sunroof-server";
+  "super-user-spark" = dontDistribute super."super-user-spark";
+  "supercollider-ht" = dontDistribute super."supercollider-ht";
+  "supercollider-midi" = dontDistribute super."supercollider-midi";
+  "superdoc" = dontDistribute super."superdoc";
+  "supero" = dontDistribute super."supero";
+  "supervisor" = dontDistribute super."supervisor";
+  "suspend" = dontDistribute super."suspend";
+  "svg2q" = dontDistribute super."svg2q";
+  "svgcairo" = dontDistribute super."svgcairo";
+  "svgutils" = dontDistribute super."svgutils";
+  "svm" = dontDistribute super."svm";
+  "svm-light-utils" = dontDistribute super."svm-light-utils";
+  "svm-simple" = dontDistribute super."svm-simple";
+  "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_1_2_1";
+  "swapper" = dontDistribute super."swapper";
+  "swearjure" = dontDistribute super."swearjure";
+  "swf" = dontDistribute super."swf";
+  "swift-lda" = dontDistribute super."swift-lda";
+  "swish" = dontDistribute super."swish";
+  "sws" = dontDistribute super."sws";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text";
+  "sylvia" = dontDistribute super."sylvia";
+  "sym" = dontDistribute super."sym";
+  "sym-plot" = dontDistribute super."sym-plot";
+  "symbol" = dontDistribute super."symbol";
+  "sync" = dontDistribute super."sync";
+  "synchronous-channels" = dontDistribute super."synchronous-channels";
+  "syncthing-hs" = dontDistribute super."syncthing-hs";
+  "synt" = dontDistribute super."synt";
+  "syntactic" = dontDistribute super."syntactic";
+  "syntactical" = dontDistribute super."syntactical";
+  "syntax" = dontDistribute super."syntax";
+  "syntax-attoparsec" = dontDistribute super."syntax-attoparsec";
+  "syntax-example" = dontDistribute super."syntax-example";
+  "syntax-example-json" = dontDistribute super."syntax-example-json";
+  "syntax-pretty" = dontDistribute super."syntax-pretty";
+  "syntax-printer" = dontDistribute super."syntax-printer";
+  "syntax-trees" = dontDistribute super."syntax-trees";
+  "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn";
+  "synthesizer" = dontDistribute super."synthesizer";
+  "synthesizer-alsa" = dontDistribute super."synthesizer-alsa";
+  "synthesizer-core" = dontDistribute super."synthesizer-core";
+  "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional";
+  "synthesizer-filter" = dontDistribute super."synthesizer-filter";
+  "synthesizer-inference" = dontDistribute super."synthesizer-inference";
+  "synthesizer-llvm" = dontDistribute super."synthesizer-llvm";
+  "synthesizer-midi" = dontDistribute super."synthesizer-midi";
+  "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient";
+  "sys-process" = dontDistribute super."sys-process";
+  "system-canonicalpath" = dontDistribute super."system-canonicalpath";
+  "system-command" = dontDistribute super."system-command";
+  "system-gpio" = dontDistribute super."system-gpio";
+  "system-inotify" = dontDistribute super."system-inotify";
+  "system-lifted" = dontDistribute super."system-lifted";
+  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
+  "system-util" = dontDistribute super."system-util";
+  "system-uuid" = dontDistribute super."system-uuid";
+  "systemd" = dontDistribute super."systemd";
+  "t-regex" = dontDistribute super."t-regex";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "table-tennis" = dontDistribute super."table-tennis";
+  "tableaux" = dontDistribute super."tableaux";
+  "tables" = dontDistribute super."tables";
+  "tablestorage" = dontDistribute super."tablestorage";
+  "tabloid" = dontDistribute super."tabloid";
+  "taffybar" = dontDistribute super."taffybar";
+  "tag-bits" = dontDistribute super."tag-bits";
+  "tag-stream" = dontDistribute super."tag-stream";
+  "tagchup" = dontDistribute super."tagchup";
+  "tagged-exception-core" = dontDistribute super."tagged-exception-core";
+  "tagged-list" = dontDistribute super."tagged-list";
+  "tagged-th" = dontDistribute super."tagged-th";
+  "tagged-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "taglib" = dontDistribute super."taglib";
+  "taglib-api" = dontDistribute super."taglib-api";
+  "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup-ht" = dontDistribute super."tagsoup-ht";
+  "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "takahashi" = dontDistribute super."takahashi";
+  "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tamarin-prover" = dontDistribute super."tamarin-prover";
+  "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
+  "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
+  "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
+  "tamper" = dontDistribute super."tamper";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "taskpool" = dontDistribute super."taskpool";
+  "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
+  "tasty-integrate" = dontDistribute super."tasty-integrate";
+  "tasty-laws" = dontDistribute super."tasty-laws";
+  "tasty-lens" = dontDistribute super."tasty-lens";
+  "tasty-program" = dontDistribute super."tasty-program";
+  "tateti-tateti" = dontDistribute super."tateti-tateti";
+  "tau" = dontDistribute super."tau";
+  "tbox" = dontDistribute super."tbox";
+  "tcache-AWS" = dontDistribute super."tcache-AWS";
+  "tccli" = dontDistribute super."tccli";
+  "tce-conf" = dontDistribute super."tce-conf";
+  "tconfig" = dontDistribute super."tconfig";
+  "tcp" = dontDistribute super."tcp";
+  "tdd-util" = dontDistribute super."tdd-util";
+  "tdoc" = dontDistribute super."tdoc";
+  "teams" = dontDistribute super."teams";
+  "teeth" = dontDistribute super."teeth";
+  "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
+  "template-default" = dontDistribute super."template-default";
+  "template-haskell-util" = dontDistribute super."template-haskell-util";
+  "template-hsml" = dontDistribute super."template-hsml";
+  "template-yj" = dontDistribute super."template-yj";
+  "templatepg" = dontDistribute super."templatepg";
+  "templater" = dontDistribute super."templater";
+  "tempodb" = dontDistribute super."tempodb";
+  "temporal-csound" = dontDistribute super."temporal-csound";
+  "temporal-media" = dontDistribute super."temporal-media";
+  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
+  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
+  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
+  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
+  "tempus" = dontDistribute super."tempus";
+  "tempus-fugit" = dontDistribute super."tempus-fugit";
+  "tensor" = dontDistribute super."tensor";
+  "term-rewriting" = dontDistribute super."term-rewriting";
+  "termbox-bindings" = dontDistribute super."termbox-bindings";
+  "termination-combinators" = dontDistribute super."termination-combinators";
+  "terminfo" = doDistribute super."terminfo_0_4_0_2";
+  "terminfo-hs" = dontDistribute super."terminfo-hs";
+  "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
+  "terrahs" = dontDistribute super."terrahs";
+  "tersmu" = dontDistribute super."tersmu";
+  "test-framework-doctest" = dontDistribute super."test-framework-doctest";
+  "test-framework-golden" = dontDistribute super."test-framework-golden";
+  "test-framework-program" = dontDistribute super."test-framework-program";
+  "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck";
+  "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
+  "test-framework-skip" = dontDistribute super."test-framework-skip";
+  "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-invariant" = dontDistribute super."test-invariant";
+  "test-pkg" = dontDistribute super."test-pkg";
+  "test-sandbox" = dontDistribute super."test-sandbox";
+  "test-sandbox-compose" = dontDistribute super."test-sandbox-compose";
+  "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit";
+  "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
+  "test-shouldbe" = dontDistribute super."test-shouldbe";
+  "testPkg" = dontDistribute super."testPkg";
+  "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
+  "testloop" = dontDistribute super."testloop";
+  "testpack" = dontDistribute super."testpack";
+  "testpattern" = dontDistribute super."testpattern";
+  "testrunner" = dontDistribute super."testrunner";
+  "tetris" = dontDistribute super."tetris";
+  "tex2txt" = dontDistribute super."tex2txt";
+  "texrunner" = dontDistribute super."texrunner";
+  "text-and-plots" = dontDistribute super."text-and-plots";
+  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-translit" = dontDistribute super."text-icu-translit";
+  "text-json-qq" = dontDistribute super."text-json-qq";
+  "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show-instances" = dontDistribute super."text-show-instances";
+  "text-stream-decode" = dontDistribute super."text-stream-decode";
+  "text-utf7" = dontDistribute super."text-utf7";
+  "text-xml-generic" = dontDistribute super."text-xml-generic";
+  "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text1" = dontDistribute super."text1";
+  "textPlot" = dontDistribute super."textPlot";
+  "textmatetags" = dontDistribute super."textmatetags";
+  "textocat-api" = dontDistribute super."textocat-api";
+  "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
+  "tfp" = dontDistribute super."tfp";
+  "tfp-th" = dontDistribute super."tfp-th";
+  "tftp" = dontDistribute super."tftp";
+  "tga" = dontDistribute super."tga";
+  "th-alpha" = dontDistribute super."th-alpha";
+  "th-build" = dontDistribute super."th-build";
+  "th-cas" = dontDistribute super."th-cas";
+  "th-context" = dontDistribute super."th-context";
+  "th-fold" = dontDistribute super."th-fold";
+  "th-inline-io-action" = dontDistribute super."th-inline-io-action";
+  "th-instance-reification" = dontDistribute super."th-instance-reification";
+  "th-instances" = dontDistribute super."th-instances";
+  "th-kinds" = dontDistribute super."th-kinds";
+  "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "thespian" = dontDistribute super."thespian";
+  "theta-functions" = dontDistribute super."theta-functions";
+  "thih" = dontDistribute super."thih";
+  "thimk" = dontDistribute super."thimk";
+  "thorn" = dontDistribute super."thorn";
+  "thread-local-storage" = dontDistribute super."thread-local-storage";
+  "threadPool" = dontDistribute super."threadPool";
+  "threadmanager" = dontDistribute super."threadmanager";
+  "threads-pool" = dontDistribute super."threads-pool";
+  "threads-supervisor" = dontDistribute super."threads-supervisor";
+  "threadscope" = dontDistribute super."threadscope";
+  "threefish" = dontDistribute super."threefish";
+  "threepenny-gui" = dontDistribute super."threepenny-gui";
+  "thrift" = dontDistribute super."thrift";
+  "thrist" = dontDistribute super."thrist";
+  "throttle" = dontDistribute super."throttle";
+  "thumbnail" = dontDistribute super."thumbnail";
+  "tianbar" = dontDistribute super."tianbar";
+  "tic-tac-toe" = dontDistribute super."tic-tac-toe";
+  "tickle" = dontDistribute super."tickle";
+  "tictactoe3d" = dontDistribute super."tictactoe3d";
+  "tidal" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "tidal-vis" = dontDistribute super."tidal-vis";
+  "tie-knot" = dontDistribute super."tie-knot";
+  "tiempo" = dontDistribute super."tiempo";
+  "tiger" = dontDistribute super."tiger";
+  "tight-apply" = dontDistribute super."tight-apply";
+  "tightrope" = dontDistribute super."tightrope";
+  "tighttp" = dontDistribute super."tighttp";
+  "tilings" = dontDistribute super."tilings";
+  "timberc" = dontDistribute super."timberc";
+  "time-extras" = dontDistribute super."time-extras";
+  "time-exts" = dontDistribute super."time-exts";
+  "time-http" = dontDistribute super."time-http";
+  "time-interval" = dontDistribute super."time-interval";
+  "time-io-access" = dontDistribute super."time-io-access";
+  "time-patterns" = dontDistribute super."time-patterns";
+  "time-qq" = dontDistribute super."time-qq";
+  "time-recurrence" = dontDistribute super."time-recurrence";
+  "time-series" = dontDistribute super."time-series";
+  "time-w3c" = dontDistribute super."time-w3c";
+  "timecalc" = dontDistribute super."timecalc";
+  "timeconsole" = dontDistribute super."timeconsole";
+  "timeless" = dontDistribute super."timeless";
+  "timelike" = dontDistribute super."timelike";
+  "timelike-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "timeout" = dontDistribute super."timeout";
+  "timeout-control" = dontDistribute super."timeout-control";
+  "timeout-with-results" = dontDistribute super."timeout-with-results";
+  "timeparsers" = dontDistribute super."timeparsers";
+  "timeplot" = dontDistribute super."timeplot";
+  "timers" = dontDistribute super."timers";
+  "timers-updatable" = dontDistribute super."timers-updatable";
+  "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines";
+  "timestamper" = dontDistribute super."timestamper";
+  "timezone-olson-th" = dontDistribute super."timezone-olson-th";
+  "timing-convenience" = dontDistribute super."timing-convenience";
+  "tinyMesh" = dontDistribute super."tinyMesh";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls-extra" = dontDistribute super."tls-extra";
+  "tmpl" = dontDistribute super."tmpl";
+  "tn" = dontDistribute super."tn";
+  "tnet" = dontDistribute super."tnet";
+  "to-haskell" = dontDistribute super."to-haskell";
+  "to-string-class" = dontDistribute super."to-string-class";
+  "to-string-instances" = dontDistribute super."to-string-instances";
+  "todos" = dontDistribute super."todos";
+  "tofromxml" = dontDistribute super."tofromxml";
+  "toilet" = dontDistribute super."toilet";
+  "tokenify" = dontDistribute super."tokenify";
+  "tokenize" = dontDistribute super."tokenize";
+  "toktok" = dontDistribute super."toktok";
+  "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell";
+  "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell";
+  "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal";
+  "toml" = dontDistribute super."toml";
+  "toolshed" = dontDistribute super."toolshed";
+  "topkata" = dontDistribute super."topkata";
+  "torch" = dontDistribute super."torch";
+  "total" = dontDistribute super."total";
+  "total-map" = dontDistribute super."total-map";
+  "total-maps" = dontDistribute super."total-maps";
+  "touched" = dontDistribute super."touched";
+  "toysolver" = dontDistribute super."toysolver";
+  "tpdb" = dontDistribute super."tpdb";
+  "trace" = dontDistribute super."trace";
+  "trace-call" = dontDistribute super."trace-call";
+  "trace-function-call" = dontDistribute super."trace-function-call";
+  "traced" = dontDistribute super."traced";
+  "tracer" = dontDistribute super."tracer";
+  "tracker" = dontDistribute super."tracker";
+  "trajectory" = dontDistribute super."trajectory";
+  "transactional-events" = dontDistribute super."transactional-events";
+  "transf" = dontDistribute super."transf";
+  "transformations" = dontDistribute super."transformations";
+  "transformers-abort" = dontDistribute super."transformers-abort";
+  "transformers-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "translatable-intset" = dontDistribute super."translatable-intset";
+  "translate" = dontDistribute super."translate";
+  "travis" = dontDistribute super."travis";
+  "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
+  "trawl" = dontDistribute super."trawl";
+  "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-monad" = dontDistribute super."tree-monad";
+  "treemap-html" = dontDistribute super."treemap-html";
+  "treemap-html-tools" = dontDistribute super."treemap-html-tools";
+  "treersec" = dontDistribute super."treersec";
+  "treeviz" = dontDistribute super."treeviz";
+  "tremulous-query" = dontDistribute super."tremulous-query";
+  "trhsx" = dontDistribute super."trhsx";
+  "triangulation" = dontDistribute super."triangulation";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "truelevel" = dontDistribute super."truelevel";
+  "trurl" = dontDistribute super."trurl";
+  "truthful" = dontDistribute super."truthful";
+  "tsession" = dontDistribute super."tsession";
+  "tsession-happstack" = dontDistribute super."tsession-happstack";
+  "tskiplist" = dontDistribute super."tskiplist";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tupleinstances" = dontDistribute super."tupleinstances";
+  "turing" = dontDistribute super."turing";
+  "turing-music" = dontDistribute super."turing-music";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "tweak" = dontDistribute super."tweak";
+  "twentefp" = dontDistribute super."twentefp";
+  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
+  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
+  "twentefp-graphs" = dontDistribute super."twentefp-graphs";
+  "twentefp-number" = dontDistribute super."twentefp-number";
+  "twentefp-rosetree" = dontDistribute super."twentefp-rosetree";
+  "twentefp-trees" = dontDistribute super."twentefp-trees";
+  "twentefp-websockets" = dontDistribute super."twentefp-websockets";
+  "twhs" = dontDistribute super."twhs";
+  "twidge" = dontDistribute super."twidge";
+  "twilight-stm" = dontDistribute super."twilight-stm";
+  "twilio" = dontDistribute super."twilio";
+  "twill" = dontDistribute super."twill";
+  "twiml" = dontDistribute super."twiml";
+  "twine" = dontDistribute super."twine";
+  "twisty" = dontDistribute super."twisty";
+  "twitch" = dontDistribute super."twitch";
+  "twitter" = dontDistribute super."twitter";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "tx" = dontDistribute super."tx";
+  "txt-sushi" = dontDistribute super."txt-sushi";
+  "txt2rtf" = dontDistribute super."txt2rtf";
+  "txtblk" = dontDistribute super."txtblk";
+  "ty" = dontDistribute super."ty";
+  "typalyze" = dontDistribute super."typalyze";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
+  "type-cereal" = dontDistribute super."type-cereal";
+  "type-combinators" = dontDistribute super."type-combinators";
+  "type-combinators-quote" = dontDistribute super."type-combinators-quote";
+  "type-digits" = dontDistribute super."type-digits";
+  "type-equality" = dontDistribute super."type-equality";
+  "type-equality-check" = dontDistribute super."type-equality-check";
+  "type-fun" = dontDistribute super."type-fun";
+  "type-functions" = dontDistribute super."type-functions";
+  "type-hint" = dontDistribute super."type-hint";
+  "type-int" = dontDistribute super."type-int";
+  "type-iso" = dontDistribute super."type-iso";
+  "type-level" = dontDistribute super."type-level";
+  "type-level-bst" = dontDistribute super."type-level-bst";
+  "type-level-natural-number" = dontDistribute super."type-level-natural-number";
+  "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction";
+  "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations";
+  "type-level-sets" = dontDistribute super."type-level-sets";
+  "type-level-tf" = dontDistribute super."type-level-tf";
+  "type-natural" = dontDistribute super."type-natural";
+  "type-ord" = dontDistribute super."type-ord";
+  "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
+  "type-prelude" = dontDistribute super."type-prelude";
+  "type-settheory" = dontDistribute super."type-settheory";
+  "type-spine" = dontDistribute super."type-spine";
+  "type-structure" = dontDistribute super."type-structure";
+  "type-sub-th" = dontDistribute super."type-sub-th";
+  "type-unary" = dontDistribute super."type-unary";
+  "typeable-th" = dontDistribute super."typeable-th";
+  "typed-spreadsheet" = dontDistribute super."typed-spreadsheet";
+  "typed-wire" = dontDistribute super."typed-wire";
+  "typed-wire-utils" = dontDistribute super."typed-wire-utils";
+  "typedquery" = dontDistribute super."typedquery";
+  "typehash" = dontDistribute super."typehash";
+  "typelevel" = dontDistribute super."typelevel";
+  "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "uberlast" = dontDistribute super."uberlast";
+  "uconv" = dontDistribute super."uconv";
+  "udbus" = dontDistribute super."udbus";
+  "udbus-model" = dontDistribute super."udbus-model";
+  "udcode" = dontDistribute super."udcode";
+  "udev" = dontDistribute super."udev";
+  "uhc-light" = dontDistribute super."uhc-light";
+  "uhc-util" = dontDistribute super."uhc-util";
+  "uhexdump" = dontDistribute super."uhexdump";
+  "uhttpc" = dontDistribute super."uhttpc";
+  "ui-command" = dontDistribute super."ui-command";
+  "uid" = dontDistribute super."uid";
+  "una" = dontDistribute super."una";
+  "unagi-chan" = dontDistribute super."unagi-chan";
+  "unagi-streams" = dontDistribute super."unagi-streams";
+  "unamb" = dontDistribute super."unamb";
+  "unamb-custom" = dontDistribute super."unamb-custom";
+  "unbound" = dontDistribute super."unbound";
+  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
+  "unboxed-containers" = dontDistribute super."unboxed-containers";
+  "unbreak" = dontDistribute super."unbreak";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "ungadtagger" = dontDistribute super."ungadtagger";
+  "uni-events" = dontDistribute super."uni-events";
+  "uni-graphs" = dontDistribute super."uni-graphs";
+  "uni-htk" = dontDistribute super."uni-htk";
+  "uni-posixutil" = dontDistribute super."uni-posixutil";
+  "uni-reactor" = dontDistribute super."uni-reactor";
+  "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph";
+  "uni-util" = dontDistribute super."uni-util";
+  "unicode" = dontDistribute super."unicode";
+  "unicode-names" = dontDistribute super."unicode-names";
+  "unicode-normalization" = dontDistribute super."unicode-normalization";
+  "unicode-prelude" = dontDistribute super."unicode-prelude";
+  "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
+  "unicode-symbols" = dontDistribute super."unicode-symbols";
+  "unicoder" = dontDistribute super."unicoder";
+  "uniform-io" = dontDistribute super."uniform-io";
+  "uniform-pair" = dontDistribute super."uniform-pair";
+  "union-find-array" = dontDistribute super."union-find-array";
+  "union-map" = dontDistribute super."union-map";
+  "unique" = dontDistribute super."unique";
+  "unique-logic" = dontDistribute super."unique-logic";
+  "unique-logic-tf" = dontDistribute super."unique-logic-tf";
+  "uniqueid" = dontDistribute super."uniqueid";
+  "unit" = dontDistribute super."unit";
+  "units" = dontDistribute super."units";
+  "units-attoparsec" = dontDistribute super."units-attoparsec";
+  "units-defs" = dontDistribute super."units-defs";
+  "units-parser" = dontDistribute super."units-parser";
+  "unittyped" = dontDistribute super."unittyped";
+  "universal-binary" = dontDistribute super."universal-binary";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-fcntl" = dontDistribute super."unix-fcntl";
+  "unix-handle" = dontDistribute super."unix-handle";
+  "unix-io-extra" = dontDistribute super."unix-io-extra";
+  "unix-memory" = dontDistribute super."unix-memory";
+  "unix-process-conduit" = dontDistribute super."unix-process-conduit";
+  "unix-pty-light" = dontDistribute super."unix-pty-light";
+  "unlambda" = dontDistribute super."unlambda";
+  "unlit" = dontDistribute super."unlit";
+  "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
+  "unordered-graphs" = dontDistribute super."unordered-graphs";
+  "unpack-funcs" = dontDistribute super."unpack-funcs";
+  "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin";
+  "unsafe" = dontDistribute super."unsafe";
+  "unsafe-promises" = dontDistribute super."unsafe-promises";
+  "unsafely" = dontDistribute super."unsafely";
+  "unsafeperformst" = dontDistribute super."unsafeperformst";
+  "unscramble" = dontDistribute super."unscramble";
+  "unusable-pkg" = dontDistribute super."unusable-pkg";
+  "uom-plugin" = dontDistribute super."uom-plugin";
+  "up" = dontDistribute super."up";
+  "up-grade" = dontDistribute super."up-grade";
+  "uploadcare" = dontDistribute super."uploadcare";
+  "upskirt" = dontDistribute super."upskirt";
+  "ureader" = dontDistribute super."ureader";
+  "urembed" = dontDistribute super."urembed";
+  "uri" = dontDistribute super."uri";
+  "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-enumerator" = dontDistribute super."uri-enumerator";
+  "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
+  "uri-template" = dontDistribute super."uri-template";
+  "url-generic" = dontDistribute super."url-generic";
+  "urlcheck" = dontDistribute super."urlcheck";
+  "urldecode" = dontDistribute super."urldecode";
+  "urldisp-happstack" = dontDistribute super."urldisp-happstack";
+  "urlencoded" = dontDistribute super."urlencoded";
+  "urn" = dontDistribute super."urn";
+  "urxml" = dontDistribute super."urxml";
+  "usb" = dontDistribute super."usb";
+  "usb-enumerator" = dontDistribute super."usb-enumerator";
+  "usb-hid" = dontDistribute super."usb-hid";
+  "usb-id-database" = dontDistribute super."usb-id-database";
+  "usb-iteratee" = dontDistribute super."usb-iteratee";
+  "usb-safe" = dontDistribute super."usb-safe";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "uu-cco" = dontDistribute super."uu-cco";
+  "uu-cco-examples" = dontDistribute super."uu-cco-examples";
+  "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
+  "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib";
+  "uu-options" = dontDistribute super."uu-options";
+  "uu-tc" = dontDistribute super."uu-tc";
+  "uuagc" = dontDistribute super."uuagc";
+  "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap";
+  "uuagc-cabal" = dontDistribute super."uuagc-cabal";
+  "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
+  "uuagd" = dontDistribute super."uuagd";
+  "uuid-aeson" = dontDistribute super."uuid-aeson";
+  "uuid-le" = dontDistribute super."uuid-le";
+  "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uulib" = dontDistribute super."uulib";
+  "uvector" = dontDistribute super."uvector";
+  "uvector-algorithms" = dontDistribute super."uvector-algorithms";
+  "uxadt" = dontDistribute super."uxadt";
+  "uzbl-with-source" = dontDistribute super."uzbl-with-source";
+  "v4l2" = dontDistribute super."v4l2";
+  "v4l2-examples" = dontDistribute super."v4l2-examples";
+  "vacuum" = dontDistribute super."vacuum";
+  "vacuum-cairo" = dontDistribute super."vacuum-cairo";
+  "vacuum-graphviz" = dontDistribute super."vacuum-graphviz";
+  "vacuum-opengl" = dontDistribute super."vacuum-opengl";
+  "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph";
+  "vado" = dontDistribute super."vado";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validations" = dontDistribute super."validations";
+  "value-supply" = dontDistribute super."value-supply";
+  "vampire" = dontDistribute super."vampire";
+  "var" = dontDistribute super."var";
+  "varan" = dontDistribute super."varan";
+  "variable-precision" = dontDistribute super."variable-precision";
+  "variables" = dontDistribute super."variables";
+  "varying" = dontDistribute super."varying";
+  "vaultaire-common" = dontDistribute super."vaultaire-common";
+  "vcache" = dontDistribute super."vcache";
+  "vcache-trie" = dontDistribute super."vcache-trie";
+  "vcard" = dontDistribute super."vcard";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "vect-floating" = dontDistribute super."vect-floating";
+  "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
+  "vect-opengl" = dontDistribute super."vect-opengl";
+  "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_1";
+  "vector-bytestring" = dontDistribute super."vector-bytestring";
+  "vector-clock" = dontDistribute super."vector-clock";
+  "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-functorlazy" = dontDistribute super."vector-functorlazy";
+  "vector-heterogenous" = dontDistribute super."vector-heterogenous";
+  "vector-instances-collections" = dontDistribute super."vector-instances-collections";
+  "vector-mmap" = dontDistribute super."vector-mmap";
+  "vector-random" = dontDistribute super."vector-random";
+  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "vector-space-points" = dontDistribute super."vector-space-points";
+  "vector-static" = dontDistribute super."vector-static";
+  "vector-strategies" = dontDistribute super."vector-strategies";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = dontDistribute super."versions";
+  "vhdl" = dontDistribute super."vhdl";
+  "views" = dontDistribute super."views";
+  "vigilance" = dontDistribute super."vigilance";
+  "vimeta" = dontDistribute super."vimeta";
+  "vimus" = dontDistribute super."vimus";
+  "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
+  "virthualenv" = dontDistribute super."virthualenv";
+  "visibility" = dontDistribute super."visibility";
+  "vision" = dontDistribute super."vision";
+  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
+  "visual-prof" = dontDistribute super."visual-prof";
+  "vivid" = dontDistribute super."vivid";
+  "vk-aws-route53" = dontDistribute super."vk-aws-route53";
+  "vk-posix-pty" = dontDistribute super."vk-posix-pty";
+  "vocabulary-kadma" = dontDistribute super."vocabulary-kadma";
+  "vorbiscomment" = dontDistribute super."vorbiscomment";
+  "vowpal-utils" = dontDistribute super."vowpal-utils";
+  "voyeur" = dontDistribute super."voyeur";
+  "vrpn" = dontDistribute super."vrpn";
+  "vte" = dontDistribute super."vte";
+  "vtegtk3" = dontDistribute super."vtegtk3";
+  "vty-examples" = dontDistribute super."vty-examples";
+  "vty-menu" = dontDistribute super."vty-menu";
+  "vty-ui" = dontDistribute super."vty-ui";
+  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "waddle" = dontDistribute super."waddle";
+  "wai-accept-language" = dontDistribute super."wai-accept-language";
+  "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-devel" = dontDistribute super."wai-devel";
+  "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
+  "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
+  "wai-graceful" = dontDistribute super."wai-graceful";
+  "wai-handler-devel" = dontDistribute super."wai-handler-devel";
+  "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
+  "wai-handler-snap" = dontDistribute super."wai-handler-snap";
+  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
+  "wai-hastache" = dontDistribute super."wai-hastache";
+  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-lens" = dontDistribute super."wai-lens";
+  "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
+  "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
+  "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
+  "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
+  "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
+  "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
+  "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac";
+  "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
+  "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
+  "wai-static-cache" = dontDistribute super."wai-static-cache";
+  "wai-static-pages" = dontDistribute super."wai-static-pages";
+  "wai-test" = dontDistribute super."wai-test";
+  "wai-thrift" = dontDistribute super."wai-thrift";
+  "wai-throttler" = dontDistribute super."wai-throttler";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavesurfer" = dontDistribute super."wavesurfer";
+  "wavy" = dontDistribute super."wavy";
+  "wcwidth" = dontDistribute super."wcwidth";
+  "weather-api" = dontDistribute super."weather-api";
+  "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell";
+  "web-css" = dontDistribute super."web-css";
+  "web-encodings" = dontDistribute super."web-encodings";
+  "web-mongrel2" = dontDistribute super."web-mongrel2";
+  "web-page" = dontDistribute super."web-page";
+  "web-routes-mtl" = dontDistribute super."web-routes-mtl";
+  "web-routes-quasi" = dontDistribute super."web-routes-quasi";
+  "web-routes-regular" = dontDistribute super."web-routes-regular";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "webapi" = dontDistribute super."webapi";
+  "webapp" = dontDistribute super."webapp";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-snoy" = dontDistribute super."webdriver-snoy";
+  "webfinger-client" = dontDistribute super."webfinger-client";
+  "webidl" = dontDistribute super."webidl";
+  "webify" = dontDistribute super."webify";
+  "webkit" = dontDistribute super."webkit";
+  "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
+  "webkitgtk3" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "webwire" = dontDistribute super."webwire";
+  "wedding-announcement" = dontDistribute super."wedding-announcement";
+  "wedged" = dontDistribute super."wedged";
+  "weighted-regexp" = dontDistribute super."weighted-regexp";
+  "weighted-search" = dontDistribute super."weighted-search";
+  "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
+  "wheb-mongo" = dontDistribute super."wheb-mongo";
+  "wheb-redis" = dontDistribute super."wheb-redis";
+  "wheb-strapped" = dontDistribute super."wheb-strapped";
+  "while-lang-parser" = dontDistribute super."while-lang-parser";
+  "whim" = dontDistribute super."whim";
+  "whiskers" = dontDistribute super."whiskers";
+  "whitespace" = dontDistribute super."whitespace";
+  "whois" = dontDistribute super."whois";
+  "why3" = dontDistribute super."why3";
+  "wigner-symbols" = dontDistribute super."wigner-symbols";
+  "wikipedia4epub" = dontDistribute super."wikipedia4epub";
+  "win-hp-path" = dontDistribute super."win-hp-path";
+  "windowslive" = dontDistribute super."windowslive";
+  "winerror" = dontDistribute super."winerror";
+  "winio" = dontDistribute super."winio";
+  "wiring" = dontDistribute super."wiring";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word24" = dontDistribute super."word24";
+  "wordcloud" = dontDistribute super."wordcloud";
+  "wordexp" = dontDistribute super."wordexp";
+  "words" = dontDistribute super."words";
+  "wordsearch" = dontDistribute super."wordsearch";
+  "wordsetdiff" = dontDistribute super."wordsetdiff";
+  "workflow-osx" = dontDistribute super."workflow-osx";
+  "wp-archivebot" = dontDistribute super."wp-archivebot";
+  "wraparound" = dontDistribute super."wraparound";
+  "wraxml" = dontDistribute super."wraxml";
+  "wreq-sb" = dontDistribute super."wreq-sb";
+  "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
+  "wsedit" = dontDistribute super."wsedit";
+  "wtk" = dontDistribute super."wtk";
+  "wtk-gtk" = dontDistribute super."wtk-gtk";
+  "wumpus-basic" = dontDistribute super."wumpus-basic";
+  "wumpus-core" = dontDistribute super."wumpus-core";
+  "wumpus-drawing" = dontDistribute super."wumpus-drawing";
+  "wumpus-microprint" = dontDistribute super."wumpus-microprint";
+  "wumpus-tree" = dontDistribute super."wumpus-tree";
+  "wuss" = dontDistribute super."wuss";
+  "wx" = dontDistribute super."wx";
+  "wxAsteroids" = dontDistribute super."wxAsteroids";
+  "wxFruit" = dontDistribute super."wxFruit";
+  "wxc" = dontDistribute super."wxc";
+  "wxcore" = dontDistribute super."wxcore";
+  "wxdirect" = dontDistribute super."wxdirect";
+  "wxhnotepad" = dontDistribute super."wxhnotepad";
+  "wxturtle" = dontDistribute super."wxturtle";
+  "wybor" = dontDistribute super."wybor";
+  "wyvern" = dontDistribute super."wyvern";
+  "x-dsp" = dontDistribute super."x-dsp";
+  "x11-xim" = dontDistribute super."x11-xim";
+  "x11-xinput" = dontDistribute super."x11-xinput";
+  "x509-util" = dontDistribute super."x509-util";
+  "xattr" = dontDistribute super."xattr";
+  "xbattbar" = dontDistribute super."xbattbar";
+  "xcb-types" = dontDistribute super."xcb-types";
+  "xcffib" = dontDistribute super."xcffib";
+  "xchat-plugin" = dontDistribute super."xchat-plugin";
+  "xcp" = dontDistribute super."xcp";
+  "xdg-userdirs" = dontDistribute super."xdg-userdirs";
+  "xdot" = dontDistribute super."xdot";
+  "xfconf" = dontDistribute super."xfconf";
+  "xhaskell-library" = dontDistribute super."xhaskell-library";
+  "xhb" = dontDistribute super."xhb";
+  "xhb-atom-cache" = dontDistribute super."xhb-atom-cache";
+  "xhb-ewmh" = dontDistribute super."xhb-ewmh";
+  "xhtml" = doDistribute super."xhtml_3000_2_1";
+  "xhtml-combinators" = dontDistribute super."xhtml-combinators";
+  "xilinx-lava" = dontDistribute super."xilinx-lava";
+  "xine" = dontDistribute super."xine";
+  "xing-api" = dontDistribute super."xing-api";
+  "xinput-conduit" = dontDistribute super."xinput-conduit";
+  "xkbcommon" = dontDistribute super."xkbcommon";
+  "xkcd" = dontDistribute super."xkcd";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-enumerator" = dontDistribute super."xml-enumerator";
+  "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
+  "xml-extractors" = dontDistribute super."xml-extractors";
+  "xml-helpers" = dontDistribute super."xml-helpers";
+  "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens";
+  "xml-monad" = dontDistribute super."xml-monad";
+  "xml-parsec" = dontDistribute super."xml-parsec";
+  "xml-picklers" = dontDistribute super."xml-picklers";
+  "xml-pipe" = dontDistribute super."xml-pipe";
+  "xml-prettify" = dontDistribute super."xml-prettify";
+  "xml-push" = dontDistribute super."xml-push";
+  "xml-query" = dontDistribute super."xml-query";
+  "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit";
+  "xml-query-xml-types" = dontDistribute super."xml-query-xml-types";
+  "xml2html" = dontDistribute super."xml2html";
+  "xml2json" = dontDistribute super."xml2json";
+  "xml2x" = dontDistribute super."xml2x";
+  "xmltv" = dontDistribute super."xmltv";
+  "xmms2-client" = dontDistribute super."xmms2-client";
+  "xmms2-client-glib" = dontDistribute super."xmms2-client-glib";
+  "xmobar" = dontDistribute super."xmobar";
+  "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch";
+  "xmonad-contrib" = dontDistribute super."xmonad-contrib";
+  "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch";
+  "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl";
+  "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper";
+  "xmonad-eval" = dontDistribute super."xmonad-eval";
+  "xmonad-extras" = dontDistribute super."xmonad-extras";
+  "xmonad-screenshot" = dontDistribute super."xmonad-screenshot";
+  "xmonad-utils" = dontDistribute super."xmonad-utils";
+  "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper";
+  "xmonad-windownames" = dontDistribute super."xmonad-windownames";
+  "xmpipe" = dontDistribute super."xmpipe";
+  "xorshift" = dontDistribute super."xorshift";
+  "xosd" = dontDistribute super."xosd";
+  "xournal-builder" = dontDistribute super."xournal-builder";
+  "xournal-convert" = dontDistribute super."xournal-convert";
+  "xournal-parser" = dontDistribute super."xournal-parser";
+  "xournal-render" = dontDistribute super."xournal-render";
+  "xournal-types" = dontDistribute super."xournal-types";
+  "xsact" = dontDistribute super."xsact";
+  "xsd" = dontDistribute super."xsd";
+  "xsha1" = dontDistribute super."xsha1";
+  "xslt" = dontDistribute super."xslt";
+  "xtc" = dontDistribute super."xtc";
+  "xtest" = dontDistribute super."xtest";
+  "xturtle" = dontDistribute super."xturtle";
+  "xxhash" = dontDistribute super."xxhash";
+  "y0l0bot" = dontDistribute super."y0l0bot";
+  "yabi" = dontDistribute super."yabi";
+  "yabi-muno" = dontDistribute super."yabi-muno";
+  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
+  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
+  "yajl" = dontDistribute super."yajl";
+  "yajl-enumerator" = dontDistribute super."yajl-enumerator";
+  "yall" = dontDistribute super."yall";
+  "yamemo" = dontDistribute super."yamemo";
+  "yaml-config" = dontDistribute super."yaml-config";
+  "yaml-light-lens" = dontDistribute super."yaml-light-lens";
+  "yaml-rpc" = dontDistribute super."yaml-rpc";
+  "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
+  "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
+  "yaml2owl" = dontDistribute super."yaml2owl";
+  "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
+  "yampa-canvas" = dontDistribute super."yampa-canvas";
+  "yampa-glfw" = dontDistribute super."yampa-glfw";
+  "yampa-glut" = dontDistribute super."yampa-glut";
+  "yampa2048" = dontDistribute super."yampa2048";
+  "yaop" = dontDistribute super."yaop";
+  "yap" = dontDistribute super."yap";
+  "yarr" = dontDistribute super."yarr";
+  "yarr-image-io" = dontDistribute super."yarr-image-io";
+  "yate" = dontDistribute super."yate";
+  "yavie" = dontDistribute super."yavie";
+  "ycextra" = dontDistribute super."ycextra";
+  "yeganesh" = dontDistribute super."yeganesh";
+  "yeller" = dontDistribute super."yeller";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
+  "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
+  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
+  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
+  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
+  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
+  "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
+  "yesod-comments" = dontDistribute super."yesod-comments";
+  "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
+  "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-crud" = dontDistribute super."yesod-crud";
+  "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
+  "yesod-csp" = dontDistribute super."yesod-csp";
+  "yesod-datatables" = dontDistribute super."yesod-datatables";
+  "yesod-dsl" = dontDistribute super."yesod-dsl";
+  "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form-json" = dontDistribute super."yesod-form-json";
+  "yesod-goodies" = dontDistribute super."yesod-goodies";
+  "yesod-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
+  "yesod-paginate" = dontDistribute super."yesod-paginate";
+  "yesod-pagination" = dontDistribute super."yesod-pagination";
+  "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-platform" = dontDistribute super."yesod-platform";
+  "yesod-pnotify" = dontDistribute super."yesod-pnotify";
+  "yesod-pure" = dontDistribute super."yesod-pure";
+  "yesod-purescript" = dontDistribute super."yesod-purescript";
+  "yesod-raml" = dontDistribute super."yesod-raml";
+  "yesod-raml-bin" = dontDistribute super."yesod-raml-bin";
+  "yesod-raml-docs" = dontDistribute super."yesod-raml-docs";
+  "yesod-raml-mock" = dontDistribute super."yesod-raml-mock";
+  "yesod-recaptcha" = dontDistribute super."yesod-recaptcha";
+  "yesod-routes" = dontDistribute super."yesod-routes";
+  "yesod-routes-flow" = dontDistribute super."yesod-routes-flow";
+  "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript";
+  "yesod-rst" = dontDistribute super."yesod-rst";
+  "yesod-s3" = dontDistribute super."yesod-s3";
+  "yesod-sass" = dontDistribute super."yesod-sass";
+  "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test-json" = dontDistribute super."yesod-test-json";
+  "yesod-tls" = dontDistribute super."yesod-tls";
+  "yesod-transloadit" = dontDistribute super."yesod-transloadit";
+  "yesod-vend" = dontDistribute super."yesod-vend";
+  "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra";
+  "yesod-worker" = dontDistribute super."yesod-worker";
+  "yet-another-logger" = dontDistribute super."yet-another-logger";
+  "yhccore" = dontDistribute super."yhccore";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-snippet" = dontDistribute super."yi-snippet";
+  "yi-solarized" = dontDistribute super."yi-solarized";
+  "yi-spolsky" = dontDistribute super."yi-spolsky";
+  "yi-vty" = dontDistribute super."yi-vty";
+  "yices" = dontDistribute super."yices";
+  "yices-easy" = dontDistribute super."yices-easy";
+  "yices-painless" = dontDistribute super."yices-painless";
+  "yjftp" = dontDistribute super."yjftp";
+  "yjftp-libs" = dontDistribute super."yjftp-libs";
+  "yjsvg" = dontDistribute super."yjsvg";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
+  "yoko" = dontDistribute super."yoko";
+  "york-lava" = dontDistribute super."york-lava";
+  "youtube" = dontDistribute super."youtube";
+  "yql" = dontDistribute super."yql";
+  "yst" = dontDistribute super."yst";
+  "yuiGrid" = dontDistribute super."yuiGrid";
+  "yuuko" = dontDistribute super."yuuko";
+  "yxdb-utils" = dontDistribute super."yxdb-utils";
+  "z3" = dontDistribute super."z3";
+  "zalgo" = dontDistribute super."zalgo";
+  "zampolit" = dontDistribute super."zampolit";
+  "zasni-gerna" = dontDistribute super."zasni-gerna";
+  "zcache" = dontDistribute super."zcache";
+  "zenc" = dontDistribute super."zenc";
+  "zendesk-api" = dontDistribute super."zendesk-api";
+  "zeno" = dontDistribute super."zeno";
+  "zerobin" = dontDistribute super."zerobin";
+  "zeromq-haskell" = dontDistribute super."zeromq-haskell";
+  "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
+  "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeroth" = dontDistribute super."zeroth";
+  "zigbee-znet25" = dontDistribute super."zigbee-znet25";
+  "zip-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "zippo" = dontDistribute super."zippo";
+  "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zmcat" = dontDistribute super."zmcat";
+  "zmidi-core" = dontDistribute super."zmidi-core";
+  "zmidi-score" = dontDistribute super."zmidi-score";
+  "zmqat" = dontDistribute super."zmqat";
+  "zoneinfo" = dontDistribute super."zoneinfo";
+  "zoom" = dontDistribute super."zoom";
+  "zoom-cache" = dontDistribute super."zoom-cache";
+  "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm";
+  "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile";
+  "zoom-refs" = dontDistribute super."zoom-refs";
+  "zot" = dontDistribute super."zot";
+  "zsh-battery" = dontDistribute super."zsh-battery";
+  "ztail" = dontDistribute super."ztail";
+
+}
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6112997fc01b3..58ad27a8a92d7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -556,10 +556,9 @@ self: {
     ({ mkDerivation, AbortT-transformers, base, mtl }:
      mkDerivation {
        pname = "AbortT-mtl";
-       version = "1.0";
-       sha256 = "42df8b886598bdfbb10f67d718eae41fb9866618dd8852e97549d915cb26379f";
+       version = "1.0.0.1";
+       sha256 = "5175fa41e0e71627a4bedd3e61fe9b871a6730b065ffe6ae1952ba6f0de151f4";
        libraryHaskellDepends = [ AbortT-transformers base mtl ];
-       jailbreak = true;
        homepage = "http://github.com/gcross/AbortT-mtl";
        description = "mtl instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -571,14 +570,13 @@ self: {
      }:
      mkDerivation {
        pname = "AbortT-transformers";
-       version = "1.0.1.1";
-       sha256 = "773dc6aefb5b50937032a5c02d0ccd8320218f6d361361400882e694af600303";
+       version = "1.0.1.2";
+       sha256 = "62e9da8630493deb3b63aa5ec4c0151fd75e44b0d530eba0cb7f1f58ffb978ea";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/gcross/AbortT-transformers";
        description = "A monad and monadic transformer providing \"abort\" functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -616,9 +614,12 @@ self: {
        pname = "Adaptive";
        version = "0.23";
        sha256 = "0c5d3e880bbcd6245ccefa16d1d2cc15f7e48bd4ab50723f321883b91b6a4758";
+       revision = "1";
+       editedCabalFile = "36c76cf96db195ede96306358e65aec311211569c236983efb473c3e97b864b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
+       jailbreak = true;
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1184,8 +1185,8 @@ self: {
      }:
      mkDerivation {
        pname = "BNFC";
-       version = "2.8";
-       sha256 = "21be5fddcfe8e1970c94872f36d5f29d07709f69e8e139b68bf6b27e75677f34";
+       version = "2.8.1";
+       sha256 = "2c1bea5c034483813091eea0ea5c830fdde8fedd31b1fc021ea69823b30a5920";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
@@ -5283,25 +5284,25 @@ self: {
      }) {};
 
   "EtaMOO" = callPackage
-    ({ mkDerivation, array, base, bytestring, case-insensitive
-     , containers, hashable, haskeline, mtl, network, old-locale, parsec
-     , pcre, pipes, pipes-bytestring, pipes-concurrency, pipes-network
-     , pureMD5, random, stm, stm-chans, text, time, transformers, unix
-     , unordered-containers, vector
+    ({ mkDerivation, array, async, base, bytestring, case-insensitive
+     , containers, cryptonite, hashable, haskeline, memory, mtl, network
+     , parsec, pcre, pipes, pipes-bytestring, pipes-concurrency
+     , pipes-network, random, stm, stm-chans, text, time, transformers
+     , unix, unordered-containers, vcache, vector
      }:
      mkDerivation {
        pname = "EtaMOO";
-       version = "0.2.0.0";
-       sha256 = "365169b4fa2eb1ff2422eedfdb32c0053b8c77cc6c605310c876b46f1ac1f86c";
+       version = "0.3.0.0";
+       sha256 = "501344b7dfe9ec437fd137a247d785eed7d497f35daacd6aed3d940b8837c57c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base bytestring case-insensitive containers hashable
-         haskeline mtl network old-locale parsec pipes pipes-bytestring
-         pipes-concurrency pipes-network pureMD5 random stm stm-chans text
-         time transformers unix unordered-containers vector
+         array async base bytestring case-insensitive containers cryptonite
+         hashable haskeline memory mtl network parsec pipes pipes-bytestring
+         pipes-concurrency pipes-network random stm stm-chans text time
+         transformers unix unordered-containers vcache vector
        ];
-       executableSystemDepends = [ pcre ];
+       executablePkgconfigDepends = [ pcre ];
        homepage = "http://verement.github.io/etamoo";
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
@@ -6409,8 +6410,11 @@ self: {
        pname = "GLURaw";
        version = "1.4.0.1";
        sha256 = "9655644beb54ff8fac68f2e0fd8a8e9a1e8409272e2e4c963ccce9bcd60e0ecc";
+       revision = "1";
+       editedCabalFile = "d83125fb416c0619106ec557733e75e8093f4ad923a8dfd969199297bb1c8619";
        libraryHaskellDepends = [ base OpenGLRaw ];
        librarySystemDepends = [ freeglut mesa ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
@@ -6423,8 +6427,11 @@ self: {
        pname = "GLURaw";
        version = "1.4.0.2";
        sha256 = "0f4ae663840ba350e0ef04dd65d60f423ff6551ffbab3302ced9f1f0d4075e83";
+       revision = "1";
+       editedCabalFile = "6800f1d309c8bdea4cd3a054fa69c8fdc39d8f63193136e2638a93c8a8f31308";
        libraryHaskellDepends = [ base OpenGLRaw ];
        librarySystemDepends = [ freeglut mesa ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
@@ -6649,7 +6656,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "GPipe" = callPackage
+  "GPipe_2_1_6" = callPackage
     ({ mkDerivation, base, Boolean, containers, exception-transformers
      , gl, hashtables, linear, transformers
      }:
@@ -6664,6 +6671,24 @@ self: {
        homepage = "http://tobbebex.blogspot.se/";
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "GPipe" = callPackage
+    ({ mkDerivation, base, Boolean, containers, exception-transformers
+     , gl, hashtables, linear, transformers
+     }:
+     mkDerivation {
+       pname = "GPipe";
+       version = "2.1.7";
+       sha256 = "ebb54d9994bcb9c14064af5468c3c0f34f02db07d6033f562dd09b4718538814";
+       libraryHaskellDepends = [
+         base Boolean containers exception-transformers gl hashtables linear
+         transformers
+       ];
+       homepage = "http://tobbebex.blogspot.se/";
+       description = "Typesafe functional GPU graphics programming";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "GPipe-Collada" = callPackage
@@ -7014,14 +7039,16 @@ self: {
      }) {};
 
   "Gifcurry" = callPackage
-    ({ mkDerivation, base, gtk3, process, temporary }:
+    ({ mkDerivation, base, directory, gtk3, process, temporary }:
      mkDerivation {
        pname = "Gifcurry";
-       version = "0.1.0.1";
-       sha256 = "cfa0729e5cab21a4d4ff969b86af20a6e5244059a030695879e56e4705a5e56f";
+       version = "0.1.0.3";
+       sha256 = "a54e2bde1b6521997af0bb4983094169eb492e65a8b5d8bc596d57d06b59e399";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [ base gtk3 process temporary ];
+       executableHaskellDepends = [
+         base directory gtk3 process temporary
+       ];
        homepage = "https://github.com/lettier/gifcurry";
        description = "Create animated GIFs, overlaid with optional text, from movies";
        license = stdenv.lib.licenses.asl20;
@@ -8877,6 +8904,8 @@ self: {
        pname = "HStringTemplate";
        version = "0.8.3";
        sha256 = "63d6b1c993f5612ef370b92bb8fab05323657ec34a0f35110b967eb853239d18";
+       revision = "1";
+       editedCabalFile = "e333f201de7b501fda8bf4868be8aa4565a6c57abd0517844dffb0df37d18308";
        libraryHaskellDepends = [
          array base blaze-builder bytestring containers deepseq directory
          filepath mtl old-locale parsec pretty syb template-haskell text
@@ -10839,6 +10868,8 @@ self: {
        pname = "HsOpenSSL";
        version = "0.11.1.1";
        sha256 = "4a61e074e968a9863e0f3440b3be8ac131457b3d34eb983ca8102122d8ebc4c1";
+       revision = "1";
+       editedCabalFile = "be351c277db7ddbc2ece8fb2d10b8f1f686b91000a552dd9d8155b79f8db9a5f";
        libraryHaskellDepends = [
          base bytestring integer-gmp network old-locale time
        ];
@@ -11256,7 +11287,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "IntervalMap" = callPackage
+  "IntervalMap_0_5_0_0" = callPackage
     ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }:
      mkDerivation {
        pname = "IntervalMap";
@@ -11267,6 +11298,20 @@ self: {
        homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
        description = "Containers for intervals, with efficient search";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "IntervalMap" = callPackage
+    ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "IntervalMap";
+       version = "0.5.0.1";
+       sha256 = "5c4a44fc5091f1e7a879cdd937a3fc3de28696e21d247250a4b2c0cf12e160bc";
+       libraryHaskellDepends = [ base containers deepseq ];
+       testHaskellDepends = [ base Cabal containers deepseq QuickCheck ];
+       homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
+       description = "Containers for intervals, with efficient search";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "Irc" = callPackage
@@ -12374,6 +12419,21 @@ self: {
        license = "GPL";
      }) {};
 
+  "Lazy-Pbkdf2" = callPackage
+    ({ mkDerivation, base, base16-bytestring, binary, bytestring, SHA
+     }:
+     mkDerivation {
+       pname = "Lazy-Pbkdf2";
+       version = "1.0.2";
+       sha256 = "6318c60db0b18877c0edf0a01ba21254b44e9624210bc59834e1dc8116ca86fc";
+       libraryHaskellDepends = [ base binary bytestring SHA ];
+       testHaskellDepends = [
+         base base16-bytestring binary bytestring SHA
+       ];
+       description = "Lazy PBKDF2 generator";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "LazyVault" = callPackage
     ({ mkDerivation, base, directory, filepath, unix }:
      mkDerivation {
@@ -13321,8 +13381,8 @@ self: {
      }:
      mkDerivation {
        pname = "MoeDict";
-       version = "0.0.3";
-       sha256 = "2afdb1f3972f93619b236835680616bbfcd435ee52e097afad04a53f38c4c769";
+       version = "0.0.4";
+       sha256 = "6896d22e1ce081b55fb461fc260ea3613218009ff2c600901a8c4f2f7feef66e";
        libraryHaskellDepends = [
          aeson base bytestring containers text unordered-containers
        ];
@@ -13413,16 +13473,16 @@ self: {
      }) {};
 
   "MonadCompose" = callPackage
-    ({ mkDerivation, base, data-default, ghc-prim, mmorph, monad-loops
-     , monad-products, mtl, parallel, random, transformers
+    ({ mkDerivation, base, data-default, ghc-prim, kan-extensions
+     , mmorph, monad-products, mtl, parallel, random, transformers
      , transformers-compat
      }:
      mkDerivation {
        pname = "MonadCompose";
-       version = "0.8.4.1";
-       sha256 = "16efab2564b74f253d3a6e034adb2afff12e0b8dff45ac0883fff30895815186";
+       version = "0.8.4.2";
+       sha256 = "71c3a63f4e3592a2f918e1433fecf1f8e75293ded6369c82b12a76e3d88bac78";
        libraryHaskellDepends = [
-         base data-default ghc-prim mmorph monad-loops monad-products mtl
+         base data-default ghc-prim kan-extensions mmorph monad-products mtl
          parallel random transformers transformers-compat
        ];
        homepage = "http://alkalisoftware.net";
@@ -14168,11 +14228,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "NoTrace";
-       version = "0.2.0.1";
-       sha256 = "2d0160f8f5cb58c93df9fcb93130fdfb946c7c978f527c935f26380d92047c14";
+       version = "0.3.0.0";
+       sha256 = "6ffdd65376971c4fa4faea10dacaeaf1b6ada23870c8dc9cb278dc3250e40e81";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       jailbreak = true;
        homepage = "https://github.com/CindyLinz/Haskell-NoTrace";
        description = "Remove all the functions come from Debug.Trace after debugging";
        license = stdenv.lib.licenses.mit;
@@ -15513,18 +15572,18 @@ self: {
 
   "Plot-ho-matic" = callPackage
     ({ mkDerivation, base, cairo, Chart, Chart-cairo, containers
-     , data-default-class, generic-accessors, glib, gtk, lens, text
-     , time, vector
+     , data-default-class, generic-accessors, glib, gtk3, lens, text
+     , time, transformers, vector
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.8.0.0";
-       sha256 = "2c2e2d1f793140df25afdd73965b42f3010b5060030c564cc7afcff9f3c711a2";
+       version = "0.9.0.1";
+       sha256 = "f7cf62c612c0bdf18b7fa4791260ac7f7b1ee7bb58d8f131c358f002a9262ec9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base cairo Chart Chart-cairo containers data-default-class
-         generic-accessors glib gtk lens text time vector
+         generic-accessors glib gtk3 lens text time transformers vector
        ];
        executableHaskellDepends = [ base containers generic-accessors ];
        description = "Real-time line plotter for generic data";
@@ -17693,6 +17752,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "SimpleServer" = callPackage
+    ({ mkDerivation, base, cmdargs, dyre, transformers, wai-routes
+     , warp
+     }:
+     mkDerivation {
+       pname = "SimpleServer";
+       version = "0.1.1.1";
+       sha256 = "e3f3d556ad866c442183788f64d97e4e55e50bedcab4bfef65803352146bdeb4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cmdargs dyre transformers wai-routes warp
+       ];
+       executableHaskellDepends = [
+         base cmdargs dyre transformers wai-routes warp
+       ];
+       description = "A simple static file server, for when apache is overkill";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "SizeCompare" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -22752,6 +22831,7 @@ self: {
          quickcheck-instances scientific tagged tasty tasty-hunit
          tasty-quickcheck text unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -22779,6 +22859,7 @@ self: {
          quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
          text time unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -22806,6 +22887,7 @@ self: {
          quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
          template-haskell text time unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -22836,6 +22918,7 @@ self: {
          tasty-hunit tasty-quickcheck template-haskell text time
          time-parsers unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -22845,34 +22928,6 @@ self: {
   "aeson-extra" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
      , containers, exceptions, hashable, parsec, quickcheck-instances
-     , scientific, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, text, time, time-parsers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "aeson-extra";
-       version = "0.3.0.1";
-       sha256 = "5b1b75c8f10a470975c0f6170d5b786f594acef295c5e23150e81e855b70e6a7";
-       libraryHaskellDepends = [
-         aeson aeson-compat base base-compat bytestring containers
-         exceptions hashable parsec scientific template-haskell text time
-         time-parsers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson aeson-compat base base-compat bytestring containers
-         exceptions hashable parsec quickcheck-instances scientific tasty
-         tasty-hunit tasty-quickcheck template-haskell text time
-         time-parsers unordered-containers vector
-       ];
-       homepage = "https://github.com/phadej/aeson-extra#readme";
-       description = "Extra goodies for aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "aeson-extra_0_3_1_0" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
-     , containers, exceptions, hashable, parsec, quickcheck-instances
      , recursion-schemes, scientific, tasty, tasty-hunit
      , tasty-quickcheck, template-haskell, text, these, time
      , time-parsers, transformers, unordered-containers, vector
@@ -23369,6 +23424,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ag-pictgen" = callPackage
+    ({ mkDerivation, base, containers, uuagc, uulib }:
+     mkDerivation {
+       pname = "ag-pictgen";
+       version = "1.0.0.0";
+       sha256 = "3afe523fe3beae494e274e21258f8d69abb1d228f207fd1e286b8d23180bb97c";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base containers uuagc uulib ];
+       homepage = "https://github.com/UU-ComputerScience/ag-pictgen";
+       description = "Attribute Grammar picture generation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "agda-server" = callPackage
     ({ mkDerivation, Agda, base, cmdargs, containers, directory
      , filepath, HJavaScript, mtl, pandoc, snap-core, snap-server
@@ -23653,8 +23722,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
        pname = "aivika";
-       version = "4.3.1";
-       sha256 = "bff0ea9f344eef7f90e54613e261c8b45e39b428e580eb56d3eab6f0c20b2584";
+       version = "4.3.2";
+       sha256 = "a4209fea2b6d66bfd5d5d9a6477f95ce04c2c5fac06bfbde3c51941d84fba063";
        libraryHaskellDepends = [
          array base containers mtl random vector
        ];
@@ -23663,6 +23732,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aivika-branches" = callPackage
+    ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl
+     , random
+     }:
+     mkDerivation {
+       pname = "aivika-branches";
+       version = "0.1.1";
+       sha256 = "56bbc2b3e7c9d1db19828b80fd2fc04dcbd1396a32bfd4d5d8e123418428e94a";
+       libraryHaskellDepends = [
+         aivika aivika-transformers base containers mtl random
+       ];
+       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
+       description = "Branching discrete event simulation library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aivika-experiment" = callPackage
     ({ mkDerivation, aivika, base, containers, directory, filepath, mtl
      , network-uri, parallel-io, split
@@ -23737,12 +23822,12 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-transformers";
-       version = "3.0";
-       sha256 = "3f34e384aacd8f463f2721209910bcde25e111f96e1c3a727fe19571d49f30ad";
+       version = "4.3.2";
+       sha256 = "34a0f93a75918a9a4c9db2062522bc6e042b33705797ad7a50215f244fa72355";
        libraryHaskellDepends = [
          aivika array base containers mtl random vector
        ];
-       homepage = "http://github.com/dsorokin/aivika-transformers";
+       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
        description = "Transformers for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24364,8 +24449,8 @@ self: {
      }:
      mkDerivation {
        pname = "alsa-pcm";
-       version = "0.6.0.3";
-       sha256 = "da7dc11ff1b703d1334d13705097ceddd7dd5c88c335486d3b1d34d84f880067";
+       version = "0.6.0.4";
+       sha256 = "9aae1379903b8445073f8a2b6ccf86b904b4045247747516530a165a3f76ca2a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -24400,8 +24485,8 @@ self: {
      }:
      mkDerivation {
        pname = "alsa-seq";
-       version = "0.6.0.5";
-       sha256 = "1238b1788228af07a15a76ab3768202d491aa1f7feef009355ff7109a91584d2";
+       version = "0.6.0.6";
+       sha256 = "f5e58660f07943f0cc33eb2e1ada5e111c43d4114eeb4e0ac0251d72c43b7144";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27904,7 +27989,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amqp" = callPackage
+  "amqp_0_13_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, connection
      , containers, data-binary-ieee754, hspec, hspec-expectations
      , monad-control, network, network-uri, split, stm, text, vector
@@ -27931,9 +28016,10 @@ self: {
        homepage = "https://github.com/hreinhardt/amqp";
        description = "Client library for AMQP servers (currently only RabbitMQ)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amqp_0_13_1" = callPackage
+  "amqp" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, connection
      , containers, data-binary-ieee754, hspec, hspec-expectations
      , monad-control, network, network-uri, split, stm, text, vector
@@ -27956,10 +28042,10 @@ self: {
          data-binary-ieee754 hspec hspec-expectations network network-uri
          split stm text vector
        ];
+       doCheck = false;
        homepage = "https://github.com/hreinhardt/amqp";
        description = "Client library for AMQP servers (currently only RabbitMQ)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amqp-conduit" = callPackage
@@ -29183,7 +29269,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "apply-refact" = callPackage
+  "apply-refact_0_1_0_0" = callPackage
     ({ mkDerivation, base, containers, directory, filemanip, filepath
      , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
      , silently, syb, tasty, tasty-expected-failure, tasty-golden
@@ -29211,6 +29297,38 @@ self: {
        ];
        description = "Perform refactorings specified by the refact library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "apply-refact" = callPackage
+    ({ mkDerivation, base, containers, directory, filemanip, filepath
+     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
+     , silently, syb, tasty, tasty-expected-failure, tasty-golden
+     , temporary, transformers, unix-compat
+     }:
+     mkDerivation {
+       pname = "apply-refact";
+       version = "0.2.0.0";
+       sha256 = "f74abeae9f6ad6e3ab5b00b108e99c4351ff26f691f5a0c1d3662b2b18648d5c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filemanip ghc ghc-exactprint mtl process
+         refact syb temporary transformers unix-compat
+       ];
+       executableHaskellDepends = [
+         base containers directory filemanip filepath ghc ghc-exactprint mtl
+         optparse-applicative process refact syb temporary transformers
+         unix-compat
+       ];
+       testHaskellDepends = [
+         base containers directory filemanip filepath ghc ghc-exactprint mtl
+         optparse-applicative process refact silently syb tasty
+         tasty-expected-failure tasty-golden temporary transformers
+         unix-compat
+       ];
+       description = "Perform refactorings specified by the refact library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "apportionment" = callPackage
@@ -31980,7 +32098,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "avers" = callPackage
+  "avers_0_0_13" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, clock, containers, cryptohash, filepath, hspec
      , inflections, MonadRandom, mtl, network, network-uri
@@ -32008,7 +32126,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "avers_0_0_14" = callPackage
+  "avers" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, clock, containers, cryptohash, filepath, hspec
      , inflections, MonadRandom, mtl, network, network-uri
@@ -32036,7 +32154,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "avers-api" = callPackage
+  "avers-api_0_0_1" = callPackage
     ({ mkDerivation, aeson, avers, base, bytestring, cookie, servant
      , text, time
      }:
@@ -32051,9 +32169,10 @@ self: {
        homepage = "http://github.com/wereHamster/avers-api";
        description = "Types describing the core and extended Avers APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "avers-api_0_0_2" = callPackage
+  "avers-api" = callPackage
     ({ mkDerivation, aeson, avers, base, bytestring, cookie, servant
      , text, time
      }:
@@ -32064,13 +32183,13 @@ self: {
        libraryHaskellDepends = [
          aeson avers base bytestring cookie servant text time
        ];
+       doHaddock = false;
        homepage = "http://github.com/wereHamster/avers-api";
        description = "Types describing the core and extended Avers APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "avers-server" = callPackage
+  "avers-server_0_0_1" = callPackage
     ({ mkDerivation, aeson, avers, avers-api, base, bytestring
      , bytestring-conversion, cookie, either, http-types, mtl
      , resource-pool, rethinkdb-client-driver, servant, servant-server
@@ -32088,9 +32207,10 @@ self: {
        homepage = "http://github.com/wereHamster/avers-server";
        description = "Server implementation of the Avers API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "avers-server_0_0_2" = callPackage
+  "avers-server" = callPackage
     ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring
      , bytestring, bytestring-conversion, cookie, cryptohash, either
      , http-types, mtl, resource-pool, rethinkdb-client-driver, servant
@@ -32110,7 +32230,6 @@ self: {
        homepage = "http://github.com/wereHamster/avers-server";
        description = "Server implementation of the Avers API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avl-static" = callPackage
@@ -33110,7 +33229,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "b9" = callPackage
+  "b9_0_5_16" = callPackage
     ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
      , bytestring, conduit, conduit-extra, ConfigFile, directory
      , filepath, free, hashable, hspec, hspec-expectations, mtl
@@ -33141,6 +33260,40 @@ self: {
        homepage = "https://github.com/sheyll/b9-vm-image-builder";
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "b9" = callPackage
+    ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
+     , bytestring, conduit, conduit-extra, ConfigFile, directory
+     , filepath, free, hashable, hspec, hspec-expectations, mtl
+     , optparse-applicative, parallel, parsec, pretty, pretty-show
+     , process, QuickCheck, random, semigroups, syb, template, text
+     , time, transformers, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "b9";
+       version = "0.5.17";
+       sha256 = "5f28b7f1043cfb405c8e6b4247b9c3ef434816069ec8cf30b1a74dc530a368df";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bifunctors binary boxes bytestring conduit
+         conduit-extra ConfigFile directory filepath free hashable mtl
+         parallel parsec pretty pretty-show process QuickCheck random
+         semigroups syb template text time transformers unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring directory optparse-applicative
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec hspec-expectations QuickCheck
+         semigroups text unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/sheyll/b9-vm-image-builder";
+       description = "A tool and library for building virtual machine images";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "babylon" = callPackage
@@ -33790,7 +33943,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-orphans" = callPackage
+  "base-orphans_0_5_0" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
        pname = "base-orphans";
@@ -33801,6 +33954,20 @@ self: {
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "base-orphans" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "base-orphans";
+       version = "0.5.1";
+       sha256 = "a571bf43f54d4d576b2c9b494a722f60c624896c2f6c38365af7b87d1b31facb";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/haskell-compat/base-orphans#readme";
+       description = "Backwards-compatible orphan instances for base";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "base-prelude_0_1_6" = callPackage
@@ -35271,15 +35438,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary_0_8_0_1" = callPackage
+  "binary_0_8_2_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HUnit, QuickCheck, random, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "binary";
-       version = "0.8.0.1";
-       sha256 = "85c6befa618ea1e181ab5e6ac66c07b63746b3cfcde7e69158857d7ade8ed755";
+       version = "0.8.2.0";
+       sha256 = "f4e51c13800407b31ec11b3d30699c62a2f0480a765c56939fa644cd36a4725d";
        libraryHaskellDepends = [ array base bytestring containers ];
        testHaskellDepends = [
          array base bytestring Cabal containers directory filepath HUnit
@@ -35518,6 +35685,7 @@ self: {
          aeson base binary hashable quickcheck-instances scientific tagged
          tasty tasty-quickcheck text time unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/binary-orphans#readme";
        description = "Orphan instances for binary";
        license = stdenv.lib.licenses.bsd3;
@@ -35544,6 +35712,7 @@ self: {
          semigroups tagged tasty tasty-quickcheck text time
          unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/binary-orphans#readme";
        description = "Orphan instances for binary";
        license = stdenv.lib.licenses.bsd3;
@@ -35577,7 +35746,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "binary-parser" = callPackage
+  "binary-parser_0_5_0_1" = callPackage
     ({ mkDerivation, base-prelude, bytestring, success, text
      , transformers
      }:
@@ -35591,6 +35760,23 @@ self: {
        homepage = "https://github.com/nikita-volkov/binary-parser";
        description = "A highly-efficient but limited parser API specialised for bytestrings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "binary-parser" = callPackage
+    ({ mkDerivation, base-prelude, bytestring, success, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "binary-parser";
+       version = "0.5.1";
+       sha256 = "6e068b0c0d2cce0944ec79a8ddf9ff270834166a80a46db29d7bd61fb8f35e13";
+       libraryHaskellDepends = [
+         base-prelude bytestring success text transformers
+       ];
+       homepage = "https://github.com/nikita-volkov/binary-parser";
+       description = "A highly-efficient but limited parser API specialised for bytestrings";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "binary-protocol" = callPackage
@@ -37716,6 +37902,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6";
        sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3";
+       revision = "2";
+       editedCabalFile = "4a18531b67c35f0343333d8281ad3acdbde48f5ff6a4b7e3e687d4eac4c2f570";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
          containers data-default-class http-types kansas-comet mime-types
@@ -38867,6 +39055,22 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "boombox" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, semigroupoids
+     , semigroups, transformers
+     }:
+     mkDerivation {
+       pname = "boombox";
+       version = "0.0";
+       sha256 = "e48f0f1ee83d128bab671f1ac0077faa13e5f61f89031b77de151d1fcc8704fc";
+       libraryHaskellDepends = [
+         base bytestring comonad semigroupoids semigroups transformers
+       ];
+       homepage = "https://github.com/fumieval/boombox";
+       description = "Chronokinetic stream sources and incremental consumers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "boomerang" = callPackage
     ({ mkDerivation, base, mtl, template-haskell, text }:
      mkDerivation {
@@ -39985,7 +40189,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {system-glib = pkgs.glib;};
 
-  "bustle" = callPackage
+  "bustle_0_5_3" = callPackage
     ({ mkDerivation, base, bytestring, cairo, containers, dbus
      , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
      , parsec, pcap, process, QuickCheck, setlocale, system-glib
@@ -40013,7 +40217,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {system-glib = pkgs.glib;};
 
-  "bustle_0_5_4" = callPackage
+  "bustle" = callPackage
     ({ mkDerivation, base, bytestring, cairo, containers, dbus
      , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
      , parsec, pcap, process, QuickCheck, setlocale, system-glib
@@ -40685,14 +40889,13 @@ self: {
      }) {};
 
   "bytestring-short" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, QuickCheck }:
+    ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "bytestring-short";
-       version = "0.0.1.0";
-       sha256 = "9b23a18121366a02fcc49a6c63a453500f475a302eab6e5e255e27c2e1308c0c";
-       libraryHaskellDepends = [ base bytestring deepseq ];
-       testHaskellDepends = [ base bytestring QuickCheck ];
-       jailbreak = true;
+       version = "0.1.0.0";
+       sha256 = "39b303951403758dcf626f48e4501b93865d3b4d52d90ae594bbe91a4fc9fca6";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base ];
        description = "Backport copy of ShortByteString";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40716,14 +40919,16 @@ self: {
 
   "bytestring-tree-builder" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, QuickCheck
-     , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck
+     , quickcheck-instances, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text
      }:
      mkDerivation {
        pname = "bytestring-tree-builder";
-       version = "0.2.2.1";
-       sha256 = "7c63bedde6d0179d0c595fa14d0bfe46625e6fc089eb82675fe463ffa015286d";
-       libraryHaskellDepends = [ base base-prelude bytestring ];
+       version = "0.2.4";
+       sha256 = "5c2c3a45e60d1a58b1036139fdc4976554d6539e6333b5e9183cd580b1e10e4f";
+       libraryHaskellDepends = [
+         base base-prelude bytestring semigroups text
+       ];
        testHaskellDepends = [
          base-prelude bytestring QuickCheck quickcheck-instances tasty
          tasty-hunit tasty-quickcheck tasty-smallcheck
@@ -41440,6 +41645,27 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "cabal-info" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath
+     , optparse-applicative
+     }:
+     mkDerivation {
+       pname = "cabal-info";
+       version = "0.1.0.0";
+       sha256 = "d7623ce69cdf180f3266cc14fcf4e53f4d5b2c4d9cb359f145a730878096fc6d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base Cabal directory filepath optparse-applicative
+       ];
+       executableHaskellDepends = [
+         base Cabal filepath optparse-applicative
+       ];
+       homepage = "https://github.com/barrucadu/cabal-info";
+       description = "Read information from cabal files";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cabal-install_1_18_0_5" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HTTP, HUnit, mtl, network, pretty, process
@@ -41661,7 +41887,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
-  "cabal-install" = callPackage
+  "cabal-install_1_22_7_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl
      , network, network-uri, pretty, process, QuickCheck, random
@@ -41694,6 +41920,41 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
+     }) {};
+
+  "cabal-install" = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers
+     , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl
+     , network, network-uri, pretty, process, QuickCheck, random
+     , regex-posix, stm, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, time, unix, zlib
+     }:
+     mkDerivation {
+       pname = "cabal-install";
+       version = "1.22.8.0";
+       sha256 = "58cf197ca0751eac1e242202edc4b4a1dfe89e3b191a0eb57cb62b95d27b3b21";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bytestring Cabal containers directory filepath HTTP mtl
+         network network-uri pretty process random stm time unix zlib
+       ];
+       testHaskellDepends = [
+         array base bytestring Cabal containers directory
+         extensible-exceptions filepath HTTP HUnit mtl network network-uri
+         pretty process QuickCheck regex-posix stm test-framework
+         test-framework-hunit test-framework-quickcheck2 time unix zlib
+       ];
+       doCheck = false;
+       postInstall = ''
+         mkdir $out/etc
+         mv bash-completion $out/etc/bash_completion.d
+       '';
+       homepage = "http://www.haskell.org/cabal/";
+       description = "The command-line interface for Cabal and Hackage";
+       license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
@@ -42965,22 +43226,21 @@ self: {
      }) {};
 
   "call-haskell-from-anything" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, msgpack, mtl
-     , template-haskell
+    ({ mkDerivation, base, bytestring, msgpack, mtl, template-haskell
+     , vector
      }:
      mkDerivation {
        pname = "call-haskell-from-anything";
-       version = "0.1.0.2";
-       sha256 = "a14b0b6bb050f7119337fae4136bbe45f12c55ce94659e088d340d7ffd245b41";
+       version = "1.0.1.0";
+       sha256 = "1a33bc1a6f4f91f434a57bab242c9d46244bf73702432cbd8de6019595f7bffc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring msgpack mtl template-haskell
+         base bytestring msgpack mtl template-haskell vector
        ];
        executableHaskellDepends = [ base bytestring msgpack mtl ];
-       jailbreak = true;
        homepage = "https://github.com/nh2/call-haskell-from-anything";
-       description = "Python-to-Haskell function calls";
+       description = "Call Haskell functions from other languages via serialization and dynamic libraries";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -43324,7 +43584,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cartel" = callPackage
+  "cartel_0_14_2_8" = callPackage
     ({ mkDerivation, base, directory, filepath, multiarg, QuickCheck
      , random, tasty, tasty-quickcheck, tasty-th, time, transformers
      }:
@@ -43344,6 +43604,29 @@ self: {
        homepage = "http://www.github.com/massysett/cartel";
        description = "Specify Cabal files in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cartel" = callPackage
+    ({ mkDerivation, base, directory, filepath, multiarg, QuickCheck
+     , random, tasty, tasty-quickcheck, tasty-th, time, transformers
+     }:
+     mkDerivation {
+       pname = "cartel";
+       version = "0.16.0.0";
+       sha256 = "67594fa408d74553038b677b650863f457309d69d968b01f4dda3bdf46a8b6b3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory filepath time transformers
+       ];
+       testHaskellDepends = [
+         base directory filepath multiarg QuickCheck random tasty
+         tasty-quickcheck tasty-th time transformers
+       ];
+       homepage = "http://www.github.com/massysett/cartel";
+       description = "Specify Cabal files in Haskell";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "casadi-bindings" = callPackage
@@ -43353,8 +43636,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.4.1.7";
-       sha256 = "beb816ed9978392c3523aca99bf6f3a615e9a39bd67f090455505b21b430dba6";
+       version = "2.4.1.8";
+       sha256 = "982f4bd1b6e8f4939795daaadf456faa6ea9ffa96723e5081fbbd13a0d28bd95";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear spatial-math vector vector-binary-instances
@@ -43547,6 +43830,8 @@ self: {
        pname = "case-insensitive";
        version = "1.2.0.5";
        sha256 = "c450d04e018a027747592482d7b4d8725e334bde38e903d4f2c03f99583d3700";
+       revision = "1";
+       editedCabalFile = "4935ae0d0f5866052676c346aa5efc84f0a0a10570eaa44b6221b6db00f90aa6";
        libraryHaskellDepends = [ base bytestring deepseq hashable text ];
        testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit text
@@ -44762,8 +45047,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.5.15";
-       sha256 = "7132cba60d2352fecbc392380cfead394300819974b3d6843fba3ad49dbf64b5";
+       version = "6.6.1";
+       sha256 = "49cfd5695a20c7cdad917704e81ae6cb50e77d7db6a18f7792237bb6c4dbfc38";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -45819,7 +46104,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "circle-packing" = callPackage
+  "circle-packing_0_1_0_4" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "circle-packing";
@@ -45828,6 +46113,18 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Simple heuristic for packing discs of varying radii in a circle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "circle-packing" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "circle-packing";
+       version = "0.1.0.5";
+       sha256 = "041ad1ce696a66f747bb4c65102387cd15b7b026a4b1462d19b341733c2f5c9f";
+       libraryHaskellDepends = [ base ];
+       description = "Simple heuristic for packing discs of varying radii in a circle";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cirru-parser" = callPackage
@@ -46266,7 +46563,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-ghc" = callPackage
+  "clash-ghc_0_6_8" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
      , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl
      , containers, directory, filepath, ghc, ghc-typelits-extra
@@ -46290,6 +46587,33 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-ghc" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
+     , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl
+     , containers, directory, filepath, ghc, ghc-typelits-extra
+     , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl
+     , process, text, transformers, unbound-generics, unix
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "clash-ghc";
+       version = "0.6.9";
+       sha256 = "c6f87e8c87fa30cdf58320ea1950e24b7413115febfbf26c64912863df1ebbfb";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bifunctors bytestring clash-lib clash-prelude
+         clash-systemverilog clash-verilog clash-vhdl containers directory
+         filepath ghc ghc-typelits-extra ghc-typelits-natnormalise hashable
+         haskeline lens mtl process text transformers unbound-generics unix
+         unordered-containers
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-lib_0_5_10" = callPackage
@@ -46411,7 +46735,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-lib" = callPackage
+  "clash-lib_0_6_8" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
      , concurrent-supply, containers, deepseq, directory, errors, fgl
      , filepath, hashable, lens, mtl, pretty, process, template-haskell
@@ -46431,6 +46755,29 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - As a Library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-lib" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
+     , concurrent-supply, containers, deepseq, directory, errors, fgl
+     , filepath, hashable, lens, mtl, pretty, process, template-haskell
+     , text, time, transformers, unbound-generics, unordered-containers
+     , uu-parsinglib, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-lib";
+       version = "0.6.9";
+       sha256 = "b5de3d8e2b87d7b0b9e24721cadf4fff4c5de1bbc3338556269e0978d5cceded";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring clash-prelude concurrent-supply
+         containers deepseq directory errors fgl filepath hashable lens mtl
+         pretty process template-haskell text time transformers
+         unbound-generics unordered-containers uu-parsinglib wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - As a Library";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-prelude_0_9_2" = callPackage
@@ -46621,7 +46968,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-systemverilog" = callPackage
+  "clash-systemverilog_0_6_4" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -46636,6 +46983,24 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-systemverilog" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-systemverilog";
+       version = "0.6.5";
+       sha256 = "687ee5931b035fdd8e1cbd45b7c1f99a7020103834afcf4fa819b6d8026e0536";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl lens mtl text unordered-containers
+         wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-verilog_0_5_7" = callPackage
@@ -46728,7 +47093,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-verilog" = callPackage
+  "clash-verilog_0_6_4" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -46743,6 +47108,24 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Verilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-verilog" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-verilog";
+       version = "0.6.5";
+       sha256 = "6ddf7f1a16a9308632a5e47d7f7cbf7164f1efee1733c0ca59e6edf175d7d840";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl lens mtl text unordered-containers
+         wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - Verilog backend";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-vhdl_0_5_8" = callPackage
@@ -46835,7 +47218,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-vhdl" = callPackage
+  "clash-vhdl_0_6_5" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -46850,6 +47233,24 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - VHDL backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-vhdl" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-vhdl";
+       version = "0.6.6";
+       sha256 = "14023afa8445712f4bb40a3a5bf02b44c84bb87643366b50e615cea54baff293";
+       libraryHaskellDepends = [
+         base clash-lib clash-prelude fgl lens mtl text unordered-containers
+         wl-pprint-text
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - VHDL backend";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "classify" = callPackage
@@ -51458,6 +51859,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "conduit-tokenize-attoparsec" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, conduit, hspec
+     , resourcet, text
+     }:
+     mkDerivation {
+       pname = "conduit-tokenize-attoparsec";
+       version = "0.1.0.0";
+       sha256 = "cbb8e1127c64338baba4dba836ffa1b034f4d85967fa983a334e84e56dad00af";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring conduit resourcet text
+       ];
+       executableHaskellDepends = [ attoparsec base conduit resourcet ];
+       testHaskellDepends = [ attoparsec base conduit hspec resourcet ];
+       homepage = "http://github.com/haskell-works/conduit-tokenize-attoparsec#readme";
+       description = "Conduits for tokenizing streams";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "conf" = callPackage
     ({ mkDerivation, base, haskell-src, HUnit, test-framework
      , test-framework-hunit, test-framework-th
@@ -51499,6 +51920,8 @@ self: {
        pname = "config-value";
        version = "0.4.0.1";
        sha256 = "67e92a664a7d5b80c456d3f0cdbbf6f1fc8d00710509f784221fd01c60342f35";
+       revision = "1";
+       editedCabalFile = "a07f958c50a175dba2f3e4ee6130a1871d14eb6cb28612b4cf040251cd026b28";
        libraryHaskellDepends = [ array base pretty text transformers ];
        libraryToolDepends = [ alex happy ];
        homepage = "https://github.com/glguy/config-value";
@@ -52074,8 +52497,8 @@ self: {
      }:
      mkDerivation {
        pname = "container";
-       version = "1.0.1";
-       sha256 = "ba38eafffb5f9336e80d52435feb43cfa4186e6cc439e4c4499b7d5297a49432";
+       version = "1.0.2";
+       sha256 = "413ef2df4f8f99c8ba85547435d816eee87a72784e08aae49563bba112f41b79";
        libraryHaskellDepends = [
          base containers data-default data-layer functor-utils lens
          lens-utils mtl template-haskell text transformers transformers-base
@@ -52764,8 +53187,8 @@ self: {
      }:
      mkDerivation {
        pname = "convert";
-       version = "1.0";
-       sha256 = "40404a86c7dbe1766fe9fbbc0289b79c132aeff38946e177f49a0ffc7ff3c1f5";
+       version = "1.0.2";
+       sha256 = "388502eb341523d153276e510815c5b2d1fa83c125c5da6b19844bb084149e6f";
        libraryHaskellDepends = [
          base bytestring containers either lens mtl old-locale old-time
          template-haskell text time
@@ -53207,17 +53630,12 @@ self: {
      }) {};
 
   "coroutine-object" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, either, lens
-     , mtl, safecopy, transformers, transformers-free, uuid
-     }:
+    ({ mkDerivation, base, either, free, mtl, transformers }:
      mkDerivation {
        pname = "coroutine-object";
-       version = "0.3";
-       sha256 = "394cb02b87c8b53b4a89a1652954c0c215d302ae1ec0ae66acbcdf7818db1960";
-       libraryHaskellDepends = [
-         base bytestring cereal containers either lens mtl safecopy
-         transformers transformers-free uuid
-       ];
+       version = "0.3.0";
+       sha256 = "cf0fb74baee84167898e899f9e5779c0c71c9d2967fc4a52d25941aeddf0f7c1";
+       libraryHaskellDepends = [ base either free mtl transformers ];
        description = "Object-oriented programming realization using coroutine";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56243,7 +56661,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "darcs" = callPackage
+  "darcs_2_10_2" = callPackage
     ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
      , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
      , directory, filepath, FindBin, hashable, haskeline, html, HTTP
@@ -56287,6 +56705,51 @@ self: {
        homepage = "http://darcs.net/";
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) curl;};
+
+  "darcs" = callPackage
+    ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
+     , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
+     , directory, filepath, FindBin, hashable, haskeline, html, HTTP
+     , HUnit, mmap, mtl, network, network-uri, old-time, parsec, process
+     , QuickCheck, random, regex-applicative, regex-compat-tdfa, sandi
+     , shelly, split, tar, terminfo, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , transformers, transformers-compat, unix, unix-compat, utf8-string
+     , vector, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "darcs";
+       version = "2.10.3";
+       sha256 = "ca00c40d08276f94868c7c1bbc6dbd9b6b41a15c1907c34947aaa51d4dbbf642";
+       configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array attoparsec base base16-bytestring binary bytestring
+         containers cryptohash data-ordlist directory filepath hashable
+         haskeline html HTTP mmap mtl network network-uri old-time parsec
+         process random regex-applicative regex-compat-tdfa sandi tar
+         terminfo text time transformers transformers-compat unix
+         unix-compat utf8-string vector zip-archive zlib
+       ];
+       librarySystemDepends = [ curl ];
+       executableHaskellDepends = [ base filepath regex-compat-tdfa ];
+       testHaskellDepends = [
+         array base binary bytestring cmdargs containers cryptohash
+         directory filepath FindBin html HUnit mmap mtl parsec process
+         QuickCheck regex-compat-tdfa sandi shelly split test-framework
+         test-framework-hunit test-framework-quickcheck2 text unix-compat
+         zip-archive zlib
+       ];
+       postInstall = ''
+         mkdir -p $out/etc/bash_completion.d
+         mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
+       '';
+       homepage = "http://darcs.net/";
+       description = "a distributed, interactive, smart revision control system";
+       license = "GPL";
      }) {inherit (pkgs) curl;};
 
   "darcs-benchmark" = callPackage
@@ -56767,6 +57230,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-base" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "data-base";
+       version = "1.1";
+       sha256 = "1d85ee03627495104cd73e8f4fc2459f3ff2e873a46cbd0db9708c6168ae25d1";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/wdanilo/data-base";
+       description = "Utilities for accessing and comparing types based on so called bases - representations with limited polymorphism";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "data-binary-ieee754" = callPackage
     ({ mkDerivation, base, binary }:
      mkDerivation {
@@ -56868,8 +57343,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "data-construction";
-       version = "1.0";
-       sha256 = "8a0e678fabcadbe0aaec1058e4cc7d4632633646c30bc6851c6835db37d19169";
+       version = "1.1";
+       sha256 = "e8e55864def9f07c65137535d4494b694203e724e450494f89b502751d92b341";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/wdanilo/data-construction";
        description = "Data construction abstractions including Constructor, Destructor, Maker, Destroyer, Producer and Consumer";
@@ -56952,6 +57427,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-default-instances-bytestring" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class }:
+     mkDerivation {
+       pname = "data-default-instances-bytestring";
+       version = "0.0.1";
+       sha256 = "4c431278d0dc1054fd531281db70d8615f88d9b2a29924aba2567fb3cf647220";
+       libraryHaskellDepends = [ base bytestring data-default-class ];
+       homepage = "https://github.com/trskop/data-default-extra";
+       description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "data-default-instances-case-insensitive" = callPackage
+    ({ mkDerivation, case-insensitive, data-default-class }:
+     mkDerivation {
+       pname = "data-default-instances-case-insensitive";
+       version = "0.0.1";
+       sha256 = "430135708ad9d0730a4c3a3d1eb574bdc6f07547a5a9c5f30202e1e786070ab4";
+       libraryHaskellDepends = [ case-insensitive data-default-class ];
+       homepage = "https://github.com/trskop/data-default-extra";
+       description = "Default instance for CI type from case-insensitive package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-default-instances-containers" = callPackage
     ({ mkDerivation, base, containers, data-default-class }:
      mkDerivation {
@@ -56974,6 +57473,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-default-instances-new-base" = callPackage
+    ({ mkDerivation, base, data-default-class
+     , data-default-instances-base
+     }:
+     mkDerivation {
+       pname = "data-default-instances-new-base";
+       version = "0.0.1";
+       sha256 = "d923d291a26817f2bc54ba110efc8cb1cefcdb17c7a5af8e2d12506c594b7edc";
+       libraryHaskellDepends = [
+         base data-default-class data-default-instances-base
+       ];
+       homepage = "https://github.com/trskop/data-default-extra";
+       description = "Default instances for types in newer versions of base package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-default-instances-old-locale" = callPackage
     ({ mkDerivation, base, data-default-class, old-locale }:
      mkDerivation {
@@ -56985,6 +57500,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-default-instances-text" = callPackage
+    ({ mkDerivation, base, data-default-class, text }:
+     mkDerivation {
+       pname = "data-default-instances-text";
+       version = "0.0.1";
+       sha256 = "db5d4c46cf36ce5956ffd0affe0f2c48e1c000b9bd61821d3e6c1b0171060cdf";
+       libraryHaskellDepends = [ base data-default-class text ];
+       homepage = "https://github.com/trskop/data-default-extra";
+       description = "Default instances for (lazy and strict) Text and Text Builder";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "data-default-instances-unordered-containers" = callPackage
+    ({ mkDerivation, data-default-class, unordered-containers }:
+     mkDerivation {
+       pname = "data-default-instances-unordered-containers";
+       version = "0.0.1";
+       sha256 = "b382a7ea90fd61127782e95fa5e7ee3a17969b762bf0aac4efd15fa7c2552fc0";
+       libraryHaskellDepends = [
+         data-default-class unordered-containers
+       ];
+       homepage = "https://github.com/trskop/data-default-extra";
+       description = "Default instances for unordered-containers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "data-default-instances-vector" = callPackage
+    ({ mkDerivation, data-default-class, vector }:
+     mkDerivation {
+       pname = "data-default-instances-vector";
+       version = "0.0.1";
+       sha256 = "9ac84473a3af8b0c5e795ea5f84a34a0c18c3b2d5e17ce428206203f9d794666";
+       libraryHaskellDepends = [ data-default-class vector ];
+       homepage = "https://github.com/trskop/data-default-extra";
+       description = "Default instances for types defined in vector package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-dispersal" = callPackage
     ({ mkDerivation, AES, array, base, binary, bytestring, entropy
      , finite-field, matrix, QuickCheck, secret-sharing, spool, syb
@@ -57274,6 +57827,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "data-json-token" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "data-json-token";
+       version = "0.1.0.0";
+       sha256 = "c58910c76fe08d082f174e7a6e8f04388e9e1bf9326ec4f4dd69908ce6ecfe2d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/haskell-works/data-json-token#readme";
+       description = "Json Token datatype";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-kiln" = callPackage
     ({ mkDerivation, base, containers, data-fix, IfElse, mtl
      , transformers
@@ -57292,12 +57861,12 @@ self: {
      }) {};
 
   "data-layer" = callPackage
-    ({ mkDerivation, base, data-construction, lens }:
+    ({ mkDerivation, base, convert, data-construction, lens }:
      mkDerivation {
        pname = "data-layer";
-       version = "1.0.3";
-       sha256 = "c8a19fd9c87b755957dfa092620e9c26395da12a1dfb2b06ba2fcc8df5438327";
-       libraryHaskellDepends = [ base data-construction lens ];
+       version = "1.0.4";
+       sha256 = "3c11be8dc0da7f4cb080023e2d0ae9f58ad202e193c6f1aea015b7b7873a936d";
+       libraryHaskellDepends = [ base convert data-construction lens ];
        homepage = "https://github.com/wdanilo/layer";
        description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead.";
        license = stdenv.lib.licenses.asl20;
@@ -57648,6 +58217,18 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "data-result" = callPackage
+    ({ mkDerivation, base, poly-control, prologue }:
+     mkDerivation {
+       pname = "data-result";
+       version = "1.0";
+       sha256 = "b266c0184e55ed2fe7af03cf837a2666c6c3265b5de9d5f7416926f981bf0605";
+       libraryHaskellDepends = [ base poly-control prologue ];
+       homepage = "https://github.com/wdanilo/data-result";
+       description = "Data types for returning results distinguishable by types";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "data-rev" = callPackage
     ({ mkDerivation, base, bytestring, containers, text, vector }:
      mkDerivation {
@@ -59529,6 +60110,18 @@ self: {
        license = "unknown";
      }) {};
 
+  "dependent-state" = callPackage
+    ({ mkDerivation, base, lens, mtl, prologue }:
+     mkDerivation {
+       pname = "dependent-state";
+       version = "1.0.1";
+       sha256 = "093aa20845a345c1d44e3d0258eadd6f8c38e3596cd6486be64879d0b60e7467";
+       libraryHaskellDepends = [ base lens mtl prologue ];
+       homepage = "https://github.com/wdanilo/dependent-state";
+       description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "dependent-sum_0_2_1_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -62876,7 +63469,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "direct-sqlite" = callPackage
+  "direct-sqlite_2_3_16" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, directory
      , HUnit, text
      }:
@@ -62892,6 +63485,25 @@ self: {
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
        description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "direct-sqlite" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, directory
+     , HUnit, temporary, text
+     }:
+     mkDerivation {
+       pname = "direct-sqlite";
+       version = "2.3.17";
+       sha256 = "fade7c52d157cf145380a4818fa2e03163fa104fadf43d580c1d475b6b6fffc4";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring directory HUnit temporary text
+       ];
+       doCheck = false;
+       homepage = "https://github.com/IreneKnapp/direct-sqlite";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "directed-cubical" = callPackage
@@ -65344,6 +65956,29 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "dresdner-verkehrsbetriebe" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, HTTP, old-locale
+     , optparse-applicative, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "dresdner-verkehrsbetriebe";
+       version = "0.1.1";
+       sha256 = "380af7c7a9181b3d8b3a9e1bce271a71071781d3055a669b31492217f6c8babf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring HTTP old-locale time unordered-containers
+         vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring HTTP old-locale optparse-applicative time
+         unordered-containers vector
+       ];
+       jailbreak = true;
+       description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "drifter" = callPackage
     ({ mkDerivation, base, containers, fgl, tasty, tasty-hunit
      , tasty-quickcheck, text
@@ -66075,6 +66710,8 @@ self: {
        pname = "dynamic-state";
        version = "0.2.0.0";
        sha256 = "53a09c16380012b35079a7d41fca332fc94b55a0b0c929937af94cc9cad5e0b6";
+       revision = "1";
+       editedCabalFile = "640601c8531dae847d624eac78db22ce0343c1607040a7158454635f486e477c";
        libraryHaskellDepends = [
          base binary bytestring hashable unordered-containers
        ];
@@ -67456,6 +68093,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "elision" = callPackage
+    ({ mkDerivation, base, profunctors }:
+     mkDerivation {
+       pname = "elision";
+       version = "0.1.2.0";
+       sha256 = "2730a52a00c063e3386b0cca50905f3676a740c97aec8149d56e0def29d583e0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base profunctors ];
+       executableHaskellDepends = [ base ];
+       homepage = "http://github.com/crough/elision#readme";
+       description = "Arrows with holes";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "elm-bridge_0_1_0_0" = callPackage
     ({ mkDerivation, base, hspec, template-haskell }:
      mkDerivation {
@@ -68575,6 +69227,8 @@ self: {
        pname = "enummapset-th";
        version = "0.6.1.0";
        sha256 = "bd7ec9fd9063dcf9c8504fe509abdd15466261ef2ba9ec62d6e6abb51e8694f6";
+       revision = "1";
+       editedCabalFile = "2544cf675da1fd28debde06f5d2c9747da0d8b48aa66f2374886d38333f8dc17";
        libraryHaskellDepends = [
          base containers deepseq template-haskell
        ];
@@ -69182,7 +69836,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "errors" = callPackage
+  "errors_2_1_1" = callPackage
     ({ mkDerivation, base, safe, transformers, transformers-compat
      , unexceptionalio
      }:
@@ -69195,6 +69849,22 @@ self: {
        ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "errors" = callPackage
+    ({ mkDerivation, base, safe, transformers, transformers-compat
+     , unexceptionalio
+     }:
+     mkDerivation {
+       pname = "errors";
+       version = "2.1.2";
+       sha256 = "5c818778b88b76eca016348a04395c1d4913d7c125c0b9c0a1ccf69accf9d887";
+       libraryHaskellDepends = [
+         base safe transformers transformers-compat unexceptionalio
+       ];
+       description = "Simplified error-handling";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "ersatz_0_2_6_1" = callPackage
@@ -69607,7 +70277,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ether" = callPackage
+  "ether_0_3_1_1" = callPackage
     ({ mkDerivation, base, mmorph, monad-control, mtl, newtype-generics
      , QuickCheck, tasty, tasty-quickcheck, template-haskell
      , transformers, transformers-base, transformers-lift
@@ -69626,6 +70296,28 @@ self: {
        homepage = "https://int-index.github.io/ether/";
        description = "Monad transformers and classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ether" = callPackage
+    ({ mkDerivation, base, exceptions, mmorph, monad-control, mtl
+     , QuickCheck, tasty, tasty-quickcheck, template-haskell
+     , transformers, transformers-base, transformers-lift
+     }:
+     mkDerivation {
+       pname = "ether";
+       version = "0.4.0.0";
+       sha256 = "19470d47313c0fe2984010871c8d13398b9c13d4cdc799b9bd0e431bc9714d6e";
+       libraryHaskellDepends = [
+         base exceptions mmorph monad-control mtl template-haskell
+         transformers transformers-base transformers-lift
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck tasty tasty-quickcheck transformers
+       ];
+       homepage = "https://int-index.github.io/ether/";
+       description = "Monad transformers and classes";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "ethereum-client-haskell" = callPackage
@@ -69868,8 +70560,8 @@ self: {
      }:
      mkDerivation {
        pname = "event-list";
-       version = "0.1.1.2";
-       sha256 = "eb630b4a2cd295863a8d9f3f21904e012504cd4ebdb44453dea6a69dc7216cdb";
+       version = "0.1.1.3";
+       sha256 = "f58250c839eab441221fdfcc82795f4a4bddd397cd08dc02729ebe3bb05e8416";
        libraryHaskellDepends = [
          base non-negative QuickCheck transformers utility-ht
        ];
@@ -70015,6 +70707,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "exact-pi_0_4_1_1" = callPackage
+    ({ mkDerivation, base, numtype-dk }:
+     mkDerivation {
+       pname = "exact-pi";
+       version = "0.4.1.1";
+       sha256 = "ea5928688a202ae54fd7216dbaab073ae660ffec4b3165724d98c938cc1acad8";
+       libraryHaskellDepends = [ base numtype-dk ];
+       homepage = "https://github.com/dmcclean/exact-pi/";
+       description = "Exact rational multiples of pi (and integer powers of pi)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "exact-real" = callPackage
     ({ mkDerivation, base, checkers, directory, doctest, filepath
      , groups, integer-gmp, memoize, QuickCheck, random, tasty
@@ -70471,6 +71176,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "existential" = callPackage
+    ({ mkDerivation, base, lens, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "existential";
+       version = "0.1.0.0";
+       sha256 = "1aea3b930ba0343fb9f3d8bef2d96dde79b9fb353ce80b6a93c9d99599c6b46a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base lens QuickCheck template-haskell ];
+       executableHaskellDepends = [ base lens ];
+       homepage = "https://bitbucket.org/cipher2048/existential/wiki/Home";
+       description = "A library for existential types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "exists" = callPackage
     ({ mkDerivation, base, contravariant }:
      mkDerivation {
@@ -71495,7 +72215,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fasta" = callPackage
+  "fasta_0_10_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, foldl
      , lens, parsec, pipes, pipes-attoparsec, pipes-bytestring
      , pipes-group, pipes-text, split, text
@@ -71511,6 +72231,25 @@ self: {
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "fasta" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, foldl
+     , lens, parsec, pipes, pipes-attoparsec, pipes-bytestring
+     , pipes-group, pipes-text, split, text
+     }:
+     mkDerivation {
+       pname = "fasta";
+       version = "0.10.2.0";
+       sha256 = "da98cdcb501840341b34d354dae5063f1574d60fb48469b9d070631970fe4f50";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers foldl lens parsec pipes
+         pipes-attoparsec pipes-bytestring pipes-group pipes-text split text
+       ];
+       homepage = "https://github.com/GregorySchwartz/fasta";
+       description = "A simple, mindless parser for fasta files";
+       license = stdenv.lib.licenses.gpl2;
      }) {};
 
   "fastbayes" = callPackage
@@ -74384,6 +75123,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "fixfile" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , directory, exceptions, filepath, hashable, hashtables, lens, mtl
+     , QuickCheck, tasty, tasty-quickcheck, temporary
+     }:
+     mkDerivation {
+       pname = "fixfile";
+       version = "0.1.0.0";
+       sha256 = "f52739e9ecd4b018fa1744890a3fb185da003b08c1244b748719ea657c36321a";
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory filepath hashable
+         hashtables lens mtl temporary
+       ];
+       testHaskellDepends = [
+         base binary bytestring directory exceptions lens mtl QuickCheck
+         tasty tasty-quickcheck temporary
+       ];
+       homepage = "https://github.com/revnull/fixfile";
+       description = "File-backed recursive data structures";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "fixhs" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-enumerator, base
      , bytestring, containers, deepseq, dlist, enumerator, HaXml
@@ -74937,24 +75698,39 @@ self: {
 
   "fltkhs" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, directory, filepath, mtl
-     , parsec, process
+     , parsec
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.4.0.0";
-       sha256 = "7e975cca6e57dc947abdc776a90fb94cee9f30fc8a0f395570c9665d23e53644";
+       version = "0.4.0.2";
+       sha256 = "0ce62c0325a1ec7a9c782b0ead40cdfb3c60cc5f98c13f61f72e329214c06d17";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
-       executableHaskellDepends = [
-         base bytestring directory filepath mtl parsec process
-       ];
+       executableHaskellDepends = [ base directory filepath mtl parsec ];
        homepage = "http://github.com/deech/fltkhs";
        description = "FLTK bindings";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "fltkhs-demos" = callPackage
+    ({ mkDerivation, base, bytestring, directory, fltkhs, process, stm
+     }:
+     mkDerivation {
+       pname = "fltkhs-demos";
+       version = "0.0.0.3";
+       sha256 = "c39a9c8378857e4f4c7af7ab98516bb3deffce1e39742eb7f39ce4cf09c1f1b7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring directory fltkhs process stm
+       ];
+       homepage = "http://github.com/deech/fltkhs-demos";
+       description = "FLTKHS demos. Please scroll to the bottom for more information.";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fltkhs-fluid-examples" = callPackage
     ({ mkDerivation, base, bytestring, fltkhs }:
      mkDerivation {
@@ -76302,18 +77078,17 @@ self: {
      }) {};
 
   "fquery" = callPackage
-    ({ mkDerivation, base, directory, extensible-exceptions, hashtables
-     , parsec, process, regex-compat, unix
+    ({ mkDerivation, base, directory, filepath, hashtables, parsec
+     , process, regex-compat, unix
      }:
      mkDerivation {
        pname = "fquery";
-       version = "0.2.1.5";
-       sha256 = "f124de95a18d2e177ed1fae3493ad093c8c365d513c0cc958227fc59f2ca38ec";
+       version = "0.2.2";
+       sha256 = "5641c8748ff11e5ba37175eac76ee4b14739a3d4d4711ea5ce023bc8d8559cbe";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base directory extensible-exceptions hashtables parsec process
-         regex-compat unix
+         base directory filepath hashtables parsec process regex-compat unix
        ];
        description = "Installed package query tool for Gentoo Linux";
        license = "unknown";
@@ -76991,6 +77766,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "frown" = callPackage
+    ({ mkDerivation, base, directory }:
+     mkDerivation {
+       pname = "frown";
+       version = "0.6.2.2";
+       sha256 = "d061880b6b3fca4f2a5c054f5669d9c0747139386c47ccf57db4d5521c02c447";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base directory ];
+       description = "LALR(k) parser generator";
+       license = "GPL";
+     }) {};
+
   "frp-arduino" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -77554,12 +78342,12 @@ self: {
      }) {};
 
   "functor-utils" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "functor-utils";
-       version = "1.0";
-       sha256 = "b7c38d1051bfaaebc564df205757bbc8d418e8b350fee711c51c44e5c7ebd4f6";
-       libraryHaskellDepends = [ base ];
+       version = "1.1";
+       sha256 = "a054cbd84686777774b9e2c36c1b5ceaf8ca415a9755e922ff52137eb9ac36ba";
+       libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/wdanilo/functor-utils";
        description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
        license = stdenv.lib.licenses.asl20;
@@ -78313,14 +79101,16 @@ self: {
      }) {};
 
   "generic-accessors" = callPackage
-    ({ mkDerivation, base, HUnit, lens, linear, QuickCheck
-     , spatial-math, test-framework, test-framework-hunit
+    ({ mkDerivation, base, binary, cereal, HUnit, lens, linear
+     , QuickCheck, spatial-math, test-framework, test-framework-hunit
      }:
      mkDerivation {
        pname = "generic-accessors";
-       version = "0.5.1.0";
-       sha256 = "547a5b0ba3fac1e2d5f7de7f7248aef2b128b24714f4c0908b5191ebe5d39442";
-       libraryHaskellDepends = [ base lens linear spatial-math ];
+       version = "0.6.0.0";
+       sha256 = "78f8b96b5633f6f2953e6cda0d236da987743d990d7d9facd254fe10d41fc504";
+       libraryHaskellDepends = [
+         base binary cereal lens linear spatial-math
+       ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
        ];
@@ -78509,7 +79299,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "generic-deriving" = callPackage
+  "generic-deriving_1_9_0" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generic-deriving";
@@ -78523,9 +79313,10 @@ self: {
        homepage = "https://github.com/dreixel/generic-deriving";
        description = "Generic programming library for generalised deriving";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "generic-deriving_1_10_0" = callPackage
+  "generic-deriving" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generic-deriving";
@@ -78537,7 +79328,6 @@ self: {
        homepage = "https://github.com/dreixel/generic-deriving";
        description = "Generic programming library for generalised deriving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-lucid-scaffold" = callPackage
@@ -80128,7 +80918,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-typelits-natnormalise" = callPackage
+  "ghc-typelits-natnormalise_0_4" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit
      }:
      mkDerivation {
@@ -80140,6 +80930,21 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ghc-typelits-natnormalise" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-natnormalise";
+       version = "0.4.1";
+       sha256 = "d7b1d7059eb0a9254ff6983897141f8fd0ac485dcb2c09eafd19f36dce0e5af7";
+       libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       homepage = "http://www.clash-lang.org/";
+       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "ghc-vis" = callPackage
@@ -80491,8 +81296,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-atk";
-       version = "0.2.18.10";
-       sha256 = "e56f898c789959b310bd1fcdf9065155751c56ab5065fbf3adbac31ed542f14d";
+       version = "0.2.18.12";
+       sha256 = "00f4542fb4da78adbf0a84f5c81f386e645bc82a811d44b32e031df7721fae66";
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -80509,8 +81314,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-cairo";
-       version = "0.1.14.11";
-       sha256 = "d5662b5f971eb756b57c6cf3699b40ee7489a91cf64ad73074514e2f7a1329b9";
+       version = "0.1.14.12";
+       sha256 = "8d023a70208100d4d8f634bbe408d2f956f3afe8f73dce3411747d753974b173";
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -80528,8 +81333,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "0.3.18.10";
-       sha256 = "54c7eeb7d06fe03079aade5c415bb64753269add6195348c35c7dcdcb6ef018e";
+       version = "0.3.18.12";
+       sha256 = "9cde9b8e62af1123c134d576c634846514b5e7f9561d5cc0692a68ad64306190";
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
          gi-gobject gi-pango haskell-gi-base text transformers
@@ -80547,8 +81352,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
-       version = "0.2.32.10";
-       sha256 = "b174113ae61ede2035eaf67380edbd6a93270a6c5c9ac3dbc2633b102eca6d29";
+       version = "0.2.32.12";
+       sha256 = "0b3b3188250602969b06520b82ba3b1a4df52bc303c6a16ec22495b4f3b356e6";
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -80565,8 +81370,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gio";
-       version = "0.2.46.10";
-       sha256 = "c37256afbbbf492c43ceef81c1fcb3be12ae165316a7576cb4054d10ccdeb6a0";
+       version = "0.2.46.12";
+       sha256 = "c200b349cb53e9d52f2592c714a39734f45129c0d94a5a21815630e66e993d1f";
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -80577,14 +81382,33 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "gi-girepository" = callPackage
+    ({ mkDerivation, base, bytestring, containers, gi-gobject
+     , gobjectIntrospection, haskell-gi-base, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-girepository";
+       version = "0.1.44.12";
+       sha256 = "c7f53dee512511df7a4c8f00d2e5ae37ae52f49859efd83afef77e9c3f71fd80";
+       libraryHaskellDepends = [
+         base bytestring containers gi-gobject haskell-gi-base text
+         transformers
+       ];
+       libraryPkgconfigDepends = [ gobjectIntrospection ];
+       jailbreak = true;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "GIRepository bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs) gobjectIntrospection;};
+
   "gi-glib" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib
      , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-glib";
-       version = "0.2.46.10";
-       sha256 = "4a36df320fce4e7543cb9bd8ffb50a94c3b0a1ef738c69a376080312612ed7f7";
+       version = "0.2.46.12";
+       sha256 = "5b0bff30b5a1a4cc3f5f55437d357917153e3e6f51f506593543e9e13a103d1b";
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -80600,8 +81424,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gobject";
-       version = "0.2.46.10";
-       sha256 = "0378e905abf11d90d13eb3bb645a2877d8f0885e158bb98758ba5a77a041c2bc";
+       version = "0.2.46.12";
+       sha256 = "990287820c8e0855249d6e5a41ec0ae3d6beaa6594c44d156316670477b508dc";
        libraryHaskellDepends = [
          base bytestring containers gi-glib haskell-gi-base text
          transformers
@@ -80619,8 +81443,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "0.3.18.10";
-       sha256 = "ad4879b4a216722ac53dc7f71afa64e338e65440a9fecf3179f3f6d431b81458";
+       version = "0.3.18.12";
+       sha256 = "f1bdacb55a80b26ee36f5f1fea6cfdb9f7505429432797389b0bd1b4c22f40f3";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-pango haskell-gi-base text
@@ -80639,8 +81463,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "0.2.10.10";
-       sha256 = "9bea9cfb0554d92c4320e04be53100cea142baec034be29306a80ce7037e9cb7";
+       version = "0.2.10.12";
+       sha256 = "e078b90cf16904c7e93e9f6d4274ae2f847597f03137a4ecbb2808a33ec8ad18";
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -80658,8 +81482,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-notify";
-       version = "0.2.32.10";
-       sha256 = "c338d32b953fdf73ffb41b959c7c7b2834c40b29f644da77c0c67f9c53aa8f50";
+       version = "0.2.32.12";
+       sha256 = "fff3910ced837a9bafbc39d3965a06c925976c9c7853286d1234a671e90f5a49";
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -80676,8 +81500,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "0.1.38.10";
-       sha256 = "05b759c4ecd61dfbd16d62e91541905aecd00b84761931911a88b484630cd6cd";
+       version = "0.1.38.12";
+       sha256 = "dd542ea85468b8c6188f02e4ec546dc18ad57f498ad0775714edd040cffbe016";
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -80688,14 +81512,32 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome) pango;};
 
+  "gi-poppler" = callPackage
+    ({ mkDerivation, base, bytestring, containers, gi-cairo, gi-gio
+     , gi-glib, gi-gobject, haskell-gi-base, poppler, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-poppler";
+       version = "0.0.34.12";
+       sha256 = "b4f6222d6912232b172481c9cdff2bf94a3e8c88753b5a2549e59e18810aa670";
+       libraryHaskellDepends = [
+         base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
+         haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ poppler ];
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Poppler bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs) poppler;};
+
   "gi-soup" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-gio, gi-glib
      , gi-gobject, haskell-gi-base, libsoup, text, transformers
      }:
      mkDerivation {
        pname = "gi-soup";
-       version = "0.2.52.10";
-       sha256 = "7b680363b582d69a12d4c7da469530b821db2905bcad0c968f668b32edd663de";
+       version = "0.2.52.12";
+       sha256 = "ca5e1f931dba96aa9006cec559316b308f14d427afefbbb221e7a154df755a6d";
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -80714,8 +81556,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "0.0.42.10";
-       sha256 = "7ac367fb334d70eb852631ad12458682528c0080bd9592fd97377e8c865179ed";
+       version = "0.0.42.12";
+       sha256 = "15e2828c0fefd118e4fd4e3081a99af7b85f7615e5298db86b7f2a01bac2bc88";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
          gi-gtk gi-pango haskell-gi-base text transformers
@@ -80735,8 +81577,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit";
-       version = "0.2.4.11";
-       sha256 = "021835a251b1e9ddd2bf2910e0d3c17b4d6b940e9376a7000429f86a925a4013";
+       version = "0.2.4.12";
+       sha256 = "3b0cddc3f28d6acd4583224b72c289d3f7239302f4b8d01d79b8e98f8786fc08";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup
@@ -80757,8 +81599,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "0.2.10.10";
-       sha256 = "03c8a0ba73dd1d1b942dd87d57560a8e7a50ec6684a32b07423aaf731feb9075";
+       version = "0.2.10.12";
+       sha256 = "71872b4690056320f20ddc4a468f04b525e29bef06137963ca8406da72e2056a";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
          gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi-base text
@@ -80771,6 +81613,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit2gtk = null;};
 
+  "gi-webkit2webextension" = callPackage
+    ({ mkDerivation, base, bytestring, containers, gi-gobject, gi-gtk
+     , gi-javascriptcore, gi-soup, haskell-gi-base, text, transformers
+     , webkit2gtk-web-extension
+     }:
+     mkDerivation {
+       pname = "gi-webkit2webextension";
+       version = "0.2.10.12";
+       sha256 = "1ca70e16d94719c5a6fc97e198c50ee5d5bb0edb8e956b4f89387fd793530ff2";
+       libraryHaskellDepends = [
+         base bytestring containers gi-gobject gi-gtk gi-javascriptcore
+         gi-soup haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ webkit2gtk-web-extension ];
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "WebKit2WebExtension bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {webkit2gtk-web-extension = null;};
+
   "gimlh" = callPackage
     ({ mkDerivation, base, split }:
      mkDerivation {
@@ -81608,7 +82469,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "github" = callPackage
+  "github_0_14_0" = callPackage
     ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
      , base16-bytestring, binary, binary-orphans, byteable, bytestring
      , containers, cryptohash, deepseq, deepseq-generics, exceptions
@@ -81636,6 +82497,37 @@ self: {
        homepage = "https://github.com/phadej/github";
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "github" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
+     , base16-bytestring, binary, binary-orphans, byteable, bytestring
+     , containers, cryptohash, deepseq, deepseq-generics, exceptions
+     , file-embed, hashable, hspec, http-client, http-client-tls
+     , http-link-header, http-types, iso8601-time, mtl, network-uri
+     , semigroups, text, time, transformers, transformers-compat
+     , unordered-containers, vector, vector-instances
+     }:
+     mkDerivation {
+       pname = "github";
+       version = "0.14.1";
+       sha256 = "fcd5f8957855e4a110db2dc411916309fd7afb7105534ebe378a5698f409fa7d";
+       libraryHaskellDepends = [
+         aeson aeson-compat attoparsec base base-compat base16-bytestring
+         binary binary-orphans byteable bytestring containers cryptohash
+         deepseq deepseq-generics exceptions hashable http-client
+         http-client-tls http-link-header http-types iso8601-time mtl
+         network-uri semigroups text time transformers transformers-compat
+         unordered-containers vector vector-instances
+       ];
+       testHaskellDepends = [
+         aeson-compat base base-compat file-embed hspec unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/phadej/github";
+       description = "Access to the GitHub API, v3";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "github-backup" = callPackage
@@ -81646,8 +82538,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-backup";
-       version = "1.20150807";
-       sha256 = "52236cba75a6e9c2a71c77e62839d22d5a672bb3e4bf4bb61d32c3c64d38a8a7";
+       version = "1.20160207";
+       sha256 = "7502179fe38bc00b21f9352a013334bfb9ca51488854bd9c01092cedf2330c64";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -81657,6 +82549,7 @@ self: {
          unix-compat
        ];
        executableToolDepends = [ git ];
+       jailbreak = true;
        homepage = "https://github.com/joeyh/github-backup";
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
@@ -84739,6 +85632,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gore-and-ash-async" = callPackage
+    ({ mkDerivation, async, base, containers, deepseq, exceptions
+     , gore-and-ash, hashable, HUnit, mtl, test-framework
+     , test-framework-hunit, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "gore-and-ash-async";
+       version = "1.0.0.0";
+       sha256 = "3e9ed4259af38831eebfd1f2084567c9bac9c9cb5b45636b82914faec0e1e1fc";
+       libraryHaskellDepends = [
+         async base containers deepseq exceptions gore-and-ash hashable mtl
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base containers deepseq exceptions gore-and-ash HUnit mtl
+         test-framework test-framework-hunit transformers
+       ];
+       homepage = "https://github.com/TeaspotStudio/gore-and-ash-async#readme";
+       description = "Core module for Gore&Ash engine that embeds async IO actions into game loop";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gore-and-ash-demo" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, deepseq
      , exception-transformers, exceptions, GLFW-b, gore-and-ash
@@ -85093,7 +86008,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "graph-core" = callPackage
+  "graph-core_0_2_2_0" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, HTF, mtl
      , QuickCheck, safe, unordered-containers, vector
      }:
@@ -85114,24 +86029,50 @@ self: {
        homepage = "https://github.com/factisresearch/graph-core";
        description = "Fast, memory efficient and persistent graph implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "graph-core" = callPackage
+    ({ mkDerivation, base, containers, deepseq, hashable, HTF, mtl
+     , QuickCheck, safe, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "graph-core";
+       version = "0.3.0.0";
+       sha256 = "378f0baa40ebbb78e8c389f79e363eb573cdf182f799684d2f3d6ac51b10e854";
+       libraryHaskellDepends = [
+         base containers deepseq hashable mtl safe unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         base containers deepseq hashable HTF mtl QuickCheck safe
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/factisresearch/graph-core";
+       description = "Fast, memory efficient and persistent graph implementation";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "graph-generators" = callPackage
-    ({ mkDerivation, base, Cabal, containers, fgl, hspec
+    ({ mkDerivation, base, Cabal, containers, directory, fgl, hspec
      , hspec-expectations, multiset, mwc-random, QuickCheck
      }:
      mkDerivation {
        pname = "graph-generators";
-       version = "0.1.2.0";
-       sha256 = "3ae508177ce01f86cfcc091421294a1a0736a56f9f8a34cd07cc67486b168247";
+       version = "0.1.3.0";
+       sha256 = "1fe09712b7c52b18da467facf0ffb78e7de515113401b5c2d8adf7fb13603d50";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers fgl multiset mwc-random
        ];
+       executableHaskellDepends = [
+         base containers directory fgl multiset mwc-random
+       ];
        testHaskellDepends = [
          base Cabal containers fgl hspec hspec-expectations multiset
          mwc-random QuickCheck
        ];
-       jailbreak = true;
        homepage = "https://github.com/ulikoehler/graph-random";
        description = "Functions for generating structured or random FGL graphs";
        license = stdenv.lib.licenses.asl20;
@@ -85190,13 +86131,12 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-gl";
-       version = "0.7.5";
-       sha256 = "1ece884c105a81479a57d215b50ff22e7d60a86d6b04ab072724192132fcd633";
+       version = "0.7.6";
+       sha256 = "a6157c17e07fbf167b64ebfa51e256794fd99ce1fff4ede88035d8c9e4299239";
        libraryHaskellDepends = [
          AC-Vector base base-unicode-symbols containers GLUT graph-rewriting
          graph-rewriting-layout OpenGL
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "OpenGL interface for interactive port graph rewriting";
        license = stdenv.lib.licenses.bsd3;
@@ -85210,8 +86150,8 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-lambdascope";
-       version = "0.5.6";
-       sha256 = "77efc3d0516306119c1e959a7bfb37428e9cfb67e6e34cc7bfb728216c159ee3";
+       version = "0.5.8";
+       sha256 = "e56293febd459060627af0912e7c1d0a0d6840fa31c2d5e9fcc1ca9bf9914db1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -85219,7 +86159,6 @@ self: {
          graph-rewriting-layout graph-rewriting-strategies IndentParser
          OpenGL parsec
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system";
        license = stdenv.lib.licenses.bsd3;
@@ -85232,12 +86171,11 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-layout";
-       version = "0.5.3";
-       sha256 = "c5950e8c5714968e59203518335dad4f796191248a8f762c8676343b9567da25";
+       version = "0.5.4";
+       sha256 = "052f1d481edf398cfd486849d981de20a298842a75a20864190b921af8fd7d92";
        libraryHaskellDepends = [
          AC-Vector base base-unicode-symbols graph-rewriting
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Force-directed node placement intended for incremental graph drawing";
        license = stdenv.lib.licenses.bsd3;
@@ -85250,15 +86188,14 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-ski";
-       version = "0.6.4";
-       sha256 = "4409c3422694fa332cafb8cde7711d4442c3e0cd412daa401e9d1e413ee3ae49";
+       version = "0.6.5";
+       sha256 = "019378940fb886e668a57a580b2df65309ab80def00555c77cf75b224923ac1a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout OpenGL parsec
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems";
        license = stdenv.lib.licenses.bsd3;
@@ -85271,12 +86208,11 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-strategies";
-       version = "0.2.3";
-       sha256 = "59a6a16d6c4d51608a0e07dc611e89ee4dc376c4096488a460e9dabafab93556";
+       version = "0.2.4";
+       sha256 = "6230a111c89e765aba002eaf62db138e7ec848474f78b300c21b7d7e087caa57";
        libraryHaskellDepends = [
          base base-unicode-symbols containers graph-rewriting
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluation strategies for port-graph rewriting systems";
        license = stdenv.lib.licenses.bsd3;
@@ -85290,8 +86226,8 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-trs";
-       version = "0.1.6";
-       sha256 = "cf237b8faf13a36d5bb594a64b2768db0203a819b083c02ff45282ea07ab11ed";
+       version = "0.1.7";
+       sha256 = "e5e3a8e1bf70e39a933cd0b4d395eaf4c912cdbb547926b6a26472163fdbe92e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -85299,7 +86235,6 @@ self: {
          graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL
          uu-parsinglib
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction";
        license = stdenv.lib.licenses.bsd3;
@@ -85313,15 +86248,14 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-ww";
-       version = "0.3.4";
-       sha256 = "5c6c65e3904c00c3ac62ebba5ef1ce64604101cb3f76e944a034e1127c2c3a99";
+       version = "0.3.5";
+       sha256 = "649160c0315861f275012e891a074a96aa6f59a3890f2e69f9612a1d91dece5a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout IndentParser OpenGL parsec
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing";
        license = stdenv.lib.licenses.bsd3;
@@ -85841,6 +86775,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "greplicate" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, lens
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "greplicate";
+       version = "0.0.2";
+       sha256 = "c73d6b8f586e6004d3d66bb7b5d1402941021ce8d29a309fbb61c45f28753ce5";
+       libraryHaskellDepends = [ base lens ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/NICTA/greplicate";
+       description = "Generalised replicate functions";
+       license = "unknown";
+     }) {};
+
   "grid" = callPackage
     ({ mkDerivation, base, cereal, containers, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -87672,7 +88623,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hOpenPGP" = callPackage
+  "hOpenPGP_2_4_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
      , conduit, conduit-extra, containers, crypto-cipher-types
@@ -87713,6 +88664,88 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hOpenPGP" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
+     , conduit, conduit-extra, containers, crypto-cipher-types
+     , cryptonite, data-default-class, errors, hashable
+     , incremental-parser, ixset-typed, lens, memory, monad-loops
+     , nettle, network, network-uri, newtype, openpgp-asciiarmor
+     , QuickCheck, quickcheck-instances, resourcet, securemem
+     , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, time-locale-compat, transformers, unordered-containers
+     , wl-pprint-extras, zlib
+     }:
+     mkDerivation {
+       pname = "hOpenPGP";
+       version = "2.4.2";
+       sha256 = "dc8472877d202c65f206f937801499cd904d65110414ba5522c5ac1a168aadb8";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bifunctors binary
+         binary-conduit byteable bytestring bzlib conduit conduit-extra
+         containers crypto-cipher-types cryptonite data-default-class errors
+         hashable incremental-parser ixset-typed lens memory monad-loops
+         nettle network network-uri newtype openpgp-asciiarmor resourcet
+         securemem semigroups split text time time-locale-compat
+         transformers unordered-containers wl-pprint-extras zlib
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bifunctors binary binary-conduit byteable
+         bytestring bzlib conduit conduit-extra containers
+         crypto-cipher-types cryptonite data-default-class errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype QuickCheck quickcheck-instances
+         resourcet securemem semigroups split tasty tasty-hunit
+         tasty-quickcheck text time time-locale-compat transformers
+         unordered-containers wl-pprint-extras zlib
+       ];
+       homepage = "http://floss.scru.org/hOpenPGP/";
+       description = "native Haskell implementation of OpenPGP (RFC4880)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hOpenPGP_2_4_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
+     , conduit, conduit-extra, containers, crypto-cipher-types
+     , cryptonite, data-default-class, errors, hashable
+     , incremental-parser, ixset-typed, lens, memory, monad-loops
+     , nettle, network, network-uri, newtype, openpgp-asciiarmor
+     , QuickCheck, quickcheck-instances, resourcet, securemem
+     , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, time-locale-compat, transformers, unordered-containers
+     , wl-pprint-extras, zlib
+     }:
+     mkDerivation {
+       pname = "hOpenPGP";
+       version = "2.4.3";
+       sha256 = "3e7ff2430415856b2d99d3cba144f9c41fcfe0cceea5d0967909b4033f0a86c9";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bifunctors binary
+         binary-conduit byteable bytestring bzlib conduit conduit-extra
+         containers crypto-cipher-types cryptonite data-default-class errors
+         hashable incremental-parser ixset-typed lens memory monad-loops
+         nettle network network-uri newtype openpgp-asciiarmor resourcet
+         securemem semigroups split text time time-locale-compat
+         transformers unordered-containers wl-pprint-extras zlib
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bifunctors binary binary-conduit byteable
+         bytestring bzlib conduit conduit-extra containers
+         crypto-cipher-types cryptonite data-default-class errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype QuickCheck quickcheck-instances
+         resourcet securemem semigroups split tasty tasty-hunit
+         tasty-quickcheck text time time-locale-compat transformers
+         unordered-containers wl-pprint-extras zlib
+       ];
+       homepage = "http://floss.scru.org/hOpenPGP/";
+       description = "native Haskell implementation of OpenPGP (RFC4880)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hPDB_1_2_0" = callPackage
     ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq
      , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel
@@ -88885,26 +89918,27 @@ self: {
      }) {};
 
   "hackport" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , directory, extensible-exceptions, filepath, HTTP, HUnit, MissingH
-     , network, network-uri, old-locale, old-time, parsec, pretty
-     , process, regex-compat, tar, time, unix, xml, zlib
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , deepseq, directory, extensible-exceptions, filepath, HTTP, HUnit
+     , MissingH, network, network-uri, old-locale, old-time, parsec
+     , pretty, process, random, regex-compat, stm, tar, time, unix, xml
+     , zlib
      }:
      mkDerivation {
        pname = "hackport";
-       version = "0.4.6";
-       sha256 = "5b5cd178fbefe5363bd4f68ca98386fd2762df88ff24435e1999f28e80b1e14e";
+       version = "0.4.7";
+       sha256 = "17dc05163b456dceeb00180a03bb56f4218e5c5e1145c7ad12af13a261b0cf36";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base bytestring containers deepseq directory
+         array base binary bytestring containers deepseq directory
          extensible-exceptions filepath HTTP MissingH network network-uri
-         old-locale old-time parsec pretty process regex-compat tar time
-         unix xml zlib
+         old-locale old-time parsec pretty process random regex-compat stm
+         tar time unix xml zlib
        ];
        testHaskellDepends = [
-         base bytestring containers deepseq directory extensible-exceptions
-         filepath HUnit pretty process time unix xml
+         base binary bytestring containers deepseq directory
+         extensible-exceptions filepath HUnit pretty process time unix xml
        ];
        description = "Hackage and Portage integration tool";
        license = "GPL";
@@ -89247,6 +90281,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hahp" = callPackage
+    ({ mkDerivation, base, containers, hmatrix, parallel, time }:
+     mkDerivation {
+       pname = "hahp";
+       version = "0.1.2";
+       sha256 = "8c13015c685d5abf70ec6fbb7e6b50304f8689bab332d078d53d815e66f9b7fa";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers hmatrix parallel time ];
+       executableHaskellDepends = [ base time ];
+       description = "Analytic Hierarchy Process";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "haiji" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, data-default, doctest
      , filepath, mtl, process-extras, scientific, tagged, tasty
@@ -90503,8 +91551,8 @@ self: {
      }:
      mkDerivation {
        pname = "haphviz";
-       version = "0.1.1.5";
-       sha256 = "f838c308bd3f82ba0766078e1aac0d6593e0eac63403beb6453c77fee36c7929";
+       version = "0.1.2.0";
+       sha256 = "d7dcb9cc3c345a3886206fc2c50ce375fbafea5c44124602a6124d144d172f8e";
        libraryHaskellDepends = [ base mtl text ];
        testHaskellDepends = [
          base checkers hspec QuickCheck quickcheck-text text
@@ -91197,7 +92245,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "happstack-server" = callPackage
+  "happstack-server_7_4_5" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
      , containers, directory, exceptions, extensible-exceptions
      , filepath, hslogger, html, HUnit, monad-control, mtl, network
@@ -91224,6 +92272,36 @@ self: {
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "happstack-server" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
+     , containers, directory, exceptions, extensible-exceptions
+     , filepath, hslogger, html, HUnit, monad-control, mtl, network
+     , network-uri, old-locale, parsec, process, sendfile, syb
+     , system-filepath, template-haskell, text, threads, time
+     , time-compat, transformers, transformers-base, transformers-compat
+     , unix, utf8-string, xhtml, zlib
+     }:
+     mkDerivation {
+       pname = "happstack-server";
+       version = "7.4.6";
+       sha256 = "8647b5f59de1b8c4d9788fff164ef6584e0f07b53bdcad06642e551eb357565c";
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-html bytestring containers directory
+         exceptions extensible-exceptions filepath hslogger html
+         monad-control mtl network network-uri old-locale parsec process
+         sendfile syb system-filepath template-haskell text threads time
+         time-compat transformers transformers-base transformers-compat unix
+         utf8-string xhtml zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers HUnit parsec zlib
+       ];
+       homepage = "http://happstack.com";
+       description = "Web related tools and services";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "happstack-server-tls" = callPackage
@@ -92475,12 +93553,13 @@ self: {
      }) {};
 
   "haskell-bcrypt" = callPackage
-    ({ mkDerivation, base, bytestring }:
+    ({ mkDerivation, base, bytestring, QuickCheck, random }:
      mkDerivation {
        pname = "haskell-bcrypt";
-       version = "0.3.1";
-       sha256 = "ed281ee8520e24b7d0a818494d48ab1c57e8b06d47a76207e058805aefcd0cf1";
+       version = "0.3.2";
+       sha256 = "427c3f95a0b9e3bd53a8d4b17b5f44bf3656ae1d5cfa93e48f2be85e6ea48a5a";
        libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring QuickCheck random ];
        homepage = "http://www.github.com/zbskii/haskell-bcrypt";
        description = "A bcrypt implementation for haskell";
        license = stdenv.lib.licenses.mit;
@@ -92695,8 +93774,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi";
-       version = "0.11";
-       sha256 = "b3843bc0375160280a24bf4f55b9d2c5a581dd3639e7fe7fa6c846831c04ef2b";
+       version = "0.12";
+       sha256 = "6d9f041a551dec6d557fa51a59fb7cbb01abbda82f5768146a9fd9b1b954b154";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -92705,7 +93784,6 @@ self: {
          xdg-basedir xml-conduit
        ];
        executablePkgconfigDepends = [ glib gobjectIntrospection ];
-       jailbreak = true;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
@@ -92717,8 +93795,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.11";
-       sha256 = "b25c07cb1c4d40a4a2bedd38d0a91633f360dde4ab4b34c7011a281f79a7f880";
+       version = "0.12";
+       sha256 = "3f6fc64b2c878ebc1856f917fccb18dd6c990bd115019b851c96f121442ec8f7";
        libraryHaskellDepends = [
          base bytestring containers text transformers
        ];
@@ -92787,6 +93865,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-mpfr" = callPackage
+    ({ mkDerivation, base, ghc-prim, integer-gmp }:
+     mkDerivation {
+       pname = "haskell-mpfr";
+       version = "0.1";
+       sha256 = "9bd1ddbdff533479d69fb5a94a018aea93a5578c2be70446595f87f6b41172ad";
+       libraryHaskellDepends = [ base ghc-prim integer-gmp ];
+       jailbreak = true;
+       homepage = "http://github.com/comius/haskell-mpfr";
+       description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
+       license = "LGPL";
+     }) {};
+
   "haskell-mpi" = callPackage
     ({ mkDerivation, array, base, bytestring, c2hs, cereal
      , extensible-exceptions, open-pal, open-rte, openmpi
@@ -94529,8 +95620,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskore";
-       version = "0.2.0.7";
-       sha256 = "5ebbd8bf1d5164a67c12d7f42e6c2cc4f3a0ea996fd5644651c0ea5f6e579a92";
+       version = "0.2.0.8";
+       sha256 = "b4ac45e260e8ae417347985cc84062b684e59cc3519d18e765fa2d35f7c3d429";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -94987,7 +96078,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hasql" = callPackage
+  "hasql_0_19_3_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
      , contravariant, contravariant-extras, data-default-class, dlist
      , either, hashable, hashtables, loch-th, mtl, placeholders
@@ -95017,9 +96108,10 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "A very efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hasql_0_19_4" = callPackage
+  "hasql" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
      , contravariant, contravariant-extras, data-default-class, dlist
      , either, hashable, hashtables, loch-th, mtl, placeholders
@@ -95030,8 +96122,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "0.19.4";
-       sha256 = "392d4fd66779940d072356621037bb75be2383ec2d1e781cf18e9dafa06764ae";
+       version = "0.19.6";
+       sha256 = "88f1fe05e48640d133317513c270667c9e745eb9d71d94a9db582ee71b59934c";
        libraryHaskellDepends = [
          aeson attoparsec base base-prelude bytestring contravariant
          contravariant-extras data-default-class dlist either hashable
@@ -95045,10 +96137,10 @@ self: {
          quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text time transformers uuid vector
        ];
+       doCheck = false;
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "A very efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-backend_0_2_1" = callPackage
@@ -95170,8 +96262,8 @@ self: {
     ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
      mkDerivation {
        pname = "hasql-pool";
-       version = "0.3";
-       sha256 = "7afb74396758b9df4e5a5c0b2d63de1253e7717011eaea6269f9740423f18428";
+       version = "0.4";
+       sha256 = "6bb18b7f41a471e0260a60ecd0a4495ccef111e3151d0b3e55ae5e3865c3850e";
        libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
        homepage = "https://github.com/nikita-volkov/hasql-pool";
        description = "A pool of connections for Hasql";
@@ -95649,8 +96741,8 @@ self: {
      }:
      mkDerivation {
        pname = "haste-compiler";
-       version = "0.5.3";
-       sha256 = "20e955b97d731aafc404bb1560d47050944530c655acd7eb80e1d4a8468dfcc7";
+       version = "0.5.4";
+       sha256 = "4018bf4abf3ece8ee577ae5983cac0b016ae96098c704aeecd9698365c3a021e";
        configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
@@ -96292,10 +97384,13 @@ self: {
        pname = "hblock";
        version = "0.1.0.2";
        sha256 = "7bf0dc5ef70b033464462e741d5cb8c5b1f6c91436dee178bd4c8e1c0591103d";
+       revision = "1";
+       editedCabalFile = "0182ceac5536afe15ee507e30953ff97f890facf3f15f2766f74f6312036eca6";
        libraryHaskellDepends = [
          aeson base blaze-markup bytestring cereal containers deepseq
          hashable path-pieces safecopy text unordered-containers uuid vector
        ];
+       jailbreak = true;
        description = "A mutable vector that provides indexation on the datatype fields it stores";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96466,6 +97561,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hcoap" = callPackage
+    ({ mkDerivation, async, base, binary, bytestring, HUnit, mtl
+     , network, QuickCheck, random, stm, time
+     }:
+     mkDerivation {
+       pname = "hcoap";
+       version = "0.1.0.2";
+       sha256 = "71a2ecfde4fc2a17d116d5cfacd6868b6abe7ae851b834710173dc6e449952a2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base binary bytestring mtl network random stm time
+       ];
+       executableHaskellDepends = [ base bytestring network ];
+       testHaskellDepends = [
+         base bytestring HUnit network QuickCheck random
+       ];
+       homepage = "https://github.com/lulf/hcoap";
+       description = "CoAP implementation for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hcron" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, mtl
      , old-locale, pretty, process, random, stm, time
@@ -100266,6 +101383,8 @@ self: {
        pname = "hjsmin";
        version = "0.1.4.7";
        sha256 = "0e157fa21ad14996e9b416f78c4af595459064dc63a3cbb3ed38e3788d8e89bf";
+       revision = "1";
+       editedCabalFile = "8b24f51f4fa13d3837421f03ef731625bde85e0e2913bc43377098d44d9c2521";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100295,6 +101414,8 @@ self: {
        pname = "hjsmin";
        version = "0.1.4.8";
        sha256 = "439f3524795e34b9999818155d2d3de0fe00ec856b3f57cb20d2e22d3e220188";
+       revision = "1";
+       editedCabalFile = "626a6e3677688c88a40f61f25025b67382c28826b908e55e4f98b9be1681c061";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100324,6 +101445,8 @@ self: {
        pname = "hjsmin";
        version = "0.1.5.0";
        sha256 = "f4d81fd8a1cbe65642ff749aeb5866ed9487613a54d7efe6566805fe3f3bf1d7";
+       revision = "1";
+       editedCabalFile = "3f4d4ae3a1f8b219a975059ebe9957e45f260ed1e6802d886ad3f5ddc931c684";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100344,7 +101467,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hjsmin" = callPackage
+  "hjsmin_0_1_5_1" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , HUnit, language-javascript, optparse-applicative, QuickCheck
      , test-framework, test-framework-hunit, text
@@ -100353,6 +101476,37 @@ self: {
        pname = "hjsmin";
        version = "0.1.5.1";
        sha256 = "d1e36c8fe5dfd46819425877ca7fc6a5b422fce138de9787b7409850252decff";
+       revision = "1";
+       editedCabalFile = "84b6550796b29b1ee7bec20c47223fe3e2e0c57abc52bc2565b2ac6e7e929351";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers language-javascript text
+       ];
+       executableHaskellDepends = [
+         base blaze-builder bytestring containers language-javascript
+         optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring Cabal containers HUnit
+         language-javascript QuickCheck test-framework test-framework-hunit
+         text
+       ];
+       homepage = "http://github.com/erikd/hjsmin";
+       description = "Haskell implementation of a javascript minifier";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hjsmin" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+     , HUnit, language-javascript, optparse-applicative, QuickCheck
+     , test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "hjsmin";
+       version = "0.1.5.2";
+       sha256 = "c2d04fe6b1f45d88d6b2e382b0fdf648a18b0cd913c2688af7ab77d7c27dd330";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100523,6 +101677,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hleap" = callPackage
+    ({ mkDerivation, aeson, base, containers, data-default, mtl, text
+     , unordered-containers, websockets
+     }:
+     mkDerivation {
+       pname = "hleap";
+       version = "0.1.2.6";
+       sha256 = "5a0612ff7a1f111ced1cff7b039b33d74909acede53053d702c0311abfd4389b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers data-default mtl text unordered-containers
+         websockets
+       ];
+       executableHaskellDepends = [
+         aeson base containers data-default mtl text unordered-containers
+         websockets
+       ];
+       jailbreak = true;
+       homepage = "https://bitbucket.org/bwbush/hleap";
+       description = "Web Socket interface to Leap Motion controller";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hledger_0_23_3" = callPackage
     ({ mkDerivation, base, cmdargs, containers, csv, directory
      , filepath, haskeline, hledger-lib, HUnit, mtl, old-locale
@@ -101373,7 +102551,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hlint" = callPackage
+  "hlint_1_9_26" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
      , directory, extra, filepath, haskell-src-exts, hscolour, process
      , refact, transformers, uniplate
@@ -101393,6 +102571,29 @@ self: {
        homepage = "https://github.com/ndmitchell/hlint#readme";
        description = "Source code suggestions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hlint" = callPackage
+    ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
+     , directory, extra, filepath, haskell-src-exts, hscolour, process
+     , refact, transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "hlint";
+       version = "1.9.28";
+       sha256 = "eb06658a19c362a1f522dc495a6d5e5a90af68cefbcc178713aa8ee0a4c7f710";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base cmdargs containers cpphs directory extra
+         filepath haskell-src-exts hscolour process refact transformers
+         uniplate
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/ndmitchell/hlint#readme";
+       description = "Source code suggestions";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hlogger" = callPackage
@@ -104994,7 +106195,7 @@ self: {
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {b2 = null;};
+     }) {inherit (pkgs) b2;};
 
   "hs-captcha" = callPackage
     ({ mkDerivation, base, bytestring, gd, random }:
@@ -106333,8 +107534,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.5.4";
-       sha256 = "77f92b6fbcf70904e51c843262ab2b40d3cd2b463d57f8583463b4414e3c42b1";
+       version = "0.1.6.0";
+       sha256 = "93a1bd6462f45d9abf39cba0479f519f562c62d4bc30a3df3153314b7d300345";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106357,7 +107558,6 @@ self: {
          aeson aeson-lens async base containers data-default deepseq hformat
          hspec lens mtl text
        ];
-       jailbreak = true;
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc";
        license = stdenv.lib.licenses.bsd3;
@@ -111253,7 +112453,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "http-media" = callPackage
+  "http-media_0_6_2" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , QuickCheck, test-framework, test-framework-quickcheck2
      }:
@@ -111272,6 +112472,28 @@ self: {
        homepage = "https://github.com/zmthy/http-media";
        description = "Processing HTTP Content-Type and Accept headers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "http-media" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , QuickCheck, test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "http-media";
+       version = "0.6.3";
+       sha256 = "38ac24e33a2ef0fdeb9f1c3311aa1efb4902701888fd4a590c1912aaa9b1dad6";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive containers QuickCheck
+         test-framework test-framework-quickcheck2
+       ];
+       doCheck = false;
+       homepage = "https://github.com/zmthy/http-media";
+       description = "Processing HTTP Content-Type and Accept headers";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "http-monad" = callPackage
@@ -113683,7 +114905,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zookeeper_mt;};
 
-  "hzulip" = callPackage
+  "hzulip_1_1_1_2" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, conduit
      , exceptions, hspec, http-client, http-client-tls, http-types, lens
      , lens-aeson, mtl, raw-strings-qq, scotty, stm, stm-conduit, text
@@ -113703,12 +114925,14 @@ self: {
          http-client-tls http-types lens lens-aeson mtl raw-strings-qq
          scotty stm stm-conduit text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/yamadapc/hzulip";
        description = "A haskell wrapper for the Zulip API";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hzulip_1_1_1_3" = callPackage
+  "hzulip" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, conduit
      , exceptions, hspec, http-client, http-client-tls, http-types, lens
      , lens-aeson, mtl, raw-strings-qq, scotty, stm, stm-conduit, text
@@ -113731,7 +114955,6 @@ self: {
        homepage = "https://github.com/yamadapc/hzulip";
        description = "A haskell wrapper for the Zulip API";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "i18n" = callPackage
@@ -115655,6 +116878,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "impossible" = callPackage
+    ({ mkDerivation, base, lens }:
+     mkDerivation {
+       pname = "impossible";
+       version = "1.0.0";
+       sha256 = "7f4f8d20bea5ee0c125218276d6e252d85c748808fc7f8ec5d6990aa84e277e2";
+       libraryHaskellDepends = [ base lens ];
+       homepage = "https://github.com/wdanilo/impossible";
+       description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable.";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "improve" = callPackage
     ({ mkDerivation, base, mtl, yices }:
      mkDerivation {
@@ -115719,6 +116954,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "include-file_0_1_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, random, template-haskell }:
+     mkDerivation {
+       pname = "include-file";
+       version = "0.1.0.3";
+       sha256 = "208f1f3bdc717f5f953cb7c9935c84d6a6291b7cd5ed8a22fa8567184be33d29";
+       libraryHaskellDepends = [
+         base bytestring random template-haskell
+       ];
+       testHaskellDepends = [ base bytestring ];
+       description = "Inclusion of files in executables at compile-time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "incremental-computing" = callPackage
     ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers
      , dlist, fingertree, order-maintenance, QuickCheck, transformers
@@ -116924,8 +118174,11 @@ self: {
        pname = "intervals";
        version = "0.7.0.1";
        sha256 = "e92a527f8f23b7262f58102b9d3975220f926e73c3f7e866f5da79a11e210b0b";
+       revision = "1";
+       editedCabalFile = "ff335c7921df2f341b02893cf5aa3118ca96d3b3650d39f20467838a5931d44b";
        libraryHaskellDepends = [ array base distributive ghc-prim ];
        testHaskellDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/intervals";
        description = "Interval Arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -117063,6 +118316,8 @@ self: {
        pname = "invariant";
        version = "0.3";
        sha256 = "c45b9a150b3b48b22ec41964481bbe85567b3eab0ae15b784dd75b9a666a7a00";
+       revision = "1";
+       editedCabalFile = "560be9fd410c36d98bd6d1203a9916bf321d26d1b7c2b5ba259b30215245cd6f";
        libraryHaskellDepends = [
          array base bifunctors containers contravariant ghc-prim profunctors
          semigroups StateVar stm tagged template-haskell transformers
@@ -117074,6 +118329,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "invariant_0_3_1" = callPackage
+    ({ mkDerivation, array, base, bifunctors, containers, contravariant
+     , ghc-prim, hspec, profunctors, QuickCheck, semigroups, StateVar
+     , stm, tagged, template-haskell, transformers, transformers-compat
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "invariant";
+       version = "0.3.1";
+       sha256 = "db88ce3955ba99cec99dd1da2d917ce26c204837a6779712dd55f79cc873fdff";
+       libraryHaskellDepends = [
+         array base bifunctors containers contravariant ghc-prim profunctors
+         semigroups StateVar stm tagged template-haskell transformers
+         transformers-compat unordered-containers
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/nfrisby/invariant-functors";
+       description = "Haskell 98 invariant functors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "invertible-syntax" = callPackage
     ({ mkDerivation, base, partial-isomorphisms }:
      mkDerivation {
@@ -119588,8 +120865,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-ast";
-       version = "0.1";
-       sha256 = "8f66d6a977794f21cc5a9af8551ed237ff57677b5777f269a1cebd8e05a3141f";
+       version = "0.2";
+       sha256 = "595ed692fa82dc6e178d368a6a247eb19f96f643ce030b8c178ec7d54b0a4b5c";
        libraryHaskellDepends = [
          base scientific text unordered-containers vector
        ];
@@ -119598,6 +120875,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "json-ast-quickcheck" = callPackage
+    ({ mkDerivation, base, json-ast, QuickCheck, quickcheck-instances
+     }:
+     mkDerivation {
+       pname = "json-ast-quickcheck";
+       version = "0.2";
+       sha256 = "41a6cab47756614727427311c08326ae960d7b88c21a5c9c5910f29a66e6cd04";
+       libraryHaskellDepends = [
+         base json-ast QuickCheck quickcheck-instances
+       ];
+       homepage = "https://github.com/nikita-volkov/json-ast-quickcheck";
+       description = "Compatibility layer for \"json-ast\" and \"QuickCheck\"";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "json-autotype_0_2_5_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, filepath
      , GenericPretty, hashable, hflags, lens, mtl, pretty, process
@@ -119848,20 +121140,19 @@ self: {
      }) {};
 
   "json-encoder" = callPackage
-    ({ mkDerivation, base, base-prelude, bytestring
-     , bytestring-tree-builder, contravariant, contravariant-extras
-     , scientific, text
+    ({ mkDerivation, base-prelude, bytestring, bytestring-tree-builder
+     , contravariant, contravariant-extras, scientific, semigroups, text
      }:
      mkDerivation {
        pname = "json-encoder";
-       version = "0.1.3.1";
-       sha256 = "0127462ef932a643adc948bbb1de89de78d705a464c2591aedafddcd8382fadc";
+       version = "0.1.5";
+       sha256 = "bd71014bca5df3be295bfd851eb39d4c30bc38acaa7fd277f6cb6d8ac60c9bd4";
        libraryHaskellDepends = [
-         base base-prelude bytestring bytestring-tree-builder contravariant
-         contravariant-extras scientific text
+         base-prelude bytestring bytestring-tree-builder contravariant
+         contravariant-extras scientific semigroups text
        ];
        homepage = "https://github.com/sannsyn/json-encoder";
-       description = "A very fast single-pass JSON encoder with a declarative DSL";
+       description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -119939,6 +121230,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-pointer" = callPackage
+    ({ mkDerivation, attoparsec, base-prelude, text }:
+     mkDerivation {
+       pname = "json-pointer";
+       version = "0.1";
+       sha256 = "2ed39be2da3f9f552fd0897028230236ca82c302c23c087d528b52550bba23c4";
+       libraryHaskellDepends = [ attoparsec base-prelude text ];
+       homepage = "https://github.com/sannsyn/json-pointer";
+       description = "JSON Pointer parsing and interpretation utilities";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "json-pointer-hasql" = callPackage
+    ({ mkDerivation, aeson, base-prelude, either, hasql, json-pointer
+     , rebase, text, transformers
+     }:
+     mkDerivation {
+       pname = "json-pointer-hasql";
+       version = "0.1";
+       sha256 = "5ed9ae42aadc1fde554480f055df77f751e5eb1c5386d0ed71883dfe9d534a8a";
+       libraryHaskellDepends = [ base-prelude hasql json-pointer text ];
+       testHaskellDepends = [
+         aeson either hasql json-pointer rebase transformers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/sannsyn/json-pointer-hasql";
+       description = "JSON Pointer extensions for Hasql";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "json-python" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, pureMD5
      , python, template-haskell
@@ -120274,6 +121595,7 @@ self: {
          aeson aeson-utils attoparsec base bytestring generic-aeson tasty
          tasty-hunit tasty-th text vector
        ];
+       jailbreak = true;
        description = "Types and type classes for defining JSON schemas";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120289,8 +121611,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96";
-       revision = "1";
-       editedCabalFile = "4d1dfd0f92e4a804930e202d9e8078d63dcfec2b002d1e863cbc95f648e004e0";
+       revision = "2";
+       editedCabalFile = "34b4f2ea278bbcb6cd0e6ed8e6d5f0e97f71c6885bc72914d3f47a372cf07d3b";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -120325,10 +121647,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-state";
-       version = "0.1.0.0";
-       sha256 = "852fe9fd9fb43c281faff5a33854639bf34daee81cf9ce76bb14192bbefc29db";
-       revision = "1";
-       editedCabalFile = "8cc980c70a4afc20585413ec8894673f768b80911ec864386ef8c6c3c0d7505a";
+       version = "0.1.0.1";
+       sha256 = "f10aa7fcf498ed25d6b90a616f0749d8089169e678116a01c3052780579d64f7";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring libgit time-units
        ];
@@ -120604,26 +121924,22 @@ self: {
      }) {Judy = null;};
 
   "jukebox" = callPackage
-    ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , directory, filepath, hashable, minisat, mtl, pretty, process
-     , unordered-containers
+    ({ mkDerivation, alex, array, base, containers, directory, dlist
+     , filepath, minisat, pretty, process, symbol, transformers
+     , uglymemo
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.1.6";
-       sha256 = "1bde5dd2fadd0b598c11657199ee90bfe8f822807a394857ef902d2d8fec366a";
+       version = "0.2.2";
+       sha256 = "efbaefbbe3a6b66aea18885faf8ddfc3c84ce58ebbd507aebefd36336f278a4f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base binary bytestring containers directory filepath hashable
-         minisat mtl pretty process unordered-containers
+         array base containers directory dlist filepath minisat pretty
+         process symbol transformers uglymemo
        ];
        libraryToolDepends = [ alex ];
-       executableHaskellDepends = [
-         array base binary bytestring containers directory filepath hashable
-         minisat mtl pretty process unordered-containers
-       ];
-       executableToolDepends = [ alex ];
+       executableHaskellDepends = [ base ];
        description = "A first-order reasoning toolbox";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -120893,8 +122209,8 @@ self: {
        pname = "kansas-comet";
        version = "0.4";
        sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1";
-       revision = "1";
-       editedCabalFile = "6f3238173ad5a0fbdd82c2b73e96b4c43f17fa45f76f7249e6e925ed7eef9a97";
+       revision = "2";
+       editedCabalFile = "7130c2d96d36883b648d583fda40b74b7880f217213dd11827eef86caf7bc927";
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
          transformers unordered-containers
@@ -121042,6 +122358,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "kazura-queue" = callPackage
+    ({ mkDerivation, async, atomic-primops, base, containers, deepseq
+     , doctest, exceptions, free, hspec, hspec-expectations, HUnit, mtl
+     , primitive, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "kazura-queue";
+       version = "0.1.0.2";
+       sha256 = "0ed0544bdfea6364acabaebb8e07ba36ee98dcf9c6afca4241e8f87613dddc7b";
+       libraryHaskellDepends = [
+         async atomic-primops base containers primitive
+       ];
+       testHaskellDepends = [
+         async base containers deepseq doctest exceptions free hspec
+         hspec-expectations HUnit mtl QuickCheck transformers
+       ];
+       homepage = "http://github.com/asakamirai/kazura-queue";
+       description = "Fast concurrent queues much inspired by unagi-chan";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "kbq-gu" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -123105,6 +124442,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lambdacube-compiler" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , deepseq, directory, exceptions, filepath, indentation
+     , lambdacube-ir, monad-control, mtl, optparse-applicative, parsec
+     , pretty-compact, QuickCheck, tasty, tasty-quickcheck, text, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "lambdacube-compiler";
+       version = "0.4.0.0";
+       sha256 = "745a5593e7a8bf9af194c747a62ad32e16076156841863093b6aefb032b5ac74";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers deepseq directory exceptions filepath
+         indentation lambdacube-ir mtl parsec pretty-compact text vector
+       ];
+       executableHaskellDepends = [
+         aeson async base bytestring containers deepseq directory exceptions
+         filepath indentation lambdacube-ir monad-control mtl
+         optparse-applicative parsec pretty-compact QuickCheck tasty
+         tasty-quickcheck text time vector
+       ];
+       jailbreak = true;
+       homepage = "http://lambdacube3d.com";
+       description = "LambdaCube 3D is a DSL to program GPUs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lambdacube-core" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-trie, containers, mtl
      , vector
@@ -123179,26 +124545,34 @@ self: {
      }) {};
 
   "lambdacube-gl" = callPackage
-    ({ mkDerivation, base, binary, bitmap, bytestring, bytestring-trie
-     , containers, lambdacube-core, lambdacube-edsl, language-glsl, mtl
-     , OpenGLRaw, prettyclass, vector
+    ({ mkDerivation, base, bytestring, containers, JuicyPixels
+     , lambdacube-ir, mtl, OpenGLRaw, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "lambdacube-gl";
-       version = "0.2.2";
-       sha256 = "bee622839c09a05fdab01fb88c15680eb0cc0feda1a580ddb81fa2cbbefa1d28";
+       version = "0.4.0.2";
+       sha256 = "f9ebec4a981381ffa9f998a636c0aba3f4425b4fb2ae06650ff24e9109328174";
        libraryHaskellDepends = [
-         base binary bitmap bytestring bytestring-trie containers
-         lambdacube-core lambdacube-edsl language-glsl mtl OpenGLRaw
-         prettyclass vector
+         base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
+         vector vector-algorithms
        ];
-       jailbreak = true;
-       homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
-       description = "OpenGL backend for LambdaCube graphics language (main package)";
+       homepage = "http://lambdacube3d.com";
+       description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lambdacube-ir" = callPackage
+    ({ mkDerivation, aeson, base, containers, mtl, text, vector }:
+     mkDerivation {
+       pname = "lambdacube-ir";
+       version = "0.2.0.0";
+       sha256 = "488cbb21a8dca80c16552d3aca868d5aa7085b7bfa2e9ea7c92965bd1e288c48";
+       libraryHaskellDepends = [ aeson base containers mtl text vector ];
+       description = "LambdaCube 3D intermediate representation of 3D graphics pipelines";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lambdacube-samples" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-trie, elerea, GLFW-b
      , lambdacube-core, lambdacube-edsl, lambdacube-gl, mtl, OpenGLRaw
@@ -123781,7 +125155,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-ecmascript" = callPackage
+  "language-ecmascript_0_17_0_1" = callPackage
     ({ mkDerivation, base, containers, data-default-class, Diff
      , directory, filepath, HUnit, mtl, parsec, QuickCheck
      , template-haskell, test-framework, test-framework-hunit
@@ -123805,6 +125179,32 @@ self: {
        homepage = "http://github.com/jswebtools/language-ecmascript";
        description = "JavaScript parser and pretty-printer library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "language-ecmascript" = callPackage
+    ({ mkDerivation, base, containers, data-default-class, Diff
+     , directory, filepath, HUnit, mtl, parsec, QuickCheck
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, testing-feat, uniplate, wl-pprint
+     }:
+     mkDerivation {
+       pname = "language-ecmascript";
+       version = "0.17.0.2";
+       sha256 = "97412d2cf4b5a61de49548b22e4271fe20cba6746a2dc58dcc55c82c56591059";
+       libraryHaskellDepends = [
+         base containers data-default-class Diff mtl parsec QuickCheck
+         template-haskell testing-feat uniplate wl-pprint
+       ];
+       testHaskellDepends = [
+         base containers data-default-class Diff directory filepath HUnit
+         mtl parsec QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 uniplate wl-pprint
+       ];
+       doCheck = false;
+       homepage = "http://github.com/jswebtools/language-ecmascript";
+       description = "JavaScript parser and pretty-printer library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "language-ecmascript-analysis" = callPackage
@@ -123813,8 +125213,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ecmascript-analysis";
-       version = "0.9.1";
-       sha256 = "36f95a57347dfaa7d1b05a80469ba5be031870b1ea1c2694a61d124d791cec13";
+       version = "0.9.2";
+       sha256 = "afb477f63477edd7cd21c817dc2e7f7addede510eff60df07d76daeddf8ba691";
        libraryHaskellDepends = [
          base containers language-ecmascript parsec uniplate
        ];
@@ -124290,40 +125690,40 @@ self: {
 
   "language-puppet" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base16-bytestring, bifunctors, bytestring, case-insensitive
-     , containers, cryptonite, Diff, directory, either, exceptions
-     , filecache, formatting, Glob, hashable, hruby, hslogger, hslua
-     , hspec, HUnit, lens, lens-aeson, megaparsec, memory, mtl
-     , operational, optparse-applicative, parallel-io, parsec, parsers
-     , pcre-utils, process, random, regex-pcre-builtin, scientific
-     , semigroups, servant, servant-client, split, stm
-     , strict-base-types, temporary, text, time, transformers, unix
-     , unordered-containers, vector, yaml
+     , base16-bytestring, bytestring, case-insensitive, containers
+     , cryptonite, directory, either, exceptions, filecache, formatting
+     , Glob, hashable, hruby, hslogger, hslua, hspec, HUnit, lens
+     , lens-aeson, megaparsec, memory, mtl, operational
+     , optparse-applicative, parallel-io, parsec, pcre-utils, process
+     , random, regex-pcre-builtin, scientific, semigroups, servant
+     , servant-client, split, stm, strict-base-types, temporary, text
+     , time, transformers, unix, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.1.4.1";
-       sha256 = "9081e2da9a4d046d034d59cc277bfb1bbf16b1fd6f925aef6d44674228423c97";
+       version = "1.1.5";
+       sha256 = "1448e6a601ccf3468b856c6c53e0ba1e0b3d7df91da26e727e80ee203189fccc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base16-bytestring bifunctors
-         bytestring case-insensitive containers cryptonite directory either
-         exceptions filecache formatting hashable hruby hslogger hslua lens
-         lens-aeson megaparsec memory mtl operational parsec parsers
-         pcre-utils process random regex-pcre-builtin scientific semigroups
-         servant servant-client split stm strict-base-types text time
-         transformers unix unordered-containers vector yaml
+         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
+         case-insensitive containers cryptonite directory either exceptions
+         filecache formatting hashable hruby hslogger hslua hspec lens
+         lens-aeson megaparsec memory mtl operational parsec pcre-utils
+         process random regex-pcre-builtin scientific semigroups servant
+         servant-client split stm strict-base-types text time transformers
+         unix unordered-containers vector yaml
        ];
        executableHaskellDepends = [
-         aeson ansi-wl-pprint base bytestring containers Diff either Glob
-         hslogger hspec lens megaparsec mtl optparse-applicative parallel-io
-         regex-pcre-builtin servant-client strict-base-types text
-         unordered-containers vector yaml
+         aeson base bytestring containers either Glob hslogger lens
+         megaparsec optparse-applicative parallel-io regex-pcre-builtin
+         servant-client strict-base-types text unordered-containers vector
+         yaml
        ];
        testHaskellDepends = [
          ansi-wl-pprint base either Glob hspec HUnit lens megaparsec
-         strict-base-types temporary text unix unordered-containers vector
+         scientific strict-base-types temporary text unix
+         unordered-containers vector
        ];
        jailbreak = true;
        homepage = "http://lpuppet.banquise.net/";
@@ -125527,6 +126927,7 @@ self: {
          test-framework-quickcheck2 test-framework-th text transformers
          unordered-containers vector
        ];
+       doCheck = false;
        homepage = "http://github.com/ekmett/lens/";
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd3;
@@ -125547,6 +126948,8 @@ self: {
        pname = "lens";
        version = "4.13.1";
        sha256 = "987137d11f189e08ceeb0e2e5c047c1456ad666642974067d2d8e11309ef6b7b";
+       revision = "1";
+       editedCabalFile = "35b2594d3e37b4294c2a9dd3e7620af7a27ce10044631a2f91611cdaf66a55f9";
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
@@ -125750,6 +127153,8 @@ self: {
        pname = "lens-family-th";
        version = "0.4.0.0";
        sha256 = "a52e7e99bb0e324ca9dc09f441db98443ad7d9af227221a461c29f75ef1ccc09";
+       revision = "1";
+       editedCabalFile = "b2236e693bf705ef944458bc08e449b6e62da03c9370cee79858a3df01ef78dd";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/DanBurton/lens-family-th#readme";
        description = "Generate lens-family style lenses";
@@ -125763,8 +127168,8 @@ self: {
        pname = "lens-family-th";
        version = "0.4.1.0";
        sha256 = "754fdc4c7c292b160a87974ec3690b755fb93f3877c8080d331cfa6ec4b39e20";
-       revision = "1";
-       editedCabalFile = "13c96ddf2d410ec4e6671c8412710b7cdbbfc837ff5be1d09a6dbb9ecdb9285d";
+       revision = "2";
+       editedCabalFile = "978c149edc250ed1c91c03be304b752415e93ab5eb76aacb194bbe94135c356a";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/DanBurton/lens-family-th#readme";
        description = "Generate lens-family style lenses";
@@ -125909,8 +127314,8 @@ self: {
     ({ mkDerivation, base, lens }:
      mkDerivation {
        pname = "lens-utils";
-       version = "1.0";
-       sha256 = "478377492a910492589771f0fbcbff25a7890a24672f1134005ff3893ae56b6f";
+       version = "1.2";
+       sha256 = "2baa0afaf1cfd406335b940c9fc375ab5bbd0bb1f26fb8eca613b901e04d59fb";
        libraryHaskellDepends = [ base lens ];
        homepage = "https://github.com/wdanilo/lens-utils";
        description = "Collection of missing lens utilities";
@@ -126951,6 +128356,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lift-generics_0_1_1" = callPackage
+    ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim
+     , hspec, template-haskell
+     }:
+     mkDerivation {
+       pname = "lift-generics";
+       version = "0.1.1";
+       sha256 = "07cf2cc4416fb7b0e45595da8a964459498da976e18cdcc169ac2416143930cb";
+       libraryHaskellDepends = [
+         base generic-deriving ghc-prim template-haskell
+       ];
+       testHaskellDepends = [
+         base base-compat generic-deriving hspec template-haskell
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/RyanGlScott/lift-generics";
+       description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lifted-async_0_2_0_2" = callPackage
     ({ mkDerivation, async, base, HUnit, lifted-base, monad-control
      , mtl, tasty, tasty-hunit, tasty-th, transformers-base
@@ -128935,8 +130361,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-general";
-       version = "3.5.1.0";
-       sha256 = "7c6a6634abeb541c1fea59b34743dfb37b71f92359b0d481e50f962486f99da4";
+       version = "3.5.1.1";
+       sha256 = "e1f636b445b5a161750273d11a4a70ac1263c237dd47b1b347c6150fdfd29733";
        libraryHaskellDepends = [
          array base bytestring containers llvm-general-pure mtl parsec
          setenv template-haskell transformers transformers-compat
@@ -128948,6 +130374,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          transformers transformers-compat
        ];
+       homepage = "http://github.com/bscarlet/llvm-general/";
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {llvm-config = null;};
@@ -129680,13 +131107,12 @@ self: {
      }:
      mkDerivation {
        pname = "logging-effect";
-       version = "1.0.0";
-       sha256 = "9c7deabf027c2e7bfc800b26f103b259e25ee9ef814ce53260df3950aa682e8f";
+       version = "1.0.1";
+       sha256 = "8a27b42451dbcda3faba5db20c275061f8133441b09b0138ac36037ff0108af1";
        libraryHaskellDepends = [
          async base exceptions free monad-control mtl stm stm-delay text
          time transformers transformers-base wl-pprint-text
        ];
-       jailbreak = true;
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
@@ -132474,15 +133900,21 @@ self: {
      }) {};
 
   "mappy" = callPackage
-    ({ mkDerivation, base, containers, hspec, parsec, QuickCheck }:
+    ({ mkDerivation, ansi-terminal, base, containers, directory
+     , haskeline, hspec, parsec, QuickCheck
+     }:
      mkDerivation {
        pname = "mappy";
-       version = "0.1.0.2";
-       sha256 = "138923424b51cfa0008fa9224af8327f1455c097421c7ec4969a4689790230af";
+       version = "0.1.2.1";
+       sha256 = "54f6af643b2aeb6245ec92717a27dfca4e8b0b65442fef39cf09cd09b83268d8";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers parsec ];
-       executableHaskellDepends = [ base parsec ];
+       libraryHaskellDepends = [
+         ansi-terminal base containers directory haskeline parsec
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base directory haskeline parsec
+       ];
        testHaskellDepends = [ base containers hspec parsec QuickCheck ];
        homepage = "https://github.com/PolyglotSymposium/mappy";
        description = "A functional programming language focused around maps";
@@ -133502,6 +134934,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mdp" = callPackage
+    ({ mkDerivation, base, containers, HTF, HUnit, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "mdp";
+       version = "0.1.0.0";
+       sha256 = "816474886b59ab0f0cd5c4779f2702e9b7484fe94179a426894f561828f86711";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers vector ];
+       executableHaskellDepends = [ base containers vector ];
+       testHaskellDepends = [
+         base containers HTF HUnit QuickCheck vector
+       ];
+       description = "Tools for solving Markov Decision Processes";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mecab" = callPackage
     ({ mkDerivation, base, bytestring, mecab, text }:
      mkDerivation {
@@ -134175,11 +135625,10 @@ self: {
     ({ mkDerivation, base, text, time }:
      mkDerivation {
        pname = "metadata";
-       version = "0.2.0.0";
-       sha256 = "79d4b6be4c6b85c8e365565a1fda18a295fa2998d475b05cf1af7f04df3e0c91";
+       version = "0.4.2.0";
+       sha256 = "1b33c343e12766fb329345a2f687c4348bb8fc36792adc88e41b0510e6ed456a";
        libraryHaskellDepends = [ base text time ];
-       jailbreak = true;
-       homepage = "http://github.com/cutsea110/metadata";
+       homepage = "https://github.com/cutsea110/metadata";
        description = "metadata library for semantic web";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135735,7 +137184,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mmorph" = callPackage
+  "mmorph_1_0_5" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "mmorph";
@@ -135744,6 +137193,20 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Monad morphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mmorph" = callPackage
+    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
+     mkDerivation {
+       pname = "mmorph";
+       version = "1.0.6";
+       sha256 = "14c391b111af4cc10917a9340897ae2a5718f5b0b7e6bc13f379445c58fe0dc5";
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compat
+       ];
+       description = "Monad morphisms";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "mmtl" = callPackage
@@ -135861,7 +137324,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "modify-fasta" = callPackage
+  "modify-fasta_0_8_0_4" = callPackage
     ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
      , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text
      , text-show
@@ -135883,6 +137346,31 @@ self: {
        homepage = "https://github.com/GregorySchwartz/modify-fasta";
        description = "Modify fasta (and CLIP) files in several optional ways";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "modify-fasta" = callPackage
+    ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
+     , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text
+     , text-show
+     }:
+     mkDerivation {
+       pname = "modify-fasta";
+       version = "0.8.1.3";
+       sha256 = "362c99eb19428ed9d8f950ef5a8a377d4d9a4a8feaca229bf3aabb9ee0908585";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers fasta regex-tdfa regex-tdfa-text split text
+         text-show
+       ];
+       executableHaskellDepends = [
+         base containers fasta mtl optparse-applicative pipes pipes-text
+         split text
+       ];
+       homepage = "https://github.com/GregorySchwartz/modify-fasta";
+       description = "Modify fasta (and CLIP) files in several optional ways";
+       license = stdenv.lib.licenses.gpl2;
      }) {};
 
   "modsplit" = callPackage
@@ -136261,7 +137749,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-control" = callPackage
+  "monad-control_1_0_0_4" = callPackage
     ({ mkDerivation, base, stm, transformers, transformers-base
      , transformers-compat
      }:
@@ -136277,9 +137765,10 @@ self: {
        homepage = "https://github.com/basvandijk/monad-control";
        description = "Lift control operations, like exception catching, through monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-control_1_0_0_5" = callPackage
+  "monad-control" = callPackage
     ({ mkDerivation, base, stm, transformers, transformers-base
      , transformers-compat
      }:
@@ -136293,7 +137782,6 @@ self: {
        homepage = "https://github.com/basvandijk/monad-control";
        description = "Lift control operations, like exception catching, through monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-coroutine_0_8" = callPackage
@@ -136344,6 +137832,23 @@ self: {
        license = "GPL";
      }) {};
 
+  "monad-coroutine_0_9_0_2" = callPackage
+    ({ mkDerivation, base, monad-parallel, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-coroutine";
+       version = "0.9.0.2";
+       sha256 = "c648272e0578f8d590bdf834aaf2866ebe94474517c34d8e34b4c821469b4da4";
+       libraryHaskellDepends = [
+         base monad-parallel transformers transformers-compat
+       ];
+       homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine";
+       description = "Coroutine monad transformer for suspending and resuming monadic computations";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-exception" = callPackage
     ({ mkDerivation, base, monad-control, mtl-evil-instances
      , transformers, transformers-base
@@ -136727,7 +138232,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-logger" = callPackage
+  "monad-logger_0_3_17" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, conduit
      , conduit-extra, exceptions, fast-logger, lifted-base
      , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
@@ -136747,6 +138252,29 @@ self: {
        homepage = "https://github.com/kazu-yamamoto/logger";
        description = "A class of monads which can log messages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "monad-logger" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, conduit
+     , conduit-extra, exceptions, fast-logger, lifted-base
+     , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
+     , template-haskell, text, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-logger";
+       version = "0.3.18";
+       sha256 = "81497c19d08df93e6de5914f3adf0feecf4fcd9412e3004d2b19b4bfba05497e";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring conduit conduit-extra exceptions
+         fast-logger lifted-base monad-control monad-loops mtl resourcet stm
+         stm-chans template-haskell text transformers transformers-base
+         transformers-compat
+       ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "monad-logger-json" = callPackage
@@ -136989,6 +138517,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-parallel_0_7_2_1" = callPackage
+    ({ mkDerivation, base, parallel, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-parallel";
+       version = "0.7.2.1";
+       sha256 = "8bd8e90bcf9b71375bea031703551c09a51137c05377876dde2616e375782065";
+       libraryHaskellDepends = [
+         base parallel transformers transformers-compat
+       ];
+       homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
+       description = "Parallel execution of monadic computations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-parallel-progressbar" = callPackage
     ({ mkDerivation, base, monad-parallel, monadIO
      , terminal-progress-bar
@@ -138201,7 +139745,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monoid-subclasses" = callPackage
+  "monoid-subclasses_0_4_1_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, text, vector
      }:
@@ -138222,6 +139766,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "monoid-subclasses" = callPackage
+    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
+     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "monoid-subclasses";
+       version = "0.4.2";
+       sha256 = "38257132ebd3dca4d1d95252a928ca183171ae0ba3aefd133f3c564fa3bfee2b";
+       libraryHaskellDepends = [
+         base bytestring containers primes text vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers primes QuickCheck quickcheck-instances
+         tasty tasty-quickcheck text vector
+       ];
+       homepage = "https://github.com/blamario/monoid-subclasses/";
+       description = "Subclasses of Monoid";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoid-transformer" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -139207,6 +140772,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mulang" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, haskell-src, hspec }:
+     mkDerivation {
+       pname = "mulang";
+       version = "0.1.0.0";
+       sha256 = "5df2829d85ceb46086011c96ecaf396aa78d92dda293ba728d0ad8e3efcaaddf";
+       libraryHaskellDepends = [ aeson base bytestring haskell-src ];
+       testHaskellDepends = [ aeson base bytestring haskell-src hspec ];
+       jailbreak = true;
+       description = "The Mu Language, a non-computable extended Lambda Calculus";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "multext-east-msd" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -140783,18 +142361,22 @@ self: {
      }) {};
 
   "nanq" = callPackage
-    ({ mkDerivation, base, bytestring, containers, microlens, text }:
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , extensible-effects, microlens, microlens-aeson
+     , optparse-applicative, text
+     }:
      mkDerivation {
        pname = "nanq";
-       version = "1.1.1";
-       sha256 = "bdb90d5d32773f77401e89de6736ffb26d8c747a6eb3094c75629a9bc2386745";
+       version = "2.0.0";
+       sha256 = "6ff8ecc49b4d98c22fcde78f9895f60e2144efaf9c5323d4f2352fe94b43638c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers microlens text
        ];
        executableHaskellDepends = [
-         base bytestring containers microlens text
+         aeson aeson-pretty base bytestring containers extensible-effects
+         microlens microlens-aeson optparse-applicative text
        ];
        homepage = "https://github.com/fosskers/nanq";
        description = "Performs 漢字検定 (National Kanji Exam) level analysis on given Kanji";
@@ -141069,14 +142651,13 @@ self: {
      }:
      mkDerivation {
        pname = "nbt";
-       version = "0.5.1";
-       sha256 = "009bc5cd0834329c4944768b86d69ef4cf2b87507263eb4415adf34a6c262820";
+       version = "0.6";
+       sha256 = "4db207844f21a0073d6346613d61cf00b02a7da7c32ba501413c3b0624ed9651";
        libraryHaskellDepends = [ array base bytestring cereal text ];
        testHaskellDepends = [
          array base bytestring cereal HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text zlib
        ];
-       jailbreak = true;
        homepage = "https://github.com/acfoltzer/nbt";
        description = "A parser/serializer for Minecraft's Named Binary Tag (NBT) data format";
        license = stdenv.lib.licenses.bsd3;
@@ -143884,13 +145465,12 @@ self: {
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.6.2";
-       sha256 = "b9b467e85efe2c0a2270fb0ceb64debf88b7147e4b3b21dbc8332cb1cd2a496e";
+       version = "0.7.6.3";
+       sha256 = "8be10e835c2c6a3b55d52ae7f58ebb56eb2d71348c38f2a141eb61c21753108f";
        libraryHaskellDepends = [
          base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
          spatial-math time vector vector-binary-instances
        ];
-       jailbreak = true;
        description = "Painless 3D graphics, no affiliation with gloss";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144746,6 +146326,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "octane" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , data-binary-ieee754, deepseq, tasty, tasty-hspec, text
+     }:
+     mkDerivation {
+       pname = "octane";
+       version = "0.4.0";
+       sha256 = "577f5a867e6ae3eabf00a77661bba48f5386908734728fc91e24d01e9fdd83d0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 deepseq text
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base binary bytestring containers tasty tasty-hspec
+       ];
+       homepage = "https://github.com/tfausak/octane";
+       description = "A Rocket League replay parser";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "octohat" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , base64-bytestring, bytestring, containers, cryptohash, dotenv
@@ -148101,8 +149703,8 @@ self: {
     ({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
      mkDerivation {
        pname = "pandoc-csv2table";
-       version = "1.0.2";
-       sha256 = "0818e8b8e88e98b162a4fb7a9369cf3e54a2108f428d3a88b0217c7b58a6d961";
+       version = "1.0.4";
+       sha256 = "c1f14975239d5b26faba78f3db6c84573d4db99ab021560c184755259ca61b82";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
@@ -149463,7 +151065,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "path-io" = callPackage
+  "path-io_0_2_0" = callPackage
     ({ mkDerivation, base, directory, exceptions, filepath, path
      , temporary, time, transformers
      }:
@@ -149477,6 +151079,23 @@ self: {
        homepage = "https://github.com/mrkkrp/path-io";
        description = "Interface to ‘directory’ package for users of ‘path’";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "path-io" = callPackage
+    ({ mkDerivation, base, directory, exceptions, filepath, path
+     , temporary, time, transformers
+     }:
+     mkDerivation {
+       pname = "path-io";
+       version = "0.3.1";
+       sha256 = "b96763bd3a123a50341e003b2176a2fc72e93f8c9e717279cffe56fd824f693f";
+       libraryHaskellDepends = [
+         base directory exceptions filepath path temporary time transformers
+       ];
+       homepage = "https://github.com/mrkkrp/path-io";
+       description = "Interface to ‘directory’ package for users of ‘path’";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "path-pieces_0_1_4" = callPackage
@@ -150011,6 +151630,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pdf-toolbox-content_0_0_5_1" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
+     , containers, io-streams, pdf-toolbox-core, text
+     }:
+     mkDerivation {
+       pname = "pdf-toolbox-content";
+       version = "0.0.5.1";
+       sha256 = "1c104e232e178603ff9dd8c6eaaf0ccbda918c70b40ed63f08fa1922a3c88488";
+       libraryHaskellDepends = [
+         attoparsec base base16-bytestring bytestring containers io-streams
+         pdf-toolbox-core text
+       ];
+       homepage = "https://github.com/Yuras/pdf-toolbox";
+       description = "A collection of tools for processing PDF files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pdf-toolbox-core" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, errors
      , io-streams, scientific, transformers, zlib-bindings
@@ -150028,6 +151665,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pdf-toolbox-core_0_0_4_1" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, errors
+     , io-streams, scientific, transformers, zlib-bindings
+     }:
+     mkDerivation {
+       pname = "pdf-toolbox-core";
+       version = "0.0.4.1";
+       sha256 = "cce3949ef5596b5d61032ce1547160dc5f52e3d5c556dcdb9aabf1582173a981";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers errors io-streams scientific
+         transformers zlib-bindings
+       ];
+       homepage = "https://github.com/Yuras/pdf-toolbox";
+       description = "A collection of tools for processing PDF files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pdf-toolbox-document" = callPackage
     ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4
      , containers, crypto-api, cryptohash, io-streams
@@ -150047,6 +151702,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pdf-toolbox-document_0_0_7_1" = callPackage
+    ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4
+     , containers, crypto-api, cryptohash, io-streams
+     , pdf-toolbox-content, pdf-toolbox-core, text, transformers
+     }:
+     mkDerivation {
+       pname = "pdf-toolbox-document";
+       version = "0.0.7.1";
+       sha256 = "3f7d379baa85c1cf9998e3f84177ad24b5cc8632fb211af7a09603e59596f0e1";
+       libraryHaskellDepends = [
+         base bytestring cipher-aes cipher-rc4 containers crypto-api
+         cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text
+         transformers
+       ];
+       homepage = "https://github.com/Yuras/pdf-toolbox";
+       description = "A collection of tools for processing PDF files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pdf-toolbox-viewer" = callPackage
     ({ mkDerivation, base, bytestring, cairo, containers, directory
      , filepath, gtk, io-streams, pdf-toolbox-content
@@ -152677,8 +154352,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne";
-       version = "0.0.2.0";
-       sha256 = "14f496b53ad8bf95d496e685e7d006f226b8cb579284ea2cd2d554590e6050d2";
+       version = "0.0.3.0";
+       sha256 = "97823be82846237159a13767ae9a9b29acf8dbc68a95ff099b942b3bcae0790f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -153100,24 +154775,6 @@ self: {
      }:
      mkDerivation {
        pname = "pinchot";
-       version = "0.8.0.0";
-       sha256 = "f7567131c274815e8e0ecccff815a8ff94c0912a833055ddc55f46ea26831e3b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers Earley lens template-haskell transformers
-       ];
-       homepage = "http://www.github.com/massysett/pinchot";
-       description = "Build parsers and ASTs for context-free grammars";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pinchot_0_10_0_0" = callPackage
-    ({ mkDerivation, base, containers, Earley, lens, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pinchot";
        version = "0.10.0.0";
        sha256 = "59a9e3b5e5eb323b11fba24d90d7f371e22653d46bf7a31b9676220a0e78a797";
        isLibrary = true;
@@ -153128,7 +154785,6 @@ self: {
        homepage = "http://www.github.com/massysett/pinchot";
        description = "Build parsers and ASTs for context-free grammars";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipe-enumerator" = callPackage
@@ -154123,6 +155779,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-text_0_0_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, pipes, pipes-bytestring
+     , pipes-group, pipes-parse, pipes-safe, streaming-commons, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pipes-text";
+       version = "0.0.2.1";
+       sha256 = "4bb6f008ad1a56e8a685ca960ddd777647183c15989883d14f84e5a5aa21b3e3";
+       libraryHaskellDepends = [
+         base bytestring pipes pipes-bytestring pipes-group pipes-parse
+         pipes-safe streaming-commons text transformers
+       ];
+       homepage = "https://github.com/michaelt/text-pipes";
+       description = "properly streaming text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-transduce" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest
      , foldl, free, lens-family-core, pipes, pipes-bytestring
@@ -154131,8 +155806,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-transduce";
-       version = "0.3.2.0";
-       sha256 = "3273d60971ea3995df2cd255061b9705fd7c4fcced2c8162e65a2fad88789e3a";
+       version = "0.3.3.0";
+       sha256 = "af40b285eb0e55f8ba17223890b09b4b9cc9b9774d55c7539d878e1d3d68c49b";
        libraryHaskellDepends = [
          base bifunctors bytestring conceit foldl free lens-family-core
          pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse
@@ -155192,8 +156867,8 @@ self: {
     ({ mkDerivation, base, containers, hspec, lens, mtl }:
      mkDerivation {
        pname = "polar-shader";
-       version = "0.1.0.3";
-       sha256 = "f995b27e6388e5f6f037c175802f0bd65809e151b7130372f6300b6412a6c99c";
+       version = "0.1.0.4";
+       sha256 = "7f19c299d8e8c1672f6d98a475bfe969feefc8f862c47c39c2088de6ebfe12d4";
        libraryHaskellDepends = [ base containers lens mtl ];
        testHaskellDepends = [ base containers hspec ];
        description = "High-level shader compiler for Polar Game Engine";
@@ -155311,6 +156986,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "poly-control" = callPackage
+    ({ mkDerivation, base, lens }:
+     mkDerivation {
+       pname = "poly-control";
+       version = "1.0.0";
+       sha256 = "268f2355f258e4659d940356aaed8cf1559c1268c21bd4f53e705cdeafd39d10";
+       libraryHaskellDepends = [ base lens ];
+       homepage = "https://github.com/wdanilo/poly-control";
+       description = "This package provides abstraction for polymorphic controls, like PolyMonads or PolyApplicatives";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "polyToMonoid" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -155499,6 +157186,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pong-server" = callPackage
+    ({ mkDerivation, base, hspec, network, QuickCheck }:
+     mkDerivation {
+       pname = "pong-server";
+       version = "0.0.1.0";
+       sha256 = "649ea24e1412408d55e4e82f4c0d0e87bdbeb100bb70ea2167627f304ee2730e";
+       libraryHaskellDepends = [ base network ];
+       testHaskellDepends = [ base hspec network QuickCheck ];
+       homepage = "http://github.com/RobertFischer/pong-server#readme";
+       description = "A simple embedded pingable server that runs in the background";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "pontarius-mediaserver" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-sqlite3, hlogger, pontarius-xmpp
      , pontarius-xpmn, xml-types
@@ -156094,7 +157794,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "postgresql-binary" = callPackage
+  "postgresql-binary_0_7_5_1" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, conversion, conversion-bytestring, conversion-text
      , either, foldl, loch-th, placeholders, postgresql-libpq
@@ -156121,37 +157821,70 @@ self: {
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "postgresql-binary_0_7_6" = callPackage
+  "postgresql-binary_0_7_8" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, conversion, conversion-bytestring, conversion-text
-     , either, foldl, loch-th, placeholders, postgresql-libpq
-     , QuickCheck, quickcheck-instances, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
-     , uuid, vector
+     , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq
+     , QuickCheck, quickcheck-instances, rebase, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
+     , transformers, uuid, vector
      }:
      mkDerivation {
        pname = "postgresql-binary";
-       version = "0.7.6";
-       sha256 = "19a2ed82a6f924194b79d6a0759299495f802c00d5b563841decacb8adb30a42";
+       version = "0.7.8";
+       sha256 = "a05472d7b485c0e953b1136f74ff6fe35d663f265b4f08be8450a5a3a6b30534";
        libraryHaskellDepends = [
          aeson base base-prelude binary-parser bytestring foldl loch-th
          placeholders scientific text time transformers uuid vector
        ];
        testHaskellDepends = [
-         base base-prelude bytestring conversion conversion-bytestring
-         conversion-text either loch-th placeholders postgresql-libpq
-         QuickCheck quickcheck-instances scientific tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck text time transformers uuid
-         vector
+         aeson base bytestring conversion conversion-bytestring
+         conversion-text either json-ast loch-th placeholders
+         postgresql-libpq QuickCheck quickcheck-instances rebase scientific
+         tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time
+         transformers uuid vector
        ];
+       jailbreak = true;
+       doCheck = false;
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-binary" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, binary-parser
+     , bytestring, conversion, conversion-bytestring, conversion-text
+     , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq
+     , QuickCheck, quickcheck-instances, rebase, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
+     , transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.7.9";
+       sha256 = "72ff406d9be3afbf459879e8ab51701e9b41edb88a457d666b7eaf079dc824ad";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring foldl loch-th
+         placeholders scientific text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conversion conversion-bytestring
+         conversion-text either json-ast loch-th placeholders
+         postgresql-libpq QuickCheck quickcheck-instances rebase scientific
+         tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time
+         transformers uuid vector
+       ];
+       jailbreak = true;
+       doCheck = false;
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -157260,9 +158993,12 @@ self: {
        pname = "present";
        version = "2.2";
        sha256 = "e48643a4eacee99f87b605613c752d40b4955e348b601b090cf0a8f675dd3ffd";
+       revision = "1";
+       editedCabalFile = "87a451bb6a37e2441a9cc49e4b1ebb18a8699bcd28da970f210eb1fcabd769c1";
        libraryHaskellDepends = [
          aeson atto-lisp base bytestring data-default mtl semigroups text
        ];
+       jailbreak = true;
        description = "Make presentations for data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -157582,6 +159318,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "primitive-simd" = callPackage
+    ({ mkDerivation, base, ghc-prim, primitive, vector }:
+     mkDerivation {
+       pname = "primitive-simd";
+       version = "0.1.0.0";
+       sha256 = "d131c7a6aedc55c113e71fbc22cd79e2105186fb5e359236de04abe46433b58d";
+       libraryHaskellDepends = [ base ghc-prim primitive vector ];
+       description = "SIMD data types and functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "primula-board" = callPackage
     ({ mkDerivation, base, ConfigFile, containers, directory, happstack
      , happstack-helpers, happstack-server, happstack-state, hsp
@@ -157866,7 +159613,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "process-extras" = callPackage
+  "process-extras_0_3_3_7" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, ListLike, process, text
      }:
      mkDerivation {
@@ -157881,9 +159628,10 @@ self: {
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "process-extras_0_3_3_8" = callPackage
+  "process-extras" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, generic-deriving
      , ListLike, process, text
      }:
@@ -157894,11 +159642,9 @@ self: {
        libraryHaskellDepends = [
          base bytestring deepseq generic-deriving ListLike process text
        ];
-       jailbreak = true;
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-iterio" = callPackage
@@ -157992,30 +159738,31 @@ self: {
 
   "process-streaming" = callPackage
     ({ mkDerivation, attoparsec, base, bifunctors, bytestring, conceit
-     , containers, contravariant, directory, doctest, exceptions
-     , filepath, foldl, free, lens, pipes, pipes-attoparsec
+     , containers, directory, doctest, exceptions, filepath, foldl, free
+     , kan-extensions, lens-family-core, pipes, pipes-attoparsec
      , pipes-bytestring, pipes-concurrency, pipes-group, pipes-parse
-     , pipes-safe, pipes-text, process, semigroups, tasty, tasty-hunit
-     , text, transformers, transformers-compat, void
+     , pipes-safe, pipes-text, pipes-transduce, process, profunctors
+     , semigroups, tasty, tasty-hunit, text, transformers
+     , transformers-compat, void
      }:
      mkDerivation {
        pname = "process-streaming";
-       version = "0.7.2.2";
-       sha256 = "634d16c4444840d7a5264936b5d3b20cc277154a905f967872cbfedce4a1b04a";
+       version = "0.9.0.1";
+       sha256 = "114bf31ba101447858cf6db6f127e6fcc09e154cc6f49fda27c60e6e0db2e1dc";
        libraryHaskellDepends = [
-         base bifunctors bytestring conceit containers contravariant foldl
-         free pipes pipes-bytestring pipes-concurrency pipes-parse
-         pipes-safe pipes-text process semigroups text transformers
+         base bifunctors bytestring conceit free kan-extensions pipes
+         pipes-bytestring pipes-concurrency pipes-parse pipes-safe
+         pipes-text pipes-transduce process profunctors text transformers
          transformers-compat void
        ];
        testHaskellDepends = [
          attoparsec base bifunctors bytestring containers directory doctest
-         exceptions filepath free lens pipes pipes-attoparsec
-         pipes-bytestring pipes-concurrency pipes-group pipes-parse
-         pipes-safe pipes-text process semigroups tasty tasty-hunit text
-         transformers transformers-compat void
+         exceptions filepath foldl free lens-family-core pipes
+         pipes-attoparsec pipes-bytestring pipes-concurrency pipes-group
+         pipes-parse pipes-safe pipes-text pipes-transduce process
+         semigroups tasty tasty-hunit text transformers transformers-compat
+         void
        ];
-       jailbreak = true;
        description = "Streaming interface to system processes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158231,8 +159978,8 @@ self: {
      }:
      mkDerivation {
        pname = "profiteur";
-       version = "0.2.0.2";
-       sha256 = "fe2d0a9a44785ee2fb7ea54ceb73088fab3f81179c1c1541cbb183ad188229e3";
+       version = "0.3.0.1";
+       sha256 = "a0e2ea372a6259dcd25b69160e9afef9039c25e0acbafd8824eb907117dd5b86";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -158553,19 +160300,20 @@ self: {
      }) {};
 
   "prologue" = callPackage
-    ({ mkDerivation, base, binary, cond, container, convert
-     , data-default, data-layer, errors, functor-utils, lens, lens-utils
-     , mtl, pretty-show, string-qq, text, transformers
-     , transformers-base, tuple, vector
+    ({ mkDerivation, base, bifunctors, binary, cond, container, convert
+     , data-default, data-layer, errors, functor-utils, impossible, lens
+     , lens-utils, mtl, pretty-show, string-qq, text, transformers
+     , transformers-base, tuple, typelevel, vector
      }:
      mkDerivation {
        pname = "prologue";
-       version = "1.0.6";
-       sha256 = "c14e942d1021bc060ca4c8df14c0f487a0f03607c3b5afa65b1dd3d75e0c277f";
+       version = "1.0.7";
+       sha256 = "37e8c186881e2cce7702812f64cc6fd27273cb9d3f34f59ffaaf0a365235935b";
        libraryHaskellDepends = [
-         base binary cond container convert data-default data-layer errors
-         functor-utils lens lens-utils mtl pretty-show string-qq text
-         transformers transformers-base tuple vector
+         base bifunctors binary cond container convert data-default
+         data-layer errors functor-utils impossible lens lens-utils mtl
+         pretty-show string-qq text transformers transformers-base tuple
+         typelevel vector
        ];
        homepage = "https://github.com/wdanilo/prologue";
        description = "Better, more general Prelude exporting common utilities";
@@ -159163,7 +160911,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "psc-ide" = callPackage
+  "psc-ide_0_5_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , either, filepath, hspec, http-client, lens, lens-aeson, mtl
      , network, optparse-applicative, parsec, purescript, regex-tdfa
@@ -159187,6 +160935,37 @@ self: {
        homepage = "http://github.com/kRITZCREEK/psc-ide";
        description = "Language support for the PureScript programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "psc-ide" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , edit-distance, either, filepath, fsnotify, hspec, http-client
+     , lens, lens-aeson, monad-logger, mtl, network
+     , optparse-applicative, parsec, purescript, regex-tdfa, stm, text
+     , wreq
+     }:
+     mkDerivation {
+       pname = "psc-ide";
+       version = "0.6.1";
+       sha256 = "d2dc589b62f279e97cbe8ad87db2c907c3f1c2bb8e9f0e60978d547cee4a06b5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory edit-distance either
+         filepath fsnotify http-client lens lens-aeson monad-logger mtl
+         parsec purescript regex-tdfa stm text wreq
+       ];
+       executableHaskellDepends = [
+         base directory filepath monad-logger mtl network
+         optparse-applicative stm text
+       ];
+       testHaskellDepends = [
+         base containers hspec monad-logger mtl stm
+       ];
+       homepage = "http://github.com/kRITZCREEK/psc-ide";
+       description = "Language support for the PureScript programming language";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "pseudo-boolean" = callPackage
@@ -159255,7 +161034,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "psqueues" = callPackage
+  "psqueues_0_2_0_3" = callPackage
     ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
      , QuickCheck, tagged, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -159271,6 +161050,44 @@ self: {
        ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "psqueues" = callPackage
+    ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
+     , QuickCheck, tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "psqueues";
+       version = "0.2.1.0";
+       sha256 = "54999bb6f718533771a35e3e333b41ac1ab355eb034281c8607217b53fb6891d";
+       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
+       testHaskellDepends = [
+         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       description = "Pure priority search queues";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "psqueues_0_2_2_0" = callPackage
+    ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
+     , QuickCheck, tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "psqueues";
+       version = "0.2.2.0";
+       sha256 = "14b12f505eea093f25190a9d74109f0178e611701849b83a3878811affe0b52a";
+       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
+       testHaskellDepends = [
+         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       description = "Pure priority search queues";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pub" = callPackage
@@ -159313,8 +161130,8 @@ self: {
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20160126";
-       sha256 = "7798d15bf7962f6dc4ba65faa28c9975d4691e7f764ff1ef4689fcb5f1cac090";
+       version = "0.20160201";
+       sha256 = "86aed1a05038b9f95038682bd8621d0bcad1cc745d0bb761636a9639ac6247e1";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -159914,7 +161731,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "purescript" = callPackage
+  "purescript_0_7_6_1" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base
      , base-compat, bower-json, boxes, bytestring, containers, directory
      , dlist, filepath, Glob, haskeline, HUnit, language-javascript
@@ -159951,6 +161768,47 @@ self: {
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "purescript" = callPackage
+    ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base
+     , base-compat, bower-json, boxes, bytestring, containers, directory
+     , dlist, filepath, Glob, haskeline, HUnit, language-javascript
+     , lifted-base, monad-control, mtl, optparse-applicative, parallel
+     , parsec, pattern-arrows, process, safe, semigroups, split, syb
+     , text, time, transformers, transformers-base, transformers-compat
+     , unordered-containers, utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "purescript";
+       version = "0.8.0.0";
+       sha256 = "a263933c4ae407f2c97e230d08ab343f597e101a597f7fa01151b0b476ce43d0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-better-errors base base-compat bower-json boxes
+         bytestring containers directory dlist filepath Glob
+         language-javascript lifted-base monad-control mtl parallel parsec
+         pattern-arrows process safe semigroups split syb text time
+         transformers transformers-base transformers-compat
+         unordered-containers utf8-string vector
+       ];
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint base base-compat boxes bytestring containers
+         directory filepath Glob haskeline mtl optparse-applicative parsec
+         process split time transformers transformers-compat utf8-string
+       ];
+       testHaskellDepends = [
+         aeson aeson-better-errors base base-compat boxes bytestring
+         containers directory filepath Glob haskeline HUnit mtl
+         optparse-applicative parsec process time transformers
+         transformers-compat
+       ];
+       doCheck = false;
+       homepage = "http://www.purescript.org/";
+       description = "PureScript Programming Language Compiler";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "purescript-bundle-fast" = callPackage
@@ -160740,7 +162598,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "quickcheck-instances" = callPackage
+  "quickcheck-instances_0_3_11" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, hashable
      , old-time, QuickCheck, text, time, unordered-containers
      }:
@@ -160757,9 +162615,10 @@ self: {
        homepage = "https://github.com/aslatter/qc-instances";
        description = "Common quickcheck instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "quickcheck-instances_0_3_12" = callPackage
+  "quickcheck-instances" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, hashable
      , old-time, QuickCheck, scientific, text, time
      , unordered-containers, vector
@@ -160775,7 +162634,6 @@ self: {
        homepage = "https://github.com/aslatter/qc-instances";
        description = "Common quickcheck instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-io_0_1_1" = callPackage
@@ -162502,6 +164360,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "reactive-banana-sdl2" = callPackage
+    ({ mkDerivation, base, reactive-banana, sdl2 }:
+     mkDerivation {
+       pname = "reactive-banana-sdl2";
+       version = "0.1.0.0";
+       sha256 = "605dd7df6814f82b69d2ba0aa51029417659c6ab560c869c7598a06615905942";
+       revision = "1";
+       editedCabalFile = "3c82ab987be2ab12330aa5863b3c80f5022525a5fb7d65cff6b5de47288b9ae7";
+       libraryHaskellDepends = [ base reactive-banana sdl2 ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/cies/reactive-banana-sdl2#readme";
+       description = "Reactive Banana integration with SDL2";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "reactive-banana-threepenny" = callPackage
     ({ mkDerivation, base, reactive-banana, threepenny-gui }:
      mkDerivation {
@@ -162764,6 +164637,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rebase" = callPackage
+    ({ mkDerivation, base, base-prelude, bifunctors, bytestring
+     , containers, contravariant, contravariant-extras, deepseq, dlist
+     , either, hashable, mtl, profunctors, scientific, semigroups, text
+     , time, transformers, unordered-containers, uuid, vector, void
+     }:
+     mkDerivation {
+       pname = "rebase";
+       version = "0.4.1";
+       sha256 = "7c5bbc55a5653b9f456f1369616e22d135f667441d8ea160a8b11e02549e5abe";
+       libraryHaskellDepends = [
+         base base-prelude bifunctors bytestring containers contravariant
+         contravariant-extras deepseq dlist either hashable mtl profunctors
+         scientific semigroups text time transformers unordered-containers
+         uuid vector void
+       ];
+       homepage = "https://github.com/nikita-volkov/rebase";
+       description = "A more progressive alternative to the \"base\" package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "recaptcha" = callPackage
     ({ mkDerivation, base, HTTP, network, network-uri, xhtml }:
      mkDerivation {
@@ -163564,8 +165458,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex";
-       version = "0.3.2";
-       sha256 = "55fae21380809137c5bdbde646479b01e36793f10523e44842eb35bc9c42f419";
+       version = "0.4.0";
+       sha256 = "d60c2d425c57cf2239e1088628099f44b834e3f2c661ddb6133cc397b5476b9c";
        libraryHaskellDepends = [
          base containers dependent-map dependent-sum exception-transformers
          haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups
@@ -163604,24 +165498,21 @@ self: {
     ({ mkDerivation, aeson, base, bifunctors, bytestring, containers
      , data-default, dependent-map, dependent-sum
      , dependent-sum-template, directory, exception-transformers
-     , ghcjs-dom, glib, gtk3, lens, mtl, ref-tf, reflex, safe
-     , semigroups, text, these, time, transformers, webkitgtk3
-     , webkitgtk3-javascriptcore
+     , ghcjs-dom, glib, gtk3, lens, mtl, raw-strings-qq, ref-tf, reflex
+     , safe, semigroups, text, these, time, transformers, unix
+     , webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "reflex-dom";
-       version = "0.2";
-       sha256 = "fd350b5e6d4613802bf37ebf15362b083af7bfec9ec22a56d1245bc3d2af86dd";
-       revision = "2";
-       editedCabalFile = "2aa20b3cf39f41e8850a54ab28b95b000065ccc5b65e44f0710171821e72cbe6";
+       version = "0.3";
+       sha256 = "a52bacd0ebdbb559a64fc3c7abfb34d8264c3c84243b8bc126c256e505b58d3a";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-default
          dependent-map dependent-sum dependent-sum-template directory
-         exception-transformers ghcjs-dom glib gtk3 lens mtl ref-tf reflex
-         safe semigroups text these time transformers webkitgtk3
-         webkitgtk3-javascriptcore
+         exception-transformers ghcjs-dom glib gtk3 lens mtl raw-strings-qq
+         ref-tf reflex safe semigroups text these time transformers unix
+         webkitgtk3 webkitgtk3-javascriptcore
        ];
-       jailbreak = true;
        description = "Functional Reactive Web Apps with Reflex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164630,8 +166521,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.8.0.2";
-       sha256 = "784433068c59871ccfcc50aaba93298a85e96a4ad0917f2fbc9b23290d34f63a";
+       version = "0.8.0.4";
+       sha256 = "0a2b8f3739cfeaf19c2b0dca4f321c2d1fbbedc007f241cfbf85142e25f03eb5";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -164799,6 +166690,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "remote-monad" = callPackage
+    ({ mkDerivation, base, containers, natural-transformation
+     , QuickCheck, quickcheck-instances, tasty, tasty-quickcheck
+     , transformers
+     }:
+     mkDerivation {
+       pname = "remote-monad";
+       version = "0.1.0.1";
+       sha256 = "e52a1a304d507169be144abbff8c7e28b08a36e7c05f296dbcd4be8a5fcd53e1";
+       libraryHaskellDepends = [
+         base natural-transformation transformers
+       ];
+       testHaskellDepends = [
+         base containers QuickCheck quickcheck-instances tasty
+         tasty-quickcheck
+       ];
+       description = "An parametrizable Remote Monad, and parametrizable Applicative Functor";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "remotion" = callPackage
     ({ mkDerivation, async, base, bytestring, concurrent-extra
      , containers, directory, errors, filelock, hashable, hashtables
@@ -165668,10 +167579,13 @@ self: {
        pname = "resource-pool";
        version = "0.2.3.1";
        sha256 = "2265fc16f409eeb8d8e85644029c19b46bc48834ebba8aba8cb0b1ef64e1d709";
+       revision = "1";
+       editedCabalFile = "68c8ac9105a980178fc6e2a07446b3ba87283fc662df1dec181c50953b74b96d";
        libraryHaskellDepends = [
          base hashable monad-control stm time transformers transformers-base
          vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/bos/pool";
        description = "A high-performance striped resource pooling implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -166220,7 +168134,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rest-core" = callPackage
+  "rest-core_0_37" = callPackage
     ({ mkDerivation, aeson, aeson-utils, base, bytestring
      , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils
      , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap
@@ -166232,8 +168146,8 @@ self: {
        pname = "rest-core";
        version = "0.37";
        sha256 = "6a7e13b5e1ae6aadf53cc0dcbeca99a01b68737833962b2abdd50f4e6e9d066c";
-       revision = "2";
-       editedCabalFile = "b402497734ed072efe7f1f989b56082490b8782f53f718821e028e61a4b22fcb";
+       revision = "4";
+       editedCabalFile = "09d7a6cceaa574917ef0ced55b1424bc0367b240678c358c36a1e4efedc04771";
        libraryHaskellDepends = [
          aeson aeson-utils base bytestring case-insensitive errors fclabels
          hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random
@@ -166247,6 +168161,34 @@ self: {
        ];
        description = "Rest API library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rest-core" = callPackage
+    ({ mkDerivation, aeson, aeson-utils, base, base-compat, bytestring
+     , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils
+     , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap
+     , rest-types, safe, split, test-framework, test-framework-hunit
+     , text, transformers, transformers-compat, unordered-containers
+     , uri-encode, utf8-string, uuid
+     }:
+     mkDerivation {
+       pname = "rest-core";
+       version = "0.38";
+       sha256 = "b491b734c2d74729f427ca02370f12b839dd92347fea44b5fb66c66a39b11cec";
+       libraryHaskellDepends = [
+         aeson aeson-utils base base-compat bytestring case-insensitive
+         errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
+         multipart random rest-stringmap rest-types safe split text
+         transformers transformers-compat unordered-containers uri-encode
+         utf8-string uuid
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit mtl test-framework test-framework-hunit
+         transformers transformers-compat unordered-containers
+       ];
+       description = "Rest API library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "rest-example" = callPackage
@@ -166267,6 +168209,7 @@ self: {
          transformers-compat unordered-containers
        ];
        executableHaskellDepends = [ base rest-gen ];
+       jailbreak = true;
        homepage = "http://www.github.com/silkapp/rest";
        description = "Example project for rest";
        license = stdenv.lib.licenses.bsd3;
@@ -166614,7 +168557,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rest-gen" = callPackage
+  "rest-gen_0_19_0_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, Cabal, code-builder
      , directory, fclabels, filepath, hashable, haskell-src-exts
      , HStringTemplate, HUnit, hxt, json-schema, pretty, process
@@ -166636,6 +168579,34 @@ self: {
          base fclabels haskell-src-exts HUnit rest-core test-framework
          test-framework-hunit
        ];
+       jailbreak = true;
+       description = "Documentation and client generation from rest definition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rest-gen" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal
+     , code-builder, directory, fclabels, filepath, hashable
+     , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema
+     , pretty, process, rest-core, safe, scientific, semigroups, split
+     , test-framework, test-framework-hunit, text, uniplate
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "rest-gen";
+       version = "0.19.0.2";
+       sha256 = "12caa70e7b29b073cb0e066cf7d5c590b13e0fb5b2f924944cd1ae5217c79330";
+       libraryHaskellDepends = [
+         aeson base base-compat blaze-html Cabal code-builder directory
+         fclabels filepath hashable haskell-src-exts HStringTemplate hxt
+         json-schema pretty process rest-core safe scientific semigroups
+         split text uniplate unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base fclabels haskell-src-exts HUnit rest-core test-framework
+         test-framework-hunit
+       ];
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -166722,6 +168693,8 @@ self: {
        pname = "rest-happstack";
        version = "0.3.1";
        sha256 = "a2c2e1b1e1bfdc7870100eee642e488268e21117b08aad254342d14a53ce13d9";
+       revision = "1";
+       editedCabalFile = "bcee53122444a7394e71c1f20b614f1b3504c90f96a519ff8981f7eb05805ca1";
        libraryHaskellDepends = [
          base containers happstack-server mtl rest-core rest-gen utf8-string
        ];
@@ -166791,6 +168764,8 @@ self: {
        pname = "rest-snap";
        version = "0.2";
        sha256 = "38947f552b90b08cf21567dd8931891f1c328546e5e5dda7e083fb2f3711eefc";
+       revision = "1";
+       editedCabalFile = "86fefb10994951f66e3e125ad5bf4060fa21cc636b41d1c605ddad81744ee2af";
        libraryHaskellDepends = [
          base bytestring case-insensitive rest-core safe snap-core
          unordered-containers uri-encode utf8-string
@@ -166997,8 +168972,8 @@ self: {
        pname = "rest-wai";
        version = "0.2";
        sha256 = "92d7455c537d24c6d2ccadd9272cac385659ed2a828fbe20bca9249016897413";
-       revision = "1";
-       editedCabalFile = "66767f5908d25ffaeaf9f15ad093f57f88ed212638bbfb7ec23190ed77c133b4";
+       revision = "2";
+       editedCabalFile = "ac37af20f1f44b9ada05e25dea369b8149359ba6a020a92d5b3e841846f731c7";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types mime-types
          mtl rest-core text unordered-containers wai
@@ -167395,7 +169370,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rev-state" = callPackage
+  "rev-state_0_1_1" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "rev-state";
@@ -167406,6 +169381,22 @@ self: {
        homepage = "https://github.com/DanBurton/rev-state#readme";
        description = "Reverse State monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rev-state" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "rev-state";
+       version = "0.1.2";
+       sha256 = "ee070e39d7f7d673593e2f356ab317bc2fdd0d8a283f8316c0e5b5adbdf0f919";
+       revision = "2";
+       editedCabalFile = "de8db922a675a68ac8ac03f80fabaed250fe332a20f7b3bd8272238088e3d135";
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/DanBurton/rev-state#readme";
+       description = "Reverse State monad transformer";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "revdectime" = callPackage
@@ -170094,7 +172085,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "scalpel" = callPackage
+  "scalpel_0_2_1_1" = callPackage
     ({ mkDerivation, base, bytestring, curl, HUnit, regex-base
      , regex-tdfa, tagsoup, text
      }:
@@ -170109,6 +172100,25 @@ self: {
        homepage = "https://github.com/fimad/scalpel";
        description = "A high level web scraping library for Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "scalpel" = callPackage
+    ({ mkDerivation, base, bytestring, containers, curl, data-default
+     , HUnit, regex-base, regex-tdfa, tagsoup, text
+     }:
+     mkDerivation {
+       pname = "scalpel";
+       version = "0.3.0.1";
+       sha256 = "ab1c9462b2bc7ef7d6ae028172eda278c3bf06adb3c877d6c5356491ab836471";
+       libraryHaskellDepends = [
+         base bytestring containers curl data-default regex-base regex-tdfa
+         tagsoup text
+       ];
+       testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
+       homepage = "https://github.com/fimad/scalpel";
+       description = "A high level web scraping library for Haskell";
+       license = stdenv.lib.licenses.asl20;
      }) {};
 
   "scan" = callPackage
@@ -170819,7 +172829,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "scotty" = callPackage
+  "scotty_0_10_2" = callPackage
     ({ mkDerivation, aeson, async, base, blaze-builder, bytestring
      , case-insensitive, data-default-class, directory, hspec, hspec-wai
      , http-types, lifted-base, monad-control, mtl, nats, network
@@ -170845,9 +172855,10 @@ self: {
        homepage = "https://github.com/scotty-web/scotty";
        description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "scotty_0_11_0" = callPackage
+  "scotty" = callPackage
     ({ mkDerivation, aeson, async, base, blaze-builder, bytestring
      , case-insensitive, data-default-class, directory, fail, hspec
      , hspec-wai, http-types, lifted-base, monad-control, mtl, nats
@@ -170871,7 +172882,6 @@ self: {
        homepage = "https://github.com/scotty-web/scotty";
        description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-binding-play" = callPackage
@@ -172120,7 +174130,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "semigroups" = callPackage
+  "semigroups_0_18_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, hashable
      , tagged, text, unordered-containers
      }:
@@ -172137,9 +174147,10 @@ self: {
        homepage = "http://github.com/ekmett/semigroups/";
        description = "Anything that associates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "semigroups_0_18_1" = callPackage
+  "semigroups" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , hashable, tagged, text, transformers, unordered-containers
      }:
@@ -172154,7 +174165,6 @@ self: {
        homepage = "http://github.com/ekmett/semigroups/";
        description = "Anything that associates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroups-actions" = callPackage
@@ -173807,7 +175817,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-swagger" = callPackage
+  "servant-swagger_0_1_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
      , http-media, lens, servant, swagger2, text, time
      , unordered-containers
@@ -173828,6 +175838,7 @@ self: {
        homepage = "https://github.com/dmjio/servant-swagger";
        description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger_0_1_2" = callPackage
@@ -173846,12 +175857,59 @@ self: {
        testHaskellDepends = [
          aeson aeson-qq base hspec lens servant swagger2 text time
        ];
+       jailbreak = true;
        homepage = "https://github.com/dmjio/servant-swagger";
        description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-swagger" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, doctest, Glob
+     , hspec, http-media, lens, QuickCheck, servant, swagger2, text
+     , time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-swagger";
+       version = "1.0";
+       sha256 = "cc9bc89bd83c373d1a31ce7ba603104f302db90b96cd93f45029b125f59e668e";
+       libraryHaskellDepends = [
+         aeson base bytestring hspec http-media lens QuickCheck servant
+         swagger2 text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base doctest Glob hspec lens QuickCheck servant
+         swagger2 text time
+       ];
+       homepage = "https://github.com/haskell-servant/servant-swagger";
+       description = "Generate Swagger specification for your servant API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-swagger_1_0_3" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, doctest, Glob
+     , hspec, http-media, lens, QuickCheck, servant, swagger2, text
+     , time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-swagger";
+       version = "1.0.3";
+       sha256 = "ea1b3c7f33ae1c788ef33858c9c74849f450155c1bd81dcd472a36389aa17597";
+       libraryHaskellDepends = [
+         aeson base bytestring hspec http-media lens QuickCheck servant
+         swagger2 text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base doctest Glob hspec lens QuickCheck servant
+         swagger2 text time
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/haskell-servant/servant-swagger";
+       description = "Generate Swagger specification for your servant API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-yaml" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, http-media
      , servant, servant-server, wai, warp, yaml
@@ -174424,8 +176482,8 @@ self: {
      }:
      mkDerivation {
        pname = "sexp-grammar";
-       version = "1.1.0";
-       sha256 = "e784db96a9fdcf1fe5f48adfc62e8b4ef9795bf4558769c149f244ed5ef9415c";
+       version = "1.1.1";
+       sha256 = "4737183b0201c27d4c0824418644abff466bdfe653c411cb8da8c53899d6dbd6";
        libraryHaskellDepends = [
          array base containers mtl scientific semigroups split stack-prism
          template-haskell text wl-pprint-text
@@ -175334,16 +177392,18 @@ self: {
      }) {};
 
   "shakespeare-babel" = callPackage
-    ({ mkDerivation, base, classy-prelude, shakespeare
-     , template-haskell
+    ({ mkDerivation, base, classy-prelude, data-default, directory
+     , process, shakespeare, template-haskell
      }:
      mkDerivation {
        pname = "shakespeare-babel";
-       version = "0.1.0.0";
-       sha256 = "a072ca9cf9397f23b74920d395d880108a7268d63a93da3086ed5a40ee0c2035";
+       version = "0.2.0.0";
+       sha256 = "cf3f66f382407464059f7091d3a3c83c61ab32e0fcee9c6dd70d38623bce6bdf";
        libraryHaskellDepends = [
-         base classy-prelude shakespeare template-haskell
+         base classy-prelude data-default directory process shakespeare
+         template-haskell
        ];
+       jailbreak = true;
        description = "compile es2015";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -176632,8 +178692,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.3.3";
-       sha256 = "2b4ccfc67b6b4b7dc2a27ebfd9166b911910750e28c86e2e5ca8a8c7cad51783";
+       version = "0.3.4";
+       sha256 = "7d81fdfb91a2ee88d73dc4a5680be4f0e8b44faa460ce15d41a33d3a975c84f9";
        libraryHaskellDepends = [
          async base containers deepseq directory filepath
          MonadCatchIO-transformers mtl SafeSemaphore text time transformers
@@ -183411,6 +185471,53 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stackage-curator_0_13_1" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
+     , base, base16-bytestring, binary, binary-tagged, blaze-html
+     , byteable, bytestring, Cabal, classy-prelude-conduit, conduit
+     , conduit-extra, containers, cryptohash, cryptohash-conduit
+     , data-default-class, directory, filepath, hspec, html-conduit
+     , http-client, http-client-tls, http-conduit, lucid, mime-types
+     , monad-unlift, mono-traversable, mtl, old-locale
+     , optparse-applicative, optparse-simple, process, QuickCheck
+     , resourcet, semigroups, stackage-cli, stackage-install
+     , stackage-metadata, stackage-types, stm, streaming-commons
+     , system-fileio, system-filepath, tar, temporary, text, time
+     , transformers, unix-compat, utf8-string, xml-conduit, xml-types
+     , yaml, zlib
+     }:
+     mkDerivation {
+       pname = "stackage-curator";
+       version = "0.13.1";
+       sha256 = "3234df1ffa4c7131a5dec91596dd53daef0ca7558245312e4b4ae591a10a1a16";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-s3 async base
+         base16-bytestring binary binary-tagged blaze-html byteable
+         bytestring Cabal classy-prelude-conduit conduit conduit-extra
+         containers cryptohash cryptohash-conduit data-default-class
+         directory filepath html-conduit http-client http-client-tls
+         http-conduit lucid mime-types monad-unlift mono-traversable mtl
+         old-locale process resourcet semigroups stackage-install
+         stackage-metadata stackage-types stm streaming-commons
+         system-fileio system-filepath tar temporary text time transformers
+         unix-compat utf8-string xml-conduit xml-types yaml zlib
+       ];
+       executableHaskellDepends = [
+         base http-client http-client-tls optparse-applicative
+         optparse-simple stackage-cli system-filepath text
+       ];
+       testHaskellDepends = [
+         base Cabal classy-prelude-conduit containers directory hspec
+         http-client http-client-tls QuickCheck text yaml
+       ];
+       homepage = "https://github.com/fpco/stackage";
+       description = "Tools for curating Stackage bundles";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stackage-install_0_1_0_3" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , cryptohash, directory, filepath, http-client, http-client-tls
@@ -185642,7 +187749,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "strict-base-types" = callPackage
+  "strict-base-types_0_4_0" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim
      , hashable, lens, QuickCheck, strict
      }:
@@ -185657,6 +187764,24 @@ self: {
        homepage = "https://github.com/meiersi/strict-base-types";
        description = "Strict variants of the types provided in base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "strict-base-types" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim
+     , hashable, lens, QuickCheck, strict
+     }:
+     mkDerivation {
+       pname = "strict-base-types";
+       version = "0.5.0";
+       sha256 = "febcadf3d7f97f9c8c161a98e2537ba83a8adc4e4f6015e65430d7367104a1cb";
+       libraryHaskellDepends = [
+         aeson base bifunctors binary deepseq ghc-prim hashable lens
+         QuickCheck strict
+       ];
+       homepage = "https://github.com/meiersi/strict-base-types";
+       description = "Strict variants of the types provided in base";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "strict-concurrency" = callPackage
@@ -186494,7 +188619,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stylish-haskell" = callPackage
+  "stylish-haskell_0_5_14_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
      , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
      , test-framework, test-framework-hunit, yaml
@@ -186521,6 +188646,36 @@ self: {
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "stylish-haskell" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
+     , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
+     , test-framework, test-framework-hunit, yaml
+     }:
+     mkDerivation {
+       pname = "stylish-haskell";
+       version = "0.5.15.1";
+       sha256 = "c7ff0fdf7a2e23b3c23dfd7b925ec29117a7d6d93fe1445f88d28b589802fee5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl syb yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs containers directory filepath
+         haskell-src-exts mtl strict syb yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring cmdargs containers directory filepath
+         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
+         yaml
+       ];
+       homepage = "https://github.com/jaspervdj/stylish-haskell";
+       description = "Haskell code prettifier";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "stylized" = callPackage
@@ -186641,7 +188796,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "success" = callPackage
+  "success_0_2_4" = callPackage
     ({ mkDerivation, base, monad-control, mtl, transformers
      , transformers-base
      }:
@@ -186655,6 +188810,59 @@ self: {
        homepage = "https://github.com/nikita-volkov/success";
        description = "A version of Either specialised for encoding of success or failure";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "success_0_2_5" = callPackage
+    ({ mkDerivation, base, monad-control, mtl, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "success";
+       version = "0.2.5";
+       sha256 = "d1548e0a685956ae0b568f89e9935af58ed6042fd5b850314b81e0a1efadabca";
+       revision = "1";
+       editedCabalFile = "0e3e195460c31e3cb90b992a36cfb7c39d5a7a5ac225cec3a45fb43aeb6a5580";
+       libraryHaskellDepends = [
+         base monad-control mtl transformers transformers-base
+       ];
+       homepage = "https://github.com/nikita-volkov/success";
+       description = "A version of Either specialised for encoding of success or failure";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "success" = callPackage
+    ({ mkDerivation, base, monad-control, mtl, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "success";
+       version = "0.2.5.1";
+       sha256 = "7efbd9b238a6741ab70f5b021c5ebc95369bf4de00ab88220eecb30b3df86bec";
+       libraryHaskellDepends = [
+         base monad-control mtl transformers transformers-base
+       ];
+       homepage = "https://github.com/nikita-volkov/success";
+       description = "A version of Either specialised for encoding of success or failure";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "success_0_2_6" = callPackage
+    ({ mkDerivation, base, monad-control, mtl, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "success";
+       version = "0.2.6";
+       sha256 = "e995e77e8ae13bc4d543ea771f6a4d17853dea1ae46ef294131fc8c582f2dab6";
+       libraryHaskellDepends = [
+         base monad-control mtl transformers transformers-base
+       ];
+       homepage = "https://github.com/nikita-volkov/success";
+       description = "A version of Either specialised for encoding of success or failure";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "suffixarray" = callPackage
@@ -187191,7 +189399,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "swagger2" = callPackage
+  "swagger2_1_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, containers, doctest, Glob
      , hashable, hspec, http-media, HUnit, lens, mtl, network
      , QuickCheck, scientific, text, time, unordered-containers, vector
@@ -187213,6 +189421,58 @@ self: {
        homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "swagger2" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
+     , doctest, Glob, hashable, hspec, http-media, HUnit, lens, mtl
+     , network, QuickCheck, scientific, template-haskell, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "swagger2";
+       version = "2.0";
+       sha256 = "bbd6d2f3287e619ec9caa6e1c1628a5fd0f71ac311e451d87456d00c41a8f2d0";
+       libraryHaskellDepends = [
+         aeson base base-compat containers hashable http-media lens mtl
+         network scientific template-haskell text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat containers doctest Glob hashable
+         hspec HUnit lens mtl QuickCheck text time unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/GetShopTV/swagger2";
+       description = "Swagger 2.0 data model";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "swagger2_2_0_1" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
+     , doctest, Glob, hashable, hspec, http-media, HUnit, lens, mtl
+     , network, QuickCheck, scientific, template-haskell, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "swagger2";
+       version = "2.0.1";
+       sha256 = "ff8c3a195ff7689ba027d7caecd9b20505529ecc4962ddb7503b5130aa815898";
+       libraryHaskellDepends = [
+         aeson base base-compat containers hashable http-media lens mtl
+         network scientific template-haskell text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat containers doctest Glob hashable
+         hspec HUnit lens mtl QuickCheck text time unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/GetShopTV/swagger2";
+       description = "Swagger 2.0 data model";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swapper" = callPackage
@@ -188815,7 +191075,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tagged" = callPackage
+  "tagged_0_8_2" = callPackage
     ({ mkDerivation, base, deepseq, template-haskell }:
      mkDerivation {
        pname = "tagged";
@@ -188825,9 +191085,10 @@ self: {
        homepage = "http://github.com/ekmett/tagged";
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tagged_0_8_3" = callPackage
+  "tagged" = callPackage
     ({ mkDerivation, base, deepseq, template-haskell }:
      mkDerivation {
        pname = "tagged";
@@ -188837,7 +191098,6 @@ self: {
        homepage = "http://github.com/ekmett/tagged";
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged-binary" = callPackage
@@ -188855,14 +191115,12 @@ self: {
     ({ mkDerivation, base, exceptions, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "tagged-exception-core";
-       version = "2.1.0.0";
-       sha256 = "5d31398c2780363254d7593b3b3ece476e6114cc92a811aab7bb38b3301080f0";
-       revision = "2";
-       editedCabalFile = "da217c59c330c63984c85be6a669d1c5c990985fa8911ea537087823a45bb8cf";
+       version = "2.2.0.0";
+       sha256 = "b8e9ecabbf75c1733d0056a68349020d6104db6007cb466fa79e570464bd40c2";
        libraryHaskellDepends = [
          base exceptions mmorph mtl transformers
        ];
-       homepage = "https://github.com/trskop/tagged-exception";
+       homepage = "https://github.com/trskop/tagged-exception-core";
        description = "Reflect exceptions using phantom types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -191797,6 +194055,31 @@ self: {
        license = "GPL";
      }) {};
 
+  "texmath_0_8_4_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, network-uri, pandoc-types, parsec, process, split, syb
+     , temporary, text, utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.8.4.2";
+       sha256 = "ee18da2835eba8ec388d15b4fa08cb72d789bb345be3abc4eac1713f0052b17d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       homepage = "http://github.com/jgm/texmath";
+       description = "Conversion between formats used to represent mathematics";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, temporary, test-framework
@@ -192351,8 +194634,8 @@ self: {
        pname = "text-show";
        version = "2";
        sha256 = "5f64a35d1121c31a9166fd3910c865ad8f23e50edfc4b3733e63d4f415635694";
-       revision = "1";
-       editedCabalFile = "7009bf56e8594ddf59fcc5ac896d56f3928ba06eebfaf9e456c5298471138e5a";
+       revision = "2";
+       editedCabalFile = "26d3d47cd81cdf00d2d529569aec498a095fe424a4469405527b40ef489c3cc4";
        libraryHaskellDepends = [
          array base base-compat bytestring bytestring-builder containers
          generic-deriving ghc-prim integer-gmp nats semigroups tagged
@@ -192382,8 +194665,8 @@ self: {
        pname = "text-show";
        version = "2.1.2";
        sha256 = "76c1ce631c6932816dc241b290400e7200d7c79fd50ec03f51964e244fae320d";
-       revision = "1";
-       editedCabalFile = "3fc10600ed0d309c095024b4d320ace8d39dd883e4e8d109d182930c2b35fc9c";
+       revision = "2";
+       editedCabalFile = "b3b37a10589923b91729f07291795acf58f98efd5df1f32de99ab27fa1d3eda3";
        libraryHaskellDepends = [
          array base base-compat bytestring bytestring-builder containers
          generic-deriving ghc-prim integer-gmp nats semigroups tagged
@@ -192400,20 +194683,49 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-show_3" = callPackage
+    ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
+     , bytestring, bytestring-builder, containers, generic-deriving
+     , ghc-prim, hspec, integer-gmp, nats, QuickCheck
+     , quickcheck-instances, semigroups, tagged, template-haskell, text
+     , th-lift, transformers, transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "text-show";
+       version = "3";
+       sha256 = "49e8110e4bd5f67fa6dbe4ce07614633fc2e65bd3dae14b0759df10e3f1b98b2";
+       libraryHaskellDepends = [
+         array base base-compat bifunctors bytestring bytestring-builder
+         containers generic-deriving ghc-prim integer-gmp nats semigroups
+         tagged template-haskell text th-lift transformers
+         transformers-compat void
+       ];
+       testHaskellDepends = [
+         array base base-compat base-orphans bifunctors bytestring
+         bytestring-builder containers generic-deriving ghc-prim hspec
+         integer-gmp nats QuickCheck quickcheck-instances semigroups tagged
+         template-haskell text transformers transformers-compat void
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/RyanGlScott/text-show";
+       description = "Efficient conversion of values into Text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-show-instances" = callPackage
     ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
-     , containers, directory, ghc-prim, haskeline, hoopl, hpc, hspec
-     , old-locale, old-time, pretty, QuickCheck, quickcheck-instances
-     , random, semigroups, tagged, template-haskell, terminfo, text
-     , text-show, th-orphans, time, transformers, transformers-compat
-     , unix, unordered-containers, vector, xhtml
+     , containers, directory, generic-deriving, ghc-prim, haskeline
+     , hoopl, hpc, hspec, old-locale, old-time, pretty, QuickCheck
+     , quickcheck-instances, random, semigroups, tagged
+     , template-haskell, terminfo, text, text-show, th-orphans, time
+     , transformers, transformers-compat, unix, unordered-containers
+     , vector, xhtml
      }:
      mkDerivation {
        pname = "text-show-instances";
-       version = "2.1";
-       sha256 = "d8941910e88ad921a6337dd635356203137b85e5153a460b0b6bb3ebb0fd51b0";
-       revision = "2";
-       editedCabalFile = "f7407e5c0227a4fae2090ae9a10d4f4b62b869c56432a9ecb8bc8daf453a6cf8";
+       version = "3.0.1";
+       sha256 = "9164fd2e5ad017923d9e5cdafae6d895a4014009e982346e1a13b3ef8ecb1045";
        libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          haskeline hoopl hpc old-locale old-time pretty random semigroups
@@ -192422,11 +194734,13 @@ self: {
        ];
        testHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
-         ghc-prim haskeline hoopl hpc hspec old-locale old-time pretty
-         QuickCheck quickcheck-instances random semigroups tagged
-         template-haskell terminfo text-show th-orphans time transformers
-         transformers-compat unix unordered-containers vector xhtml
+         generic-deriving ghc-prim haskeline hoopl hpc hspec old-locale
+         old-time pretty QuickCheck quickcheck-instances random semigroups
+         tagged template-haskell terminfo text text-show th-orphans time
+         transformers transformers-compat unix unordered-containers vector
+         xhtml
        ];
+       jailbreak = true;
        homepage = "https://github.com/RyanGlScott/text-show-instances";
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
@@ -192583,6 +194897,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "textual" = callPackage
+    ({ mkDerivation, base, bytestring, text, utf8-string }:
+     mkDerivation {
+       pname = "textual";
+       version = "0.2.0.0";
+       sha256 = "de00ec44e43d3ed188c13c186d0326cde86fac9b8d0f42e9f937a1038f6c4c39";
+       libraryHaskellDepends = [ base bytestring text utf8-string ];
+       jailbreak = true;
+       homepage = "https://sealgram.com/git/haskell/text-like/";
+       description = "Textual type class for data that represent text";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tf-random" = callPackage
     ({ mkDerivation, base, primitive, random, time }:
      mkDerivation {
@@ -192885,8 +195212,11 @@ self: {
        pname = "th-expand-syns";
        version = "0.3.0.5";
        sha256 = "30933dcd5b92c3daa6317adb0688cb7cb0eed193a6a2af9bda142d6dd95f39f6";
+       revision = "1";
+       editedCabalFile = "f0c7ebf50e7282f73c160d7b6821e3b9da2f42c4f076655416925788eb968eb3";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        testHaskellDepends = [ base template-haskell ];
+       jailbreak = true;
        description = "Expands type synonyms in Template Haskell ASTs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193603,8 +195933,8 @@ self: {
      }:
      mkDerivation {
        pname = "threads-supervisor";
-       version = "1.0.4.0";
-       sha256 = "6d48e9007275c6ff3ce01c35f89a106110878e65c67c654f3432c3c3d6b9e02f";
+       version = "1.0.4.1";
+       sha256 = "d58d14711cabfb9e594d5e930e09a831aeb5ef4a428b2ebf09edc24d88d46cda";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -196785,7 +199115,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tttool" = callPackage
+  "tttool_1_5_1" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , directory, executable-path, filepath, hashable, haskeline
      , JuicyPixels, mtl, parsec, process, random, template-haskell, time
@@ -196805,6 +199135,30 @@ self: {
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tttool" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , directory, executable-path, filepath, hashable, haskeline, HPDF
+     , JuicyPixels, mtl, optparse-applicative, parsec, process, random
+     , split, spool, template-haskell, time, vector, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "tttool";
+       version = "1.6";
+       sha256 = "a2e6a9ad43ec7a0b6758d9fcd639d9c2e57d39c6c25427a888876d850985efd0";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base binary bytestring containers directory executable-path
+         filepath hashable haskeline HPDF JuicyPixels mtl
+         optparse-applicative parsec process random split spool
+         template-haskell time vector yaml zlib
+       ];
+       homepage = "https://github.com/entropia/tip-toi-reveng";
+       description = "Working with files for the Tiptoi® pen";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "tubes" = callPackage
@@ -197758,6 +200112,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-cache" = callPackage
+    ({ mkDerivation, base, containers, lens, lens-utils
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "type-cache";
+       version = "1.0";
+       sha256 = "ce75db1e0a87af31a6e2589ca74d7c5987c1541c70579e186c377045e6e070df";
+       libraryHaskellDepends = [
+         base containers lens lens-utils template-haskell
+       ];
+       homepage = "https://github.com/wdanilo/type-cache";
+       description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation.";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "type-cereal" = callPackage
     ({ mkDerivation, base, bytestring, cereal, data-hash
      , template-haskell, type-digits, type-spine
@@ -198278,23 +200648,27 @@ self: {
      }) {};
 
   "typed-wire" = callPackage
-    ({ mkDerivation, base, containers, directory, file-embed, filepath
-     , gitrev, mtl, optparse-applicative, parsec, text
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, gitrev, HTF, http-types, mtl, optparse-applicative
+     , parsec, process, temporary, text
      }:
      mkDerivation {
        pname = "typed-wire";
-       version = "0.2.1.3";
-       sha256 = "733ca272fee3a4e36c35e92fd34628a0db6076ea371724ce8046f8389f2cdcdc";
+       version = "0.3.0.0";
+       sha256 = "3faec8db44caf3658116619d88f9fb00dbf1b4e9f4e8106e4c1aeff2e7ec220f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers directory file-embed filepath mtl parsec text
+         base containers directory filepath http-types mtl parsec text
        ];
        executableHaskellDepends = [
          base directory filepath gitrev optparse-applicative text
        ];
-       homepage = "http://github.com/agrafix/typed-wire#readme";
-       description = "WIP: Language idependent type-safe communication";
+       testHaskellDepends = [
+         aeson base bytestring directory filepath HTF process temporary text
+       ];
+       homepage = "http://github.com/typed-wire/typed-wire#readme";
+       description = "Language idependent type-safe communication";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -198347,12 +200721,12 @@ self: {
      }) {};
 
   "typelevel" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, pretty, pretty-show }:
      mkDerivation {
        pname = "typelevel";
-       version = "1.0.2";
-       sha256 = "f8d150bbf6f946dbf51e14817225b519d5c31d6bcc1a1f21d48a9418b9c2c4fa";
-       libraryHaskellDepends = [ base ];
+       version = "1.0.4";
+       sha256 = "1cc8131a6e2cf9c84968980d73a543c7dc73fd6d878973a9f0a5ddaedf471dc2";
+       libraryHaskellDepends = [ base pretty pretty-show ];
        homepage = "https://github.com/wdanilo/typelevel";
        description = "Useful type level operations (type families and related operators)";
        license = stdenv.lib.licenses.asl20;
@@ -199297,6 +201671,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unicode-show" = callPackage
+    ({ mkDerivation, base, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "unicode-show";
+       version = "0.1.0.2";
+       sha256 = "7ee394879b345ee397aef87ca058628cd79d59cbfc1cec81aeda7fea65f53943";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       homepage = "http://github.com/nushio3/unicode-show#readme";
+       description = "print and show in unicode";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unicode-symbols" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -201146,8 +203538,8 @@ self: {
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
        pname = "uu-cco";
-       version = "0.1.0.3";
-       sha256 = "12451700f85e3f7c21265698b5a799802e3a24ced34dadeecd949e2f507b4259";
+       version = "0.1.0.4";
+       sha256 = "a2913c4802337ae57d5a4ede73e2664795fe823035da00b65f52d015c42632a0";
        libraryHaskellDepends = [ ansi-terminal base ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: core functionality";
@@ -202491,6 +204883,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-binary-instances_0_2_1_1" = callPackage
+    ({ mkDerivation, base, binary, vector }:
+     mkDerivation {
+       pname = "vector-binary-instances";
+       version = "0.2.1.1";
+       sha256 = "9647a467cc248ea967b16982be0a395688882d711b5b6613405064bcae6a4eb7";
+       libraryHaskellDepends = [ base binary vector ];
+       homepage = "https://github.com/bos/vector-binary-instances";
+       description = "Instances of Data.Binary and Data.Serialize for vector";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-buffer" = callPackage
     ({ mkDerivation, base, deepseq, vector }:
      mkDerivation {
@@ -202737,7 +205142,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vector-space" = callPackage
+  "vector-space_0_10_2" = callPackage
     ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
      mkDerivation {
        pname = "vector-space";
@@ -202746,6 +205151,18 @@ self: {
        libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "vector-space" = callPackage
+    ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
+     mkDerivation {
+       pname = "vector-space";
+       version = "0.10.3";
+       sha256 = "efe39aa83d5ec5187c26f88496faf7411d3ee943cbc719797e58d115b004c885";
+       libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
+       description = "Vector & affine spaces, linear maps, and derivatives";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "vector-space-map" = callPackage
@@ -209304,8 +211721,8 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf";
-       version = "0.3.4.0";
-       sha256 = "fadf96e8c8aa76a2c2d8d56eb8ac09a0babe2eba31b987d79e6f34d487f5b2e5";
+       version = "0.4.3.1";
+       sha256 = "daf3e180e534b2dd36667f8855c5d1699afab5512b3d38009f64bc9d8a24a19c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -212110,7 +214527,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xml-conduit" = callPackage
+  "xml-conduit_1_3_3" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
      , data-default, deepseq, hspec, HUnit, monad-control, resourcet
@@ -212132,6 +214549,31 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "xml-conduit" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, conduit, conduit-extra, containers
+     , data-default, deepseq, hspec, HUnit, monad-control, resourcet
+     , text, transformers, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit";
+       version = "1.3.3.1";
+       sha256 = "3d8ad32feade67f989150f253d3df99b3e3af6fab536c18f591d46707430feca";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         conduit conduit-extra containers data-default deepseq monad-control
+         resourcet text transformers xml-types
+       ];
+       testHaskellDepends = [
+         base blaze-markup bytestring conduit containers hspec HUnit
+         resourcet text transformers xml-types
+       ];
+       homepage = "http://github.com/snoyberg/xml";
+       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "xml-conduit-parse" = callPackage
@@ -216594,8 +219036,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-content-pdf";
-       version = "0.2.0.2";
-       sha256 = "867cb1a9bbbeff69bb8ae35659f780bcf057cb44a2b1f6c8e424d280a55a0fbb";
+       version = "0.2.0.3";
+       sha256 = "8c5874e54246a70f6fed205cf29b7a6068176f3af80a991a05b0adc532803230";
        libraryHaskellDepends = [
          base blaze-builder blaze-html bytestring conduit data-default
          directory network-uri process temporary transformers yesod-core
@@ -218192,7 +220634,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-newsfeed" = callPackage
+  "yesod-newsfeed_1_5" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , containers, shakespeare, text, time, xml-conduit, yesod-core
      }:
@@ -218207,6 +220649,24 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Helper functions and data types for producing News feeds";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-newsfeed" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
+     , containers, shakespeare, text, time, xml-conduit, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-newsfeed";
+       version = "1.6";
+       sha256 = "4e6dbc06002fe7fd13701941c036c51cf9407c35b28473ed509424bfc0b67516";
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup bytestring containers shakespeare text
+         time xml-conduit yesod-core
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Helper functions and data types for producing News feeds";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-paginate" = callPackage
@@ -218991,7 +221451,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-table" = callPackage
+  "yesod-table_2_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, contravariant, text
      , yesod-core
      }:
@@ -219005,6 +221465,23 @@ self: {
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-table" = callPackage
+    ({ mkDerivation, base, bytestring, containers, contravariant, text
+     , yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-table";
+       version = "2.0.2";
+       sha256 = "78876b5fac3a0c9725b1dad6ba44923abcce8e86930ee4c4c3f818a7e11d8877";
+       libraryHaskellDepends = [
+         base bytestring containers contravariant text yesod-core
+       ];
+       homepage = "https://github.com/andrewthad/yesod-table";
+       description = "HTML tables for Yesod";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-tableview" = callPackage
@@ -219829,6 +222306,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yoctoparsec" = callPackage
+    ({ mkDerivation, base, free, mtl }:
+     mkDerivation {
+       pname = "yoctoparsec";
+       version = "0.1.0.0";
+       sha256 = "d70739d3429dede8800290939dbd08d0e23cacb5717402ba93f931fa80e1335d";
+       libraryHaskellDepends = [ base free mtl ];
+       homepage = "https://github.com/mniip/yoctoparsec";
+       description = "A truly tiny monadic parsing library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yoko" = callPackage
     ({ mkDerivation, base, bifunctors, containers, invariant, kinds
      , mtl, records, semigroups, template-haskell, th-sccs, type-cereal
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 14464ceca80d7..58db9737d32cd 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -23,13 +23,34 @@
 # This will build mmorph and monadControl, and have the hoogle installation
 # refer to their documentation via symlink so they are not garbage collected.
 
-{ lib, stdenv, hoogle, rehoo
+{ lib, stdenv, hoogle, rehoo, writeText
 , ghc, packages ? [ ghc.ghc ]
 }:
 
 let
   inherit (stdenv.lib) optional;
   wrapper = ./hoogle-local-wrapper.sh;
+  isGhcjs = ghc.isGhcjs or false;
+  opts = lib.optionalString;
+  haddockExe =
+    if !isGhcjs
+    then "haddock"
+    else "haddock-ghcjs";
+  ghcName =
+    if !isGhcjs
+    then "ghc"
+    else "ghcjs";
+  docLibGlob =
+    if !isGhcjs
+    then ''share/doc/ghc*/html/libraries''
+    else ''doc/lib'';
+  # On GHCJS, use a stripped down version of GHC's prologue.txt
+  prologue =
+    if !isGhcjs
+    then "${ghc}/${docLibGlob}/prologue.txt"
+    else writeText "ghcjs-prologue.txt" ''
+      This index includes documentation for many Haskell modules.
+    '';
 in
 stdenv.mkDerivation {
   name = "hoogle-local-0.1";
@@ -58,17 +79,19 @@ stdenv.mkDerivation {
     }
 
     echo importing builtin packages
-    for docdir in ${ghc}/share/doc/ghc*/html/libraries/*; do
+    for docdir in ${ghc}/${docLibGlob}/*; do
+      name="$(basename $docdir)"
+      ${opts isGhcjs ''docdir="$docdir/html"''}
       if [[ -d $docdir ]]; then
         import_dbs $docdir
-        ln -sfn $docdir $out/share/doc/hoogle
+        ln -sfn $docdir $out/share/doc/hoogle/$name
       fi
     done
 
     echo importing other packages
     for i in $docPackages; do
       if [[ ! $i == $out ]]; then
-        for docdir in $i/share/doc/*-ghc-*/* $i/share/doc/*; do
+        for docdir in $i/share/doc/*-${ghcName}-*/* $i/share/doc/*; do
           name=`basename $docdir`
           docdir=$docdir/html
           if [[ -d $docdir ]]; then
@@ -99,9 +122,9 @@ stdenv.mkDerivation {
         args="$args --read-interface=$name_version,$hdfile"
     done
 
-    ${ghc}/bin/haddock --gen-index --gen-contents -o . \
+    ${ghc}/bin/${haddockExe} --gen-index --gen-contents -o . \
          -t "Haskell Hierarchical Libraries" \
-         -p ${ghc}/share/doc/ghc*/html/libraries/prologue.txt \
+         -p ${prologue} \
          $args
 
     echo finishing up
diff --git a/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch b/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch
deleted file mode 100644
index 14f7e51fdf2cc..0000000000000
--- a/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur hans-2.5.0.0/hans.cabal hans-2.5.0.1/hans.cabal
---- hans-2.5.0.0/hans.cabal     2015-08-06 14:48:45.453072822 +0300
-+++ hans-2.5.0.1/hans.cabal     2015-08-06 14:49:13.044391528 +0300
-@@ -30,6 +30,7 @@
-         description:    Build the example program
-
- flag web-server
-+        default:        False
-         description:    Build a simple web-server example
-
- flag word32-in-random
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index e723133e256dc..f1e2315d79417 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -1,45 +1,35 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, sbcl }:
+
+stdenv.mkDerivation rec {
+  name = "acl2-${version}";
+  version = "v6-5";
 
-  version = a.lib.attrByPath ["version"] "v6-5" a; 
-  buildInputs = with a; [
-    sbcl
-  ];
-in
-rec {
   src = fetchurl {
     url = "http://www.cs.utexas.edu/users/moore/acl2/${version}/distrib/acl2.tar.gz";
     sha256 = "19kfclgpdyms016s06pjf3icj3mx9jlcj8vfgpbx2ac4ls0ir36g";
     name = "acl2-${version}.tar.gz";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [ sbcl ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doDeploy" "doBuild"];
-  
-  makeFlags = ["LISP='${a.sbcl}/bin/sbcl'"];
+  phases = "unpackPhase installPhase";
 
   installSuffix = "acl2";
-  doDeploy = (a.simplyShare installSuffix);
-  doBuild = a.fullDepEntry (''
+
+  installPhase = ''
+    mkdir -p $out/share/${installSuffix}
+    cp -R . $out/share/${installSuffix}
     cd $out/share/${installSuffix}
-    make LISP='${a.sbcl}/bin/sbcl --dynamic-space-size 2000'
-    make LISP='${a.sbcl}/bin/sbcl --dynamic-space-size 2000' regression
-    mkdir -p "$out/bin"
-    cp saved_acl2 "$out/bin/acl2"
-  '') ["doDeploy" "addInputs" "defEnsureDir"];
-      
-  name = "acl2-" + version;
+    make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000'
+    make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000' regression
+    make LISP=${sbcl}/bin/sbcl TAGS
+    mkdir -p $out/bin
+    cp saved_acl2 $out/bin/acl2
+  '';
+
   meta = {
     description = "An interpreter and a prover for a Lisp dialect";
-    maintainers = with a.lib.maintainers; 
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = with stdenv.lib.maintainers; [ raskin ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
new file mode 100644
index 0000000000000..4eb86460be9a8
--- /dev/null
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "bats-${version}";
+  version = "0.4.0";
+
+  src = fetchzip {
+    url = "https://github.com/sstephenson/bats/archive/v${version}.tar.gz";
+    sha256 = "05xpvfm0xky1532i3hd2l3wznxzh99bv2hxgykwdpxh18h6jr6jm";
+  };
+
+  installPhase = "./install.sh $out";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/sstephenson/bats;
+    description = "Bash Automated Testing System";
+    maintainers = [ maintainers.lnl7 ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 34e7bdc06a96a..51eef4ceb13f5 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "elixir-${version}";
-  version = "1.2.0";
+  version = "1.2.2";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "0s3j7ra9gb2p3dwgfxghvc9mkv6ffgvz27aj5wgwk0xq2d9fws4z";
+    sha256 = "0ml0sl1l5ibb8qh505fsd7y87wq9qjvaxw9y1dyfcw00d3i1z989";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index bc76abb454609..1d05f9406b450 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -3,17 +3,17 @@
 stdenv.mkDerivation rec {
   name = "jruby-${version}";
 
-  version = "1.7.21";
+  version = "9.0.5.0";
 
   src = fetchurl {
-    url = "http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz";
-    sha1 = "4955b69a913b22f96bd599eff2a133d8d1ed42c6";
+    url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
+    sha256 = "1wysymqzc7591743f2ycgwpm232y6i050izn72lck44nhnyr5wwy";
   };
 
   buildInputs = [ makeWrapper ];
 
   installPhase = ''
-     mkdir -pv $out
+     mkdir -pv $out/docs
      mv * $out
      rm $out/bin/*.{bat,dll,exe,sh}
      mv $out/COPYING $out/LICENSE* $out/docs
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 3ce29440bf501..9448c4c159a1f 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -293,19 +293,14 @@ let
 
 in {
 
-  php54 = generic {
-    version = "5.4.45";
-    sha256 = "10k59j7zjx2mrldmgfvjrrcg2cslr2m68azslspcz5acanqjh3af";
-  };
-
   php55 = generic {
-    version = "5.5.31";
-    sha256 = "0xx23gb70jsgbd772hy8f79wh2rja617s17gnx4vgklxk8mkhjpv";
+    version = "5.5.32";
+    sha256 = "1vljdvyqsq0vas4yhvpqycqyxl2gfndbmak6cfgxn1cfvc4c3wmh";
   };
 
   php56 = generic {
-    version = "5.6.17";
-    sha256 = "0fyxg95m918ngi6lnxyfb4y0ii4f8f5znb5l4axpagp6l5b5zd3p";
+    version = "5.6.18";
+    sha256 = "1vgl2zjq6ws5cjjb3llhwpfwg9gasq3q84ibdv9hj8snm4llmkf3";
   };
 
   php70 = generic {
diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index dc9323f40efd2..cd1631e23a16e 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "rakudo-star-${version}";
-  version = "2015.03";
+  version = "2015.11";
 
   src = fetchurl {
     url    = "http://rakudo.org/downloads/star/${name}.tar.gz";
-    sha256 = "1fwvmjyc1bv3kq7p25xyl4sqinp19mbrspmf0h7rvxlwnfcrr5mv";
+    sha256 = "1rzabg8daxf2g4l1njhdv3gfav91mp3y9my0mpz2xw06cxqfsjki";
   };
 
   buildInputs = [ icu zlib gmp readline jdk perl ];
diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix
index b5a49043c60b0..245090e66e1ac 100644
--- a/pkgs/development/interpreters/ruby/bundix/default.nix
+++ b/pkgs/development/interpreters/ruby/bundix/default.nix
@@ -1,20 +1,44 @@
-{ ruby, fetchgit, buildRubyGem, bundler }:
+{ buildRubyGem, lib, bundler, ruby, nix, nix-prefetch-scripts }:
 
-let
-  thor = buildRubyGem {
-    gemName = "thor";
-    version = "0.19.1";
-    type = "gem";
-    sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
-  };
+buildRubyGem rec {
+  inherit ruby;
 
-in buildRubyGem {
+  name = "${gemName}-${version}";
   gemName = "bundix";
-  version = "1.0.4";
-  gemPath = [ thor bundler ];
-  src = fetchgit {
-    url = "https://github.com/cstrahan/bundix.git";
-    rev = "6dcf1f71c61584f5c9b919ee9df7b0c554862076";
-    sha256 = "1w17bvc9srcgr4ry81ispcj35g9kxihbyknmqp8rnd4h5090b7b2";
+  version = "2.0.5";
+
+  sha256 = "0bsynhr44jz6nih0xn7v32h1qvywnb5335ka208gn7jp6bjwabhy";
+
+  buildInputs = [bundler];
+
+  postInstall = ''
+    gem_root=$GEM_HOME/gems/${gemName}-${version}
+    sed \
+      -e 's|NIX_INSTANTIATE =.*|NIX_INSTANTIATE = "${nix}/bin/nix-instantiate"|' \
+      -i $gem_root/lib/bundix.rb
+    sed \
+      -e 's|NIX_HASH =.*|NIX_HASH = "${nix}/bin/nix-hash"|' \
+      -i $gem_root/lib/bundix.rb
+    sed \
+      -e 's|NIX_PREFETCH_URL =.*|NIX_PREFETCH_URL = "${nix}/bin/nix-prefetch-url"|' \
+      -i $gem_root/lib/bundix.rb
+    sed \
+      -e 's|NIX_PREFETCH_GIT =.*|NIX_PREFETCH_GIT = "${nix-prefetch-scripts}/bin/nix-prefetch-git"|' \
+      -i $gem_root/lib/bundix.rb
+  '';
+
+  meta = {
+    inherit version;
+    description = "Creates Nix packages from Gemfiles";
+    longDescription = ''
+      This is a tool that converts Gemfile.lock files to nix expressions.
+
+      The output is then usable by the bundlerEnv derivation to list all the
+      dependencies of a ruby package.
+    '';
+    homepage = "https://github.com/manveru/bundix";
+    license = "MIT";
+    maintainers = with lib.maintainers; [ manveru zimbatm ];
+    platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index e5e17e142f415..4ffef385a0db1 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -255,4 +255,16 @@ in {
       git = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx";
     };
   };
+
+  ruby_2_3_0 = generic {
+    majorVersion = "2";
+    minorVersion = "3";
+    teenyVersion = "0";
+    patchLevel = "0";
+    sha256 = {
+      # src = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx";
+      src = "01z5cya4a7y751d4pb3aak5qcwmmvnwkbgz9z171p8hsbw7acnxs";
+      git = "0nl0pp96m0jxi422mqx09jqn9bff90pzz0xxa0ikrx7by0g00npg";
+    };
+  };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 286301dc0a5d4..18e2ab9231ad0 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -141,4 +141,9 @@ rec {
     "${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
+  "2.3.0" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.3.0/railsexpress/01-skip-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.3.0/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.3.0/railsexpress/03-display-more-detailed-stack-trace.patch"
+  ];
 }
diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
index f12402f0a0b79..238a70b5d8073 100644
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@@ -3,6 +3,6 @@
 fetchFromGitHub {
   owner  = "skaes";
   repo   = "rvm-patchsets";
-  rev    = "8ccf24490fec2218374734520c27d925078096de";
-  sha256 = "88418484d2d3963975190836eafb2e28206e3e2bac9ee7c6208645bfe7428e2f";
+  rev    = "84d0634ce5639781c4d8e9396ec20341d6524901";
+  sha256 = "06x2r43i8kpcmk6s5idrc3z49p8vy18b2lsh1jdqla69i5z2vqlf";
 }
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index fbc446bcabcc0..e9bbe34f75412 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -38,12 +38,13 @@ stdenv.mkDerivation rec {
     optional alsaSupport alsaLib ++
     optional stdenv.isLinux libcap ++
     optional openglSupport mesa ++
-    optional pulseaudioSupport libpulseaudio;
+    optional pulseaudioSupport libpulseaudio ++
+    optional stdenv.isDarwin Cocoa;
 
   buildInputs = let
     notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
   in optional notMingw audiofile
-  ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa ];
+  ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ];
 
   # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
   # we must arrange to add it to its RPATH; however, `patchelf' seems
diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix
index 696b6bd0ac8f5..9dc6b9983e66d 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/pkgs/development/libraries/SDL_ttf/default.nix
@@ -1,18 +1,33 @@
-{ stdenv, fetchurl, SDL, freetype }:
+{ stdenv, fetchurl, fetchpatch, SDL, freetype }:
 
-stdenv.mkDerivation {
-  name = "SDL_ttf-2.0.11";
+stdenv.mkDerivation rec {
+  name = "SDL_ttf-${version}";
+  version = "2.0.11";
 
   src = fetchurl {
-    url = http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz;
+    url = "http://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz";
     sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j";
   };
 
-  buildInputs = [SDL freetype];
+  patches = [
+    # Bug #830: TTF_RenderGlyph_Shaded is broken
+    (fetchpatch {
+      url = "https://bugzilla-attachments.libsdl.org/attachment.cgi?id=830";
+      sha256 = "0cfznfzg1hs10wl349z9n8chw80i5adl3iwhq4y102g0xrjyb72d";
+    })
+  ];
+
+  patchFlags = [ "-p0" ];
+
+  buildInputs = [ SDL freetype ];
 
   postInstall = "ln -s $out/include/SDL/SDL_ttf.h $out/include/";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "SDL TrueType library";
+    license = licenses.zlib;
+    platforms = platforms.all;
+    homepage = https://www.libsdl.org/projects/SDL_ttf/release-1.2.html;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index 4055708907b9f..29b31a8b492c2 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://savannah.nongnu.org/projects/acl;
     description = "Library and tools for manipulating access control lists";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index e4e9142b63285..2bb5b2d258070 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://savannah.nongnu.org/projects/attr/;
     description = "Library and tools for manipulating extended attributes";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
index 94edc46fc4c5e..614d57002cd2f 100644
--- a/pkgs/development/libraries/cdk/default.nix
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -1,18 +1,23 @@
-{stdenv, fetchurl, ncurses}:
+{ stdenv, fetchurl, ncurses }:
+
 let
+  version = "5.0-20160131";
+in
+stdenv.mkDerivation {
+  name = "cdk-${version}";
+  inherit version;
+
   buildInputs = [
     ncurses
   ];
-in
-stdenv.mkDerivation {
-  name = "cdk";
-  inherit buildInputs;
+
   src = fetchurl {
-    url = "http://invisible-island.net/datafiles/release/cdk.tar.gz";
-    sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
+    url = "ftp://invisible-island.net/cdk/cdk-${version}.tgz";
+    sha256 = "08ic2f5rmi8niaxwxwr6l6lhpan7690x52vpldnbjcf20rc0fbf3";
   };
+
   meta = {
-    description = ''Curses development kit'';
+    description = "Curses development kit";
     license = stdenv.lib.licenses.bsdOriginal ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 982deb29ea8c0..c6523921fb56f 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "cln-1.3.3";
+  name = "cln-${version}";
+  version = "1.3.4";
 
   src = fetchurl {
     url = "${meta.homepage}${name}.tar.bz2";
-    sha256 = "04i6kdjwm4cr5pa70pilifnpvsh430rrlapkgw1x8c5vxkijxz2p";
+    sha256 = "0j5p18hwbbrchsdbnc8d2bf9ncslhflri4i950gdnq7v6g2dg69d";
   };
 
   buildInputs = [ gmp ];
diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix
new file mode 100644
index 0000000000000..4e3f5b219e92b
--- /dev/null
+++ b/pkgs/development/libraries/cmocka/default.nix
@@ -0,0 +1,48 @@
+{ fetchurl, stdenv, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "cmocka-${version}";
+  version = "1.0.1";
+
+  src = fetchurl {
+    url = "https://cmocka.org/files/1.0/cmocka-${version}.tar.xz";
+    sha256 = "0fvm6rdalqcxckbddch8ycdw6n2ckldblv117n09chi2l7bm0q5k";
+  };
+
+  buildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Lightweight library to simplify and generalize unit tests for C";
+
+    longDescription =
+      ''There are a variety of C unit testing frameworks available however
+        many of them are fairly complex and require the latest compiler
+        technology.  Some development requires the use of old compilers which
+        makes it difficult to use some unit testing frameworks. In addition
+        many unit testing frameworks assume the code being tested is an
+        application or module that is targeted to the same platform that will
+        ultimately execute the test.  Because of this assumption many
+        frameworks require the inclusion of standard C library headers in the
+        code module being tested which may collide with the custom or
+        incomplete implementation of the C library utilized by the code under
+        test.
+
+        Cmocka only requires a test application is linked with the standard C
+        library which minimizes conflicts with standard C library headers.
+        Also, CMocka tries to avoid the use of some of the newer features of
+        C compilers.
+
+        This results in CMocka being a relatively small library that can be
+        used to test a variety of exotic code. If a developer wishes to
+        simply test an application with the latest compiler then other unit
+        testing frameworks may be preferable.
+
+        This is the successor of Google's Cmockery.'';
+
+    homepage = https://cmocka.org/;
+
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ kragniz ];
+  };
+}
diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix
index daa4f7fb9f213..00d3e45805cbd 100644
--- a/pkgs/development/libraries/hyena/default.nix
+++ b/pkgs/development/libraries/hyena/default.nix
@@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
     find -name Makefile.in | xargs -n 1 -d '\n' sed -e 's/^dnl/#/' -i
   '';
 
-  preConfigure = ''
-    substituteInPlace configure --replace gmcs mcs
-  '';
-
   dontStrip = true;
 
   inherit monoDLLFixer;
diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index 119a46bfc31d5..e12929e9f696d 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
+    url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2";
     sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm";
   };
 
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 419ba8de9e4dc..776cd0f5b91ff 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -1,4 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig, libpulseaudio, alsaLib, libcap
+, CoreAudio, CoreServices, AudioUnit
 , usePulseAudio }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +15,8 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig ] ++
     lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib) ++
-    lib.optional stdenv.isLinux libcap;
+    lib.optional stdenv.isLinux libcap ++
+    lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ];
 
   meta = {
     longDescription = ''
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
index 8cc2e8069320e..67428f1324954 100644
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
+    url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2";
     sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
   };
 
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 7d7689bf23ed9..08905455d3538 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/${baseName}/${version}/${name}.tar.bz2";
     sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg";
   };
 
diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix
new file mode 100644
index 0000000000000..526890ed56376
--- /dev/null
+++ b/pkgs/development/libraries/libcutl/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, xercesc }:
+with stdenv; with lib;
+mkDerivation rec {
+  name = "libcutl-${meta.major}.${meta.minor}";
+
+  meta = {
+    major = "1.9";
+    minor = "0";
+    description = "A collection of generic and independent components such as meta-programming tests, smart pointers, containers, compiler building blocks" ;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ];
+    license = licenses.mit;
+  };
+
+  src = fetchurl {
+    url = "http://codesynthesis.com/download/libcutl/1.9/${name}.tar.bz2";
+    sha1 = "0e8d255145afbc339a3284ef85a43f4baf3fec43";
+  };
+
+  buildInputs = [ xercesc ];
+}
diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix
index f8b9e9ecef904..ecfa14a43c9a5 100644
--- a/pkgs/development/libraries/libdvbpsi/default.nix
+++ b/pkgs/development/libraries/libdvbpsi/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-
-  name = "libdvbpsi-0.2.2";
+stdenv.mkDerivation rec {
+  name = "libdvbpsi-${version}";
+  version = "0.2.2";
 
   src = fetchurl {
-    url = http://download.videolan.org/pub/libdvbpsi/0.2.2/libdvbpsi-0.2.2.tar.bz2;
+    url = "http://get.videolan.org/libdvbpsi/${version}/${name}.tar.bz2";
     sha256 = "1lry2swxqm8mhq0a4rjnc819ngsf2pxnfjajb57lml7yr12j79ls";
   };
 
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index 8632da12c735c..d68b0a3675178 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -1,10 +1,11 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "libdvdcss-1.3.0";
-  
+stdenv.mkDerivation rec {
+  name = "libdvdcss-${version}";
+  version = "1.3.0";
+
   src = fetchurl {
-    url = http://download.videolan.org/pub/libdvdcss/1.3.0/libdvdcss-1.3.0.tar.bz2;
+    url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2";
     sha256 = "158k9zagmbk5bkbz96l6lwhh7xcgfcnzflkr4vblskhcab6llhbw";
   };
 
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index fe625aa69e12c..5c931f4d6f4c6 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "5.0.3";
 
   src = fetchurl {
-    url = "http://download.videolan.org/pub/videolan/libdvdnav/${version}/libdvdnav-${version}.tar.bz2";
+    url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2";
     sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d";
   };
 
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 311bc6dc4058f..493be4c8f86b6 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "5.0.2";
 
   src = fetchurl {
-    url = "http://download.videolan.org/pub/videolan/libdvdread/${version}/libdvdread-${version}.tar.bz2";
+    url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2";
     sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf";
   };
 
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 3279bf3d9fbeb..9c4f3705b3ed0 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "libgpg-error-1.20";
+  name = "libgpg-error-1.21";
 
   src = fetchurl {
     url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
-    sha256 = "08i5wxs6zlngjkv6s3dwm60w8mihxvi9agp6jfq7z6j1wdf8jrij";
+    sha256 = "0kdq2cbnk84fr4jqcv689rlxpbyl6bda2cn6y3ll19v3mlydpnxp";
   };
 
   postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";
diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index c1519ca5b8304..40bb9a5a140da 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline ];
   propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ];
 
-  patchPhase = ''sed -e 's@1\.3\.21@@' -i configure'';
+  patches = [ ./disable_sslv3.patch ];
+
+  postPatch = ''sed -e 's@1\.3\.21@@' -i configure'';
   passthru.swig = libplist.swig;
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch b/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch
new file mode 100644
index 0000000000000..646b829496fae
--- /dev/null
+++ b/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch
@@ -0,0 +1,25 @@
+From e19de4f0d4cb70e30017edfc6b4ca1b89ffbd381 Mon Sep 17 00:00:00 2001
+From: Franz Pletz <fpletz@fnordicwalking.de>
+Date: Thu, 14 Jan 2016 14:58:23 +0100
+Subject: [PATCH] Disable SSLv3
+
+---
+ src/idevice.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/idevice.c b/src/idevice.c
+index ce27495..8f03094 100644
+--- a/src/idevice.c
++++ b/src/idevice.c
+@@ -678,7 +678,7 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne
+ 	}
+ 	BIO_set_fd(ssl_bio, (int)(long)connection->data, BIO_NOCLOSE);
+ 
+-	SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv3_method());
++	SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv23_method());
+ 	if (ssl_ctx == NULL) {
+ 		debug_info("ERROR: Could not create SSL context.");
+ 		BIO_free(ssl_bio);
+-- 
+2.7.0
+
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 430743af96ad5..ce5614a46ff55 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -15,11 +15,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-1.1.1";
+  name = "libinput-1.1.6";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "05yxz3cds65zmzj98yhsrwvnkv8c7n3zs2fksjzs2fy7vlrv9qid";
+    sha256 = "0qqw988ippn8mihw9hy2ifzc77zdyhn5chzilp7pa9wlqh15wvzj";
   };
 
   configureFlags = [
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index 1dc4c57e979a9..535c5cfeb65b7 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -3,10 +3,10 @@
 
 let
 
-  listVersion = "2016-01-15";
+  listVersion = "2016-02-09";
   listSources = fetchFromGitHub {
-    sha256 = "1smn4fl0fhldy7gdn0k1diyghbxdxnr4cj921bjdl2i4wxas41g5";
-    rev = "77cb90dce70827bda40384e1ae8bff3c958daef3";
+    sha256 = "17jxkwdd2l6aycg2q5img8gad3pb9k6fgikf87dybl3ydn0bpdja";
+    rev = "73668f743df8125477d38690807e3a9a1e1e9f19";
     repo = "list";
     owner = "publicsuffix";
   };
diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix
new file mode 100644
index 0000000000000..19b490a0f1866
--- /dev/null
+++ b/pkgs/development/libraries/libsrs2/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libsrs2-${version}";
+  version = "1.0.18";
+
+  src = fetchurl {
+    url = "http://www.libsrs2.org/srs/libsrs2-${version}.tar.gz";
+    sha256 = "9d1191b705d7587a5886736899001d04168392bbb6ed6345a057ade50943a492";
+  };
+
+  meta = {
+    description = "The next generation SRS library from the original designer of SRS";
+    license = with lib.licenses; [ gpl2 bsd3 ];
+    homepage = http://www.libsrs2.org/;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix
new file mode 100644
index 0000000000000..57fb2cef35ea7
--- /dev/null
+++ b/pkgs/development/libraries/miniball/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "miniball-${version}";
+  version = "3.0";
+
+  src = fetchurl {
+    url = "https://www.inf.ethz.ch/personal/gaertner/miniball/Miniball.hpp";
+    sha256 = "1piap5v8wqq0aachrq6j50qkr01gzpyndl6vf661vyykrfq0nnd2";
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/include
+    cp $src $out/include/miniball.hpp
+  '';
+
+  meta = {
+    description = "Smallest Enclosing Balls of Points";
+    homepage = https://www.inf.ethz.ch/personal/gaertner/miniball.html;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.erikryb ];
+  };
+}
diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index 4d9e49a54d92a..89fdd334f9545 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     description= "Socket library that provides several common communication patterns";
     homepage = http://nanomsg.org/;
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/ncbi/default.nix b/pkgs/development/libraries/ncbi/default.nix
deleted file mode 100644
index 88f6740f7334a..0000000000000
--- a/pkgs/development/libraries/ncbi/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-a @ { tcsh, mesa, lesstif, libX11, libXaw, xproto, libXt, libSM, libICE, libXmu, libXext, ... }:
-let
-  fetchurl = a.fetchurl;
-
-  version = "20090809";
-  buildInputs = with a; [
-    tcsh libX11 libXaw lesstif xproto mesa libXt
-    libSM libICE libXmu libXext
-  ];
-in
-rec {
-  src = fetchurl {
-    url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools/old/${version}/ncbi.tar.gz";
-    sha256 = "05bbnqk6ffvhi556fsabcippzq2zrkynbk09qblzvfzip9hlk1qc";
-  };
-
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["preBuild" "build" "deploy"];
-
-  preBuild = a.fullDepEntry (''
-    sed -e 's@#!/bin/csh@#! ${a.tcsh}/bin/csh@' -i $(fgrep '#!/bin/csh' -rl build make)
-    sed -e '/set path/d' -i make/ln-if-absent
-    sed -e 's@/usr/include @${a.lesstif}/include ${a.mesa}/include @' -i make/makedis.csh
-    sed -e 's@/usr/[a-zA-Z0-9]*/include @@g; s@/usr/include/[a-zA-Z0-9/] @@g' -i make/makedis.csh 
-    cd ..
-  '') ["doUnpack" "minInit"];
-
-  build = a.fullDepEntry (''
-    ./ncbi/make/makedis.csh
-  '') ["preBuild" "addInputs"];
-
-  deploy = a.fullDepEntry (''
-    mkdir -p $out/bin $out/lib $out/include $out/source $out/share/${name}/build-snapshot
-    cd ncbi/build
-    cp *.o *.so $out/lib
-    cp -r . $out/share/${name}/build-snapshot
-    cp ../make/makedis.csh $out/share/${name}/build-snapshot
-    cp *.h $out/include 
-    cp *.c *.h $out/source
-    find . -perm -0100 -a '(' '(' ! -name '*.*' ')' -o '(' -name '*.REAL' ')' ')' -exec cp '{}' $out/bin ';'
-  '') ["defEnsureDir" "build" "minInit"];
-      
-  name = "NCBI-Toolbox-" + version;
-  meta = {
-    description = "NCBI general-purpose portable toolkit";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    #platforms = a.lib.platforms.linux ;
-  };
-}
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 96326bf1df059..a06d898d55726 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.21";
+  version = "3.22";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/${name}.tar.gz";
-    sha256 = "3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_22_RTM/src/${name}.tar.gz";
+    sha256 = "30ebd121c77e725a1383618eff79a6752d6e9f0f21882ad825ddab12e7227611";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix
deleted file mode 100644
index ac39ef2e84c10..0000000000000
--- a/pkgs/development/libraries/openal/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, alsaLib, cmake }:
-
-let version = "1.16.0"; in
-stdenv.mkDerivation rec {
-  name = "openal-${version}";
-
-  src = fetchurl {
-    url = "http://kcat.strangesoft.net/openal-releases/openal-soft-${version}.tar.bz2";
-    sha256 = "0pqdykdclycfnk66v166srjrry936y39d1dz9wl92qz27wqwsg9g";
-  };
-
-  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
-
-  meta = {
-    description = "Cross-platform 3D audio API";
-
-    longDescription = ''
-      OpenAL is a cross-platform 3D audio API appropriate for use with
-      gaming applications and many other types of audio applications.
-
-      The library models a collection of audio sources moving in a 3D
-      space that are heard by a single listener somewhere in that
-      space.  The basic OpenAL objects are a Listener, a Source, and a
-      Buffer.  There can be a large number of Buffers, which contain
-      audio data.  Each buffer can be attached to one or more Sources,
-      which represent points in 3D space which are emitting audio.
-      There is always one Listener object (per audio context), which
-      represents the position where the sources are heard -- rendering
-      is done from the perspective of the Listener.
-    '';
-
-    homepage = http://kcat.strangesoft.net/openal.html;
-    license = stdenv.lib.licenses.lgpl2Plus;
-  };
-}
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index 717e5a4de2cf6..1b4b4af7f41c3 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     description = "Open-source JPEG 2000 codec written in C language";
     homepage = http://www.openjpeg.org/;
     license = licenses.bsd2;
-    maintainer = with maintainers; [ codyopel ];
+    maintainers = with maintainers; [ codyopel ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
new file mode 100644
index 0000000000000..b610f27d17cf9
--- /dev/null
+++ b/pkgs/development/libraries/openssl/chacha.nix
@@ -0,0 +1,70 @@
+{ stdenv, fetchFromGitHub, perl, zlib
+, withCryptodev ? false, cryptodevHeaders
+}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "openssl-chacha-${version}";
+  version = "2016-01-27";
+
+  src = fetchFromGitHub {
+    owner = "PeterMosmans";
+    repo = "openssl";
+    rev = "4576ede5b08242bcd6749fc284c691ed177842b7";
+    sha256 = "1030rs4bdaysxbq0mmck1dn6g5adspzkwsrnhvv16b4ig0r4ncgj";
+  };
+
+  nativeBuildInputs = [ perl zlib ];
+  buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
+
+  configureScript = "./config";
+
+  configureFlags = [
+    "zlib"
+    "shared"
+    "experimental-jpake"
+    "enable-md2"
+    "enable-rc5"
+    "enable-rfc3779"
+    "enable-gost"
+    "--libdir=lib"
+    "--openssldir=etc/ssl"
+  ] ++ stdenv.lib.optionals withCryptodev [
+    "-DHAVE_CRYPTODEV"
+    "-DUSE_CRYPTODEV_DIGESTS"
+  ];
+
+  makeFlags = [
+    "MANDIR=$(out)/share/man"
+  ];
+
+  # Parallel building is broken in OpenSSL.
+  enableParallelBuilding = false;
+
+  postInstall = ''
+    # If we're building dynamic libraries, then don't install static
+    # libraries.
+    if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
+        rm "$out/lib/"*.a
+    fi
+
+    # remove dependency on Perl at runtime
+    rm -r $out/etc/ssl/misc $out/bin/c_rehash
+  '';
+
+  postFixup = ''
+    # Check to make sure we don't depend on perl
+    if grep -r '${perl}' $out; then
+      echo "Found an erroneous dependency on perl ^^^" >&2
+      exit 1
+    fi
+  '';
+
+  meta = {
+    homepage = http://www.openssl.org/;
+    description = "A cryptographic library that implements the SSL and TLS protocols";
+    platforms = [ "x86_64-linux" ];
+    maintainers = [ stdenv.lib.maintainers.cstrahan ];
+    priority = 10; # resolves collision with ‘man-pages’
+  };
+}
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
index 9866c0a67ce36..98aa7d81b368c 100644
--- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     homepage = http://phonon.kde.org/;
     description = "GStreamer backend for Phonon";
     platforms = platforms.linux;
-    maintainer = with maintainers; [ ttuegel ];
+    maintainers = with maintainers; [ ttuegel ];
   };
 }
diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
index b866a347d95e9..6ce2d9e2ffe0d 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ stdenv, fetchurl, cmake, shared ? false }:
 
 stdenv.mkDerivation rec {
   name = "pugixml-${version}";
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "${name}/scripts";
 
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ];
+
   preConfigure = ''
     # Enable long long support (required for filezilla)
     sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' ../src/pugiconfig.hpp
diff --git a/pkgs/development/libraries/science/math/openblas/0.2.14.nix b/pkgs/development/libraries/science/math/openblas/0.2.14.nix
new file mode 100644
index 0000000000000..2fac8a4db08b8
--- /dev/null
+++ b/pkgs/development/libraries/science/math/openblas/0.2.14.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchurl, gfortran, perl, which, config, coreutils
+# Most packages depending on openblas expect integer width to match pointer width,
+# but some expect to use 32-bit integers always (for compatibility with reference BLAS).
+, blas64 ? null
+}:
+
+with stdenv.lib;
+
+let blas64_ = blas64; in
+
+let local = config.openblas.preferLocalBuild or false;
+    binary =
+      { i686-linux = "32";
+        x86_64-linux = "64";
+        x86_64-darwin = "64";
+      }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
+    genericFlags =
+      [ "DYNAMIC_ARCH=1"
+        "NUM_THREADS=64"
+      ];
+    localFlags = config.openblas.flags or
+      optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ];
+    blas64 = if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.system;
+
+    version = "0.2.14";
+in
+stdenv.mkDerivation {
+  name = "openblas-${version}";
+  src = fetchurl {
+    url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz";
+    sha256 = "2411c4f56f477b42dff54db2b7ffc0b7cf53bb9778d54982595c64cc69c40fc1";
+    name = "openblas-${version}.tar.gz";
+  };
+
+  inherit blas64;
+
+  nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl which];
+
+  makeFlags =
+    (if local then localFlags else genericFlags)
+    ++
+    optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.9"]
+    ++
+    [
+      "FC=gfortran"
+      # Note that clang is available through the stdenv on OSX and
+      # thus is not an explicit dependency.
+      "CC=${if stdenv.isDarwin then "clang" else "gcc"}"
+      ''PREFIX="''$(out)"''
+      "BINARY=${binary}"
+      "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}"
+      "INTERFACE64=${if blas64 then "1" else "0"}"
+    ];
+
+  doCheck = true;
+  checkTarget = "tests";
+
+  meta = with stdenv.lib; {
+    description = "Basic Linear Algebra Subprograms";
+    license = licenses.bsd3;
+    homepage = "https://github.com/xianyi/OpenBLAS";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/swc/default.nix b/pkgs/development/libraries/swc/default.nix
new file mode 100644
index 0000000000000..48e1524e36fca
--- /dev/null
+++ b/pkgs/development/libraries/swc/default.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchurl, pkgconfig
+, wld, wayland, xwayland, fontconfig, pixman, libdrm, libinput, libevdev, libxkbcommon, libxcb, xcbutilwm
+}:
+
+stdenv.mkDerivation rec {
+  name = "swc-${version}";
+  version = "git-2016-02-09";
+  repo = "https://github.com/michaelforney/swc";
+  rev = "1da0ef13fddc572accea12439a4471b4d2f64ddd";
+
+  src = fetchurl {
+    url = "${repo}/archive/${rev}.tar.gz";
+    sha256 = "d1894612d8aa1ce828efb78f1570290f84bba6563e21eb777e08c3c3859b7bbe";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ wld wayland xwayland fontconfig pixman libdrm libinput libevdev libxkbcommon libxcb xcbutilwm ];
+
+  makeFlags = "PREFIX=$(out)";
+  installPhase = "PREFIX=$out make install";
+
+  meta = {
+    description = "A library for making a simple Wayland compositor";
+    homepage    = repo;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index 12741379aaaa1..b6ca281f05308 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -1,14 +1,14 @@
 { fetchurl,  stdenv, flex }:
 
 stdenv.mkDerivation rec {
-  version = "5.13";
+  version = "5.14";
   name = "wcslib-${version}";
 
   buildInputs = [ flex ];
 
   src = fetchurl {
     url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
-    sha256 ="1rxlp7p1b84r9fnk7m9p2ivg2cajfj88afyccrg64zlrqn5kx66n";
+    sha256 ="0zz3747m6gjzglgsqrrslwk2qkb6swsx8gmaxa459dvbcg914gsd";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix
new file mode 100644
index 0000000000000..b219bd2f44d70
--- /dev/null
+++ b/pkgs/development/libraries/wlc/default.nix
@@ -0,0 +1,68 @@
+{ lib, stdenv, fetchurl, fetchgit, cmake, pkgconfig
+, glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs
+, libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm
+}:
+
+stdenv.mkDerivation rec {
+  name = "wlc-${version}";
+  version = "git-2016-01-31";
+  repo = "https://github.com/Cloudef/wlc";
+  rev = "faa4d3cba670576c202b0844e087b13538f772c5";
+
+  chck_repo = "https://github.com/Cloudef/chck";
+  chck_rev = "fe5e2606b7242aa5d89af2ea9fd048821128d2bc";
+
+  wl_protos_repo = "git://anongit.freedesktop.org/wayland/wayland-protocols";
+  wl_protos_rev = "0b05b70f9da245582f01581be4ca36db683682b8";
+  wl_protos_rev_short = "0b05b70";
+
+  srcs = [
+   (fetchurl {
+     url = "${repo}/archive/${rev}.tar.gz";
+     sha256 = "cdf6a772dc90060d57aa1a915a4daff0f79802c141fec92ef2710245d727af67";
+   })
+   (fetchurl {
+     url = "${chck_repo}/archive/${chck_rev}.tar.gz";
+     sha256 = "ca316b544c48e837c32f08d613be42da10e0a3251e8e4488d1848b91ef92ab9e";
+   })
+   (fetchgit {
+     url = "${wl_protos_repo}";
+     rev = "${wl_protos_rev}";
+     sha256 = "9c1cfbb570142b2109ecef4d11b17f25e94ed2e0569f522ea56f244c60465224";
+   })
+  ];
+
+  sourceRoot = "wlc-${rev}";
+  postUnpack = ''
+    rm -rf wlc-${rev}/lib/chck wlc-${rev}/protos/wayland-protocols
+    ln -s ../../chck-${chck_rev} wlc-${rev}/lib/chck
+    ln -s ../../wayland-protocols-${wl_protos_rev_short} wlc-${rev}/protos/wayland-protocols
+  '';
+
+  patchPhase = ''
+    ( echo '#include <stdlib.h>';
+      echo '#include <libdrm/drm.h>';
+      cat src/platform/backend/drm.c
+    ) >src/platform/backend/drm.c-fix;
+    mv src/platform/backend/drm.c-fix src/platform/backend/drm.c;
+  '';
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev
+    libpthreadstubs libX11 libXau libXdmcp libXext libXdamage libxshmfence libXxf86vm
+    systemd dbus_libs
+  ];
+
+  makeFlags = "PREFIX=$(out) -lchck";
+  installPhase = "PREFIX=$out make install";
+
+  meta = {
+    description = "A library for making a simple Wayland compositor";
+    homepage    = repo;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/development/libraries/wld/default.nix b/pkgs/development/libraries/wld/default.nix
new file mode 100644
index 0000000000000..1dd5858ec7201
--- /dev/null
+++ b/pkgs/development/libraries/wld/default.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchurl, pkgconfig
+, wayland, fontconfig, pixman, freetype, libdrm
+}:
+
+stdenv.mkDerivation rec {
+  name = "wld-${version}";
+  version = "git-2015-09-01";
+  repo = "https://github.com/michaelforney/wld";
+  rev = "efe0a1ed1856a2e4a1893ed0f2d7dde43b5627f0";
+
+  src = fetchurl {
+    url = "${repo}/archive/${rev}.tar.gz";
+    sha256 = "09388f7828e18c75e7b8d41454903886a725d7a868f60e66c128bd7d2e953ee1";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ wayland fontconfig pixman freetype libdrm ];
+
+  makeFlags = "PREFIX=$(out)";
+  installPhase = "PREFIX=$out make install";
+
+  meta = {
+    description = "A primitive drawing library targeted at Wayland";
+    homepage    = repo;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index 26e3231450344..754b76de06174 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, yasm, enable10bit ? false}:
 
 stdenv.mkDerivation rec {
-  version = "snapshot-20141218-2245-stable";
-  name = "x264-20141218-2245";
+  version = "20141218-2245";
+  name = "x264-${version}";
 
   src = fetchurl {
-    url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";
+    url = "http://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2";
     sha256 = "1gp1f0382vh2hmgc23ldqyywcfljg8lsgl2849ymr14r6gxfh69m";
   };
 
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 1feba886764ca..08a5b567d47c7 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -19,7 +19,10 @@ stdenv.mkDerivation rec {
   version = "1.7";
 
   src = fetchurl {
-    url = "https://github.com/videolan/x265/archive/${version}.tar.gz";
+    urls = [
+      "http://get.videolan.org/x265/x265_${version}.tar.gz"
+      "https://github.com/videolan/x265/archive/${version}.tar.gz"
+    ];
     sha256 = "18w3whmbjlalvysny51kdq9b228iwg3rdav4kmifazksvrm4yacq";
   };
 
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 22e2e8716a62c..d99879d14a7ee 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,24 +1,16 @@
 { stdenv, fetchurl, libuuid, pkgconfig, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "zeromq-4.1.3";
+  name = "zeromq-4.1.4";
 
   src = fetchurl {
     url = "http://download.zeromq.org/${name}.tar.gz";
-    sha256 = "04gligbgr0phipjkwc0dyk1vr9306r6s4dbj85z7fxxk1n1ircv1";
+    sha256 = "0y73dxgf4kaysmkvrkxqq9qk5znklxyghh749jw4qbjwwbyl97z9";
   };
 
-  # Fix zeromq-4.1.3 with libsodium-1.0.6
-  postPatch = ''
-    sed -i 's/libzmq_werror="yes"/libzmq_werror="no"/' configure
-  '';
-
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libuuid libsodium ];
 
-  # https://github.com/zeromq/libzmq/commit/479db2113643e459c11db392e0fefd6400657c9e
-  patches = [ ./sodium_warning.patch ];
-
   meta = with stdenv.lib; {
     branch = "4";
     homepage = "http://www.zeromq.org";
diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index a99ab8d2d7952..fb25037e167d8 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -20,6 +20,28 @@ let
     security default-keychain -s login.keychain
     security delete-keychain $keychainName
   '';
+  
+  # On Mac OS X, the java executable shows an -unoffical postfix in the version
+  # number. This confuses the build script's version detector.
+  # We fix this by creating a wrapper that strips it out of the output.
+  
+  javaVersionFixWrapper = stdenv.mkDerivation {
+    name = "javaVersionFixWrapper";
+    buildCommand = ''
+      mkdir -p $out/bin
+      cat > $out/bin/javac <<EOF
+      #! ${stdenv.shell} -e
+      
+      if [ "\$1" = "-version" ]
+      then
+          ${jdk}/bin/javac "\$@" 2>&1 | sed "s|-unofficial||" | sed "s|-u60|_60|" >&2
+      else
+          exec ${jdk}/bin/javac "\$@"
+      fi
+      EOF
+      chmod +x $out/bin/javac
+    '';
+  };
 in
 stdenv.mkDerivation {
   name = stdenv.lib.replaceChars [" "] [""] name;
@@ -49,6 +71,13 @@ stdenv.mkDerivation {
     
     ${if target == "android" then
         ''
+          ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+            # Hack to make version detection work with OpenJDK on Mac OS X
+            export PATH=${javaVersionFixWrapper}/bin:$PATH
+            export JAVA_HOME=${javaVersionFixWrapper}
+            javac -version
+          ''}
+          
           titanium config --config-file $TMPDIR/config.json --no-colors android.sdk ${androidsdkComposition}/libexec/android-sdk-*
           titanium config --config-file $TMPDIR/config.json --no-colors android.buildTools.selectedVersion 23.0.1
           
@@ -155,14 +184,14 @@ stdenv.mkDerivation {
            ''
              cp -av build/iphone/build/* $out
              mkdir -p $out/nix-support
-             echo "file binary-dist \"$(echo $out/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products
+             echo "file binary-dist \"$(echo $out/Products/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products
              
              ${stdenv.lib.optionalString enableWirelessDistribution ''
-               appname=$(basename $out/Release-iphoneos/*.ipa .ipa)
+               appname=$(basename $out/Products/Release-iphoneos/*.ipa .ipa)
                bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
                version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
                
-               sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&amp;version=$version\&amp;title=$appname|" ${../xcodeenv/install.html.template} > $out/$appname.html
+               sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&amp;version=$version\&amp;title=$appname|" ${../xcodeenv/install.html.template} > "$out/$appname.html"
                echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
              ''}
            ''
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index 6dd80a216ded5..ffeefdbbbcfa3 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -5,17 +5,16 @@
 , tiVersion ? "5.1.2.GA"
 , rename ? false
 , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2"
-, allowUnfree ? false
 , enableWirelessDistribution ? false, installURL ? null
 }:
 
 let
-  pkgs = import nixpkgs { config.allowUnfree = allowUnfree; };
+  pkgs = import nixpkgs {};
 in
 rec {
   kitchensink_android_debug = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
+    pkgs = import nixpkgs { inherit system; };
   in
   import ./kitchensink {
     inherit (pkgs) fetchgit;
@@ -26,7 +25,7 @@ rec {
   
   kitchensink_android_release = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
+    pkgs = import nixpkgs { inherit system; };
   in
   import ./kitchensink {
     inherit (pkgs) fetchgit;
@@ -38,7 +37,7 @@ rec {
   
   emulate_kitchensink_debug = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
+    pkgs = import nixpkgs { inherit system; };
   in
   import ./emulate-kitchensink {
     inherit (pkgs) androidenv;
@@ -47,7 +46,7 @@ rec {
   
   emulate_kitchensink_release = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
+    pkgs = import nixpkgs { inherit system; };
   in
   import ./emulate-kitchensink {
     inherit (pkgs) androidenv;
@@ -74,7 +73,7 @@ rec {
   };
 } else {}) // (if rename then
   let
-    pkgs = import nixpkgs { system = "x86_64-darwin"; config.allowUnfree = allowUnfree; };
+    pkgs = import nixpkgs { system = "x86_64-darwin"; };
   in
   {
     kitchensink_ipa = import ./kitchensink {
diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix
index 6fdbbc346d925..0d9b657969d1b 100644
--- a/pkgs/development/ocaml-modules/x509/default.nix
+++ b/pkgs/development/ocaml-modules/x509/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchzip, ocaml, findlib, asn1-combinators, nocrypto, ounit }:
 
-let version = "0.4.0"; in
+let version = "0.5.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml-x509-${version}";
 
   src = fetchzip {
     url = "https://github.com/mirleft/ocaml-x509/archive/${version}.tar.gz";
-    sha256 = "0z4c19y625ipx2anpq25pzly1fdi3cklhk130kriybrczvmd2b29";
+    sha256 = "0i9618ph4i2yk5dvvhiqhm7wf3qmd6b795mxwff8jf856gb2gdyn";
   };
 
   buildInputs = [ ocaml findlib ounit ];
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 43f8cca4c8279..c0e5ae0ec7741 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -2,8 +2,8 @@
 
 let
   wheel_source = fetchurl {
-    url = "https://pypi.python.org/packages/py2.py3/w/wheel/wheel-0.26.0-py2.py3-none-any.whl";
-    sha256 = "1sl642ncvipqx0hzypvl5hsiqngy0sib0kq242g4mic7vnid6bn9";
+    url = "https://pypi.python.org/packages/py2.py3/w/wheel/wheel-0.29.0-py2.py3-none-any.whl";
+    sha256 = "ea8033fc9905804e652f75474d33410a07404c1a78dd3c949a66863bd1050ebd";
   };
   setuptools_source = fetchurl {
     url = "https://pypi.python.org/packages/3.5/s/setuptools/setuptools-19.4-py2.py3-none-any.whl";
@@ -11,11 +11,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "python-${python.version}-bootstrapped-pip-${version}";
-  version = "7.1.2";
+  version = "8.0.2";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/py2.py3/p/pip/pip-${version}-py2.py3-none-any.whl";
-    sha256 = "133hx6jaspm6hd02gza66lng37l65yficc2y2x1gh16fbhxrilxr";
+    sha256 = "249a6f3194be8c2e8cb4d4be3f6fd16a9f1e3336218caffa8e7419e3816f9988";
   };
 
   unpackPhase = ''
@@ -27,12 +27,6 @@ in stdenv.mkDerivation rec {
 
   patchPhase = ''
     mkdir -p $out/bin
-
-    # patch pip to support "pip install --prefix"
-    # https://github.com/pypa/pip/pull/3252
-    pushd $out/${python.sitePackages}/
-    patch -p1 < ${./pip-7.0.1-prefix.patch}
-    popd
   '';
 
   buildInputs = [ python makeWrapper unzip ];
diff --git a/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch b/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch
deleted file mode 100644
index 21936ec99e6be..0000000000000
--- a/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-commit e87c83d95bb91acdca92202e94488ca51a70e059
-Author: Domen Kožar <domen@dev.si>
-Date:   Mon Nov 16 17:39:44 2015 +0100
-
-    WIP
-
-diff --git a/pip/commands/install.py b/pip/commands/install.py
-index dbcf100..05d5a08 100644
---- a/pip/commands/install.py
-+++ b/pip/commands/install.py
-@@ -139,6 +139,13 @@ class InstallCommand(RequirementCommand):
-                  "directory.")
- 
-         cmd_opts.add_option(
-+            '--prefix',
-+            dest='prefix_path',
-+            metavar='dir',
-+            default=None,
-+            help="Installation prefix where lib, bin and other top-level folders are placed")
-+
-+        cmd_opts.add_option(
-             "--compile",
-             action="store_true",
-             dest="compile",
-@@ -309,6 +316,7 @@ class InstallCommand(RequirementCommand):
-                             install_options,
-                             global_options,
-                             root=options.root_path,
-+                            prefix=options.prefix_path,
-                         )
-                         reqs = sorted(
-                             requirement_set.successfully_installed,
-diff --git a/pip/locations.py b/pip/locations.py
-index 4e6f65d..43aeb1f 100644
---- a/pip/locations.py
-+++ b/pip/locations.py
-@@ -163,7 +163,7 @@ site_config_files = [
- 
- 
- def distutils_scheme(dist_name, user=False, home=None, root=None,
--                     isolated=False):
-+                     isolated=False, prefix=None):
-     """
-     Return a distutils install scheme
-     """
-@@ -187,6 +187,8 @@ def distutils_scheme(dist_name, user=False, home=None, root=None,
-     i.user = user or i.user
-     if user:
-         i.prefix = ""
-+    else:
-+        i.prefix = prefix or i.prefix
-     i.home = home or i.home
-     i.root = root or i.root
-     i.finalize_options()
-diff --git a/pip/req/req_install.py b/pip/req/req_install.py
-index 7c5bf8f..6f80a18 100644
---- a/pip/req/req_install.py
-+++ b/pip/req/req_install.py
-@@ -792,7 +792,7 @@ exec(compile(
-         else:
-             return True
- 
--    def install(self, install_options, global_options=[], root=None):
-+    def install(self, install_options, global_options=[], root=None, prefix=None):
-         if self.editable:
-             self.install_editable(install_options, global_options)
-             return
-@@ -800,7 +800,7 @@ exec(compile(
-             version = pip.wheel.wheel_version(self.source_dir)
-             pip.wheel.check_compatibility(version, self.name)
- 
--            self.move_wheel_files(self.source_dir, root=root)
-+            self.move_wheel_files(self.source_dir, root=root, prefix=prefix)
-             self.install_succeeded = True
-             return
- 
-@@ -833,6 +833,8 @@ exec(compile(
- 
-             if root is not None:
-                 install_args += ['--root', root]
-+            if prefix is not None:
-+                install_args += ['--prefix', prefix]
- 
-             if self.pycompile:
-                 install_args += ["--compile"]
-@@ -988,12 +990,13 @@ exec(compile(
-     def is_wheel(self):
-         return self.link and self.link.is_wheel
- 
--    def move_wheel_files(self, wheeldir, root=None):
-+    def move_wheel_files(self, wheeldir, root=None, prefix=None):
-         move_wheel_files(
-             self.name, self.req, wheeldir,
-             user=self.use_user_site,
-             home=self.target_dir,
-             root=root,
-+            prefix=prefix,
-             pycompile=self.pycompile,
-             isolated=self.isolated,
-         )
-diff --git a/pip/wheel.py b/pip/wheel.py
-index 403f48b..14eb141 100644
---- a/pip/wheel.py
-+++ b/pip/wheel.py
-@@ -234,12 +234,12 @@ def get_entrypoints(filename):
- 
- 
- def move_wheel_files(name, req, wheeldir, user=False, home=None, root=None,
--                     pycompile=True, scheme=None, isolated=False):
-+                     pycompile=True, scheme=None, isolated=False, prefix=None):
-     """Install a wheel"""
- 
-     if not scheme:
-         scheme = distutils_scheme(
--            name, user=user, home=home, root=root, isolated=isolated
-+            name, user=user, home=home, root=root, isolated=isolated, prefix=prefix,
-         )
- 
-     if root_is_purelib(name, wheeldir):
-diff --git a/pip/req/req_install.py b/pip/req/req_install.py
-index 51bf4a7..e2e285e 100644
---- a/pip/req/req_install.py
-+++ b/pip/req/req_install.py
-@@ -795,7 +795,7 @@ exec(compile(
-     def install(self, install_options, global_options=[], root=None,
-                 prefix=None):
-         if self.editable:
--            self.install_editable(install_options, global_options)
-+            self.install_editable(install_options, global_options, prefix=prefix)
-             return
-         if self.is_wheel:
-             version = pip.wheel.wheel_version(self.source_dir)
-@@ -929,12 +929,16 @@ exec(compile(
-             rmtree(self._temp_build_dir)
-         self._temp_build_dir = None
- 
--    def install_editable(self, install_options, global_options=()):
-+    def install_editable(self, install_options, global_options=(), prefix=None):
-         logger.info('Running setup.py develop for %s', self.name)
- 
-         if self.isolated:
-             global_options = list(global_options) + ["--no-user-cfg"]
- 
-+        if prefix:
-+            prefix_param = ['--prefix={0}'.format(prefix)]
-+            install_options = list(install_options) + prefix_param
-+
-         with indent_log():
-             # FIXME: should we do --install-headers here too?
-             cwd = self.source_dir
-
diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
new file mode 100644
index 0000000000000..bc5e939ceba99
--- /dev/null
+++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
@@ -0,0 +1,47 @@
+commit 705dc9a55bd160625d9996e63fc7dc532d0ad0ab
+Author: Alexander V. Nikolaev <avn@avnik.info>
+Date:   Sat Feb 6 08:09:06 2016 +0200
+
+    Patch dlopen() to allow direct paths to all required libs
+    
+    This patch is NixOS specific
+
+diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
+index 718aa7f..1a1dcff 100644
+--- a/cairocffi/__init__.py
++++ b/cairocffi/__init__.py
+@@ -27,20 +27,22 @@ VERSION = '0.7.2'
+ version = '1.10.0'
+ version_info = (1, 10, 0)
+ 
++# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
++_LIBS = {
++    'cairo': '@cairo@/lib/libcairo.so.2',
++    'glib-2.0': '@glib@/lib/libglib-2.0.so.0',
++    'gobject-2.0': '@glib@/lib/libgobject-2.0.so.0',
++    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.so.0',
++}
+ 
+-def dlopen(ffi, *names):
++def dlopen(ffi, name, *names):
+     """Try various names for the same library, for different platforms."""
+-    for name in names:
+-        for lib_name in [name, 'lib' + name]:
+-            try:
+-                path = ctypes.util.find_library(lib_name)
+-                if path:
+-                    lib = ffi.dlopen(path)
+-                    if lib:
+-                        return lib
+-            except OSError:
+-                pass
+-    raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names))
++    path = _LIBS.get(name, None)
++    if path:
++        lib = ffi.dlopen(path)
++        if lib:
++            return lib
++    raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
+ 
+ 
+ cairo = dlopen(ffi, 'cairo', 'cairo-2')
diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index 46571978a6d37..be1592f864fa7 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, automake, m4,
-pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper,
+{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook,
+pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir,
 gobjectIntrospection, pygobject3, gtk3, matplotlib }:
 
 stdenv.mkDerivation rec {
-  version = "2.2.42";
+  version = "2.12";
   name = "${python.libPrefix}-graph-tool-${version}";
 
   meta = with stdenv.lib; {
@@ -15,15 +15,16 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "http://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
-    sha256 = "124qmd0mgam7hm87gscp3836ymhhwwnlfm2c5pzpml06da1w0xg9";
+    url = "https://github.com/count0/graph-tool/archive/release-${version}.tar.gz";
+    sha256 = "12w58djyx6nn00wixqnxnxby9ksabhzdkkvynl8b89parfvfbpwl";
   };
 
-  preConfigure = ''
-    configureFlags="--with-python-module-path=$out/${python.sitePackages} --enable-openmp"
-  '';
+  configureFlags = [
+    "--with-python-module-path=$(out)/${python.sitePackages}"
+    "--enable-openmp"
+  ];
 
-  buildInputs = [ automake m4 pkgconfig makeWrapper ];
+  buildInputs = [ pkgconfig autoreconfHook ];
 
   propagatedBuildInputs = [
     boost
diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix
index 5e0d391a33801..b0fa789d157b0 100644
--- a/pkgs/development/python-modules/libsexy/default.nix
+++ b/pkgs/development/python-modules/libsexy/default.nix
@@ -1,31 +1,26 @@
-a @ { python, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, }:
+
+stdenv.mkDerivation rec {
+  name = "python-libsexy-${version}";
+  version = "0.1.9";
 
-  version = a.lib.attrByPath ["version"] "0.1.9" a;
-  buildInputs = with a; [
-    pkgconfig pygtk
-  ];
-  propagatedBuildInputs = with a; [
-    libsexy python gtk glib pango libxml2
-  ];
-in
-rec {
   src = fetchurl {
     url = "http://releases.chipx86.com/libsexy/sexy-python/sexy-python-${version}.tar.gz";
     sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d";
   };
 
-  inherit buildInputs propagatedBuildInputs;
-  configureFlags = [];
+  buildInputs = [
+    pkgconfig pygtk
+  ];
+
+  propagatedBuildInputs = [
+    libsexy gtk glib pango libxml2
+  ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
-  postInstall = a.fullDepEntry (''
+  postInstall = ''
     ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/
-  '') ["minInit"];
+  '';
 
-  name = "python-libsexy-" + version;
   meta = {
     description = "Python libsexy bindings";
   };
diff --git a/pkgs/development/python-modules/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix
deleted file mode 100644
index 422de794e31bc..0000000000000
--- a/pkgs/development/python-modules/numpy-scipy-support.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  # Python package expression
-  python,
-  # Name of package (e.g. numpy or scipy)
-  pkgName,
-  # OpenBLAS math library
-  openblas
-}:
-
-{
-  # Re-export openblas here so that it can be sure that the same one will be used
-  # in the propagatedBuildInputs.
-  inherit openblas;
-
-  # First "install" the package, then import what was installed, and call the
-  # .test() function, which will run the test suite.
-  checkPhase = ''
-    runHook preCheck
-    pushd dist
-    ${python.interpreter} -c 'import ${pkgName}; ${pkgName}.test("fast", verbose=10)'
-    popd
-    runHook postCheck
-  '';
-
-  # Creates a site.cfg telling the setup script where to find depended-on
-  # math libraries.
-  preBuild = ''
-    echo "Creating site.cfg file..."
-    cat << EOF > site.cfg
-    [openblas]
-    include_dirs = ${openblas}/include
-    library_dirs = ${openblas}/lib
-    EOF
-  '';
-}
diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix
new file mode 100644
index 0000000000000..141c8b14fa6d7
--- /dev/null
+++ b/pkgs/development/python-modules/numpy.nix
@@ -0,0 +1,51 @@
+{lib, python, buildPythonPackage, isPyPy, gfortran, nose, blas}:
+
+args:
+
+let
+  inherit (args) version;
+in buildPythonPackage (args // rec {
+
+  name = "numpy-${version}";
+
+  disabled = isPyPy;
+  buildInputs = args.buildInputs or [ gfortran nose ];
+  propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ];
+
+  preConfigure = ''
+    sed -i 's/-faltivec//' numpy/distutils/system_info.py
+  '';
+
+  preBuild = ''
+    echo "Creating site.cfg file..."
+    cat << EOF > site.cfg
+    [openblas]
+    include_dirs = ${passthru.blas}/include
+    library_dirs = ${passthru.blas}/lib
+    EOF
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    pushd dist
+    ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)'
+    popd
+    runHook postCheck
+  '';
+
+  passthru = {
+    blas = blas;
+  };
+
+  # The large file support test is disabled because it takes forever
+  # and can cause the machine to run out of disk space when run.
+  prePatch = ''
+    sed -i 's/test_large_file_support/donttest/' numpy/lib/tests/test_format.py
+  '';
+
+  meta = {
+    description = "Scientific tools for Python";
+    homepage = "http://numpy.scipy.org/";
+    maintainers = with lib.maintainers; [ fridh ];
+  } // (args.meta or {});
+})
diff --git a/pkgs/development/python-modules/scipy.nix b/pkgs/development/python-modules/scipy.nix
new file mode 100644
index 0000000000000..ae312cd32d596
--- /dev/null
+++ b/pkgs/development/python-modules/scipy.nix
@@ -0,0 +1,47 @@
+{lib, python, buildPythonPackage, isPyPy, gfortran, nose}:
+
+args:
+
+let
+  inherit (args) version;
+  inherit (args) numpy;
+in buildPythonPackage (args // rec {
+
+  name = "scipy-${version}";
+
+  buildInputs = (args.buildInputs or [ gfortran nose ]);
+  propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]);
+
+  preConfigure = ''
+    sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
+  '';
+
+  preBuild = ''
+    echo "Creating site.cfg file..."
+    cat << EOF > site.cfg
+    [openblas]
+    include_dirs = ${passthru.blas}/include
+    library_dirs = ${passthru.blas}/lib
+    EOF
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    pushd dist
+    ${python.interpreter} -c 'import scipy; scipy.test("fast", verbose=10)'
+    popd
+    runHook postCheck
+  '';
+
+  passthru = {
+    blas = numpy.blas;
+  };
+
+  setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
+
+  meta = {
+    description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. ";
+    homepage = http://www.scipy.org/;
+    maintainers = with lib.maintainers; [ fridh ];
+  } // (args.meta or {});
+})
diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index 70d61bc4deb40..039cb74246332 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, libpfm, zlib, python, pkgconfig, pythonPackages, which, procps }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.0";
+  version = "4.0.3";
   name = "rr-${version}";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "rr";
     rev = version;
-    sha256 = "02njg9riziyvgp0q39lhpyf32p1hjjk1wih5dvl74wrzy5anhbwk";
+    sha256 = "0k12r1hzkn5286kz5cg4mvii92m0prs58przchr495r9hfjcy276";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix
new file mode 100644
index 0000000000000..433aadebb6ced
--- /dev/null
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, pkgs }:
+
+stdenv.mkDerivation rec {
+  name = "backblaze-b2-0.3.10";
+
+  src = fetchFromGitHub {
+    owner = "Backblaze";
+    repo = "B2_Command_Line_Tool";
+    rev = "b097f0f04d3f88d7a372b50ee6db1f89a5249028";
+    sha256 = "1rcy8180476cpmrbls4424qbq8nyq7mxkfikd52a8skz7rd5ljc6";
+  };
+  
+  buildInputs = with pkgs; [ python2 ];
+
+  doCheck = true;
+  checkPhase = ''
+    python test_b2_command_line.py test
+  '';
+
+  installPhase = ''
+    install -Dm755 b2 "$out/bin/backblaze-b2"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Command-line tool for accessing the Backblaze B2 storage service.";
+    homepage    = https://github.com/Backblaze/B2_Command_Line_Tool;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ kevincox ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index aa3df6fb1ce51..e0094b4350a7b 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -5,7 +5,7 @@ with rustPlatform;
 
 with ((import ./common.nix) {
   inherit stdenv rustc;
-  version = "0.7.0";
+  version = "0.8.0";
 });
 
 buildRustPackage rec {
@@ -15,10 +15,10 @@ buildRustPackage rec {
   src = fetchgit {
     url = "git://github.com/rust-lang/cargo";
     rev = "refs/tags/${version}";
-    sha256 = "139rv7d6mk31klbnccmn573i05ygjrnflag6c3qwc075i62yfmx6";
+    sha256 = "02z0b6hpygjjfbskg22ggrhdv2nasrgf8x1fd8y0qzg4krx2czlh";
   };
 
-  depsSha256 = "07p244bcw3aa1hfbsz6q89pyl8ypkw9zp1r8cvd131w890w9ab4b";
+  depsSha256 = "1gwc5ygs3h8jxs506xmbj1xzaqpb3kmg3pkxg9j9yqy616jw6rcn";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ];
 
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 8e517930cfcc8..82d0d40269881 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -35,11 +35,11 @@ rec {
   };
 
   gradleLatest = gradleGen rec {
-    name = "gradle-2.10";
+    name = "gradle-2.11";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "66406247f745fc6f05ab382d3f8d3e120c339f34ef54b86f6dc5f6efc18fbb13";
+      sha256 = "1mhydg6mj9y7qr2s9bkdaijkjrq7nf6rqix415izvjan4c43fx4d";
     };
   };
 
diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix
new file mode 100644
index 0000000000000..858fc5b48df3f
--- /dev/null
+++ b/pkgs/development/tools/build-managers/nant/default.nix
@@ -0,0 +1,69 @@
+{ fetchurl, stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper
+, targetVersion ? "4.5" }:
+
+let
+   version = "2015-11-15";
+
+  src = fetchFromGitHub {
+    owner = "nant";
+    repo = "nant";
+    rev = "19bec6eca205af145e3c176669bbd57e1712be2a";
+    sha256 = "11l5y76csn686p8i3kww9s0sxy659ny9l64krlqg3y2nxaz0fk6l";
+  };
+
+  nant-bootstrapped = stdenv.mkDerivation {
+    name = "nant-bootstrapped-${version}";
+    inherit src;
+
+    buildInputs = [ pkgconfig mono makeWrapper ];
+
+    buildFlags = "bootstrap";
+
+    dontStrip = true;
+
+    installPhase = ''
+      mkdir -p $out/lib/nant-bootstrap
+      cp -r bootstrap/* $out/lib/nant-bootstrap
+
+      mkdir -p $out/bin
+      makeWrapper "${mono}/bin/mono" $out/bin/nant \
+        --add-flags "$out/lib/nant-bootstrap/NAnt.exe"
+    '';
+  };
+
+in stdenv.mkDerivation {
+  name = "nant-${version}";
+  inherit src;
+
+  buildInputs = [ pkgconfig mono makeWrapper nant-bootstrapped ];
+
+  dontStrip = true;
+
+  buildPhase = ''
+    nant -t:mono-${targetVersion}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib/nant
+    cp -r build/mono-${targetVersion}.unix/nant-debug/bin/* $out/lib/nant/
+
+    mkdir -p $out/bin
+    makeWrapper "${mono}/bin/mono" $out/bin/nant \
+      --add-flags "$out/lib/nant/NAnt.exe"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://nant.sourceforge.net;
+    description = "NAnt is a free .NET build tool";
+
+    longDescription = ''
+      NAnt is a free .NET build tool. In theory it is kind of like make without
+      make's wrinkles. In practice it's a lot like Ant.
+    '';
+
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ zohl ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
new file mode 100644
index 0000000000000..6956c97db50f0
--- /dev/null
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchurl, python2 }:
+
+stdenv.mkDerivation rec {
+  name = "waf-${version}";
+  version = "1.8.19";
+
+  src = fetchurl {
+    url = "https://waf.io/waf-${version}.tar.bz2";
+    sha256 = "e5df90556d1f70aca82bb5c5f46aa68d2377bae16b0db044eaa0559df8668c6f";
+  };
+
+  buildInputs = [ python2 ];
+
+  configurePhase = ''
+    python waf-light configure
+  '';
+  buildPhase = ''
+    python waf-light build
+  '';
+  installPhase = ''
+    install waf $out
+  '';
+
+  meta = {
+    description = "Meta build system";
+    homepage    = "https://waf.io/";
+    license     = lib.licenses.bsd3;
+    platforms   = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix
index 699ddd16c2370..ce138014408f2 100644
--- a/pkgs/development/tools/misc/kibana/default.nix
+++ b/pkgs/development/tools/misc/kibana/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "kibana-${version}";
-  version = "4.1.2";
+  version = "4.4.1";
 
   src = fetchurl {
     url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz";
-    sha256 = "00ag4wnlw6h2j6zcz0irz6j1s51fr9ix2g1smrhrdw44z5gb6wrh";
+    sha256 = "0kxvrhrkcvx7pcn7myvabhcm4nj8gi86ij4a1xi392lfds2v350z";
   };
 
   buildInputs = [ makeWrapper ];
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     rm -r $out/libexec/kibana/node
     makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
       --prefix PATH : "${nodejs}/bin:${coreutils}/bin:${which}/bin"
+    sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
   '';
 
   meta = {
diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix
index cf0a16cef68da..79c81c5c447c1 100644
--- a/pkgs/development/tools/ocaml/ocaml-top/default.nix
+++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl3;
     description = "A simple cross-platform OCaml code editor built for top-level evaluation";
     platforms = ocamlPackages.ocaml.meta.platforms;
-    maintainer = with stdenv.lib.maintainers; [ vbgl ];
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
   };
 }
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 651e64467c49f..716b489d3d770 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, go, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "packer-0.7.5";
+  name = "packer-0.8.6";
 
   src = import ./deps.nix {
     inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix
index e2272574f81e0..5f8e69679c188 100644
--- a/pkgs/development/tools/packer/deps.nix
+++ b/pkgs/development/tools/packer/deps.nix
@@ -4,79 +4,30 @@
 let
   goDeps = [
     {
-      root = "code.google.com/p/go.crypto";
-      src = fetchhg {
-        url = "https://code.google.com/p/go.crypto";
-        rev = "235";
-        sha256 = "0b3nlkhmraj84n9mhg5nqcd3815ipyj1xx1yzkajcdf2pz2ym4l6";
-      };
-    }
-    {
-      root = "code.google.com/p/goauth2";
-      src = fetchhg {
-        url = "https://code.google.com/p/goauth2";
-        rev = "80";
-        sha256 = "0xgkgcb97hv2rvzvh21rvydq5cc83j7sdsdb1chrymq8k7l4dzc1";
-      };
-    }
-    {
-      root = "code.google.com/p/google-api-go-client";
-      src = fetchhg {
-        url = "https://code.google.com/p/google-api-go-client";
-        rev = "135";
-        sha256 = "17a0mlq76cmgv84xh5vjzi72r6rjq0abl6gv3zkbmj3cphl9cis9";
-      };
-    }
-    {
-      root = "code.google.com/p/goprotobuf";
-      src = fetchhg {
-        url = "https://code.google.com/p/goprotobuf";
-        rev = "267";
-        sha256 = "0kamslfmxs6hi9ww52izmsq48ldaf67xawwhzwwdsbslhv0b9lf7";
-      };
-    }
-    {
-      root = "code.google.com/p/gosshold";
-      src = fetchhg {
-        url = "https://code.google.com/p/gosshold";
-        rev = "2";
-        sha256 = "1ljl8pcxxfz5rv89b2ajd31gxxzifl57kzpksvdhyjdxh98gkvg8";
-      };
-    }
-    {
-      root = "github.com/ActiveState/tail";
-      src = fetchFromGitHub {
-        owner = "ActiveState";
-        repo = "tail";
-        rev = "068b72961a6bc5b4a82cf4fc14ccc724c0cfa73a";
-        sha256 = "08zwlrsyr75cqdar51cihhp1qfm6wnn03i9srdkyzllw4zfymcd2";
-      };
-    }
-    {
-      root = "github.com/bmizerany/assert";
+      root = "github.com/mitchellh/packer";
       src = fetchFromGitHub {
-        owner = "bmizerany";
-        repo = "assert";
-        rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3";
-        sha256 = "1lfrvqqmb09y6pcr76yjv4r84cshkd4s7fpmiy7268kfi2cvqnpc";
+        owner = "mitchellh";
+        repo = "packer";
+        rev = "f8f7b7a34c1be06058f5aca23a51247db12cdbc5";
+        sha256 = "162ja4klyb3nv44rhdg2gd3xrr4n0l0gi49cn1mr1s2h9yznphyp";
       };
     }
     {
-      root = "github.com/going/toolkit";
+      root = "github.com/mitchellh/gox";
       src = fetchFromGitHub {
-        owner = "going";
-        repo = "toolkit";
-        rev = "6185c1893604d52d36a97dd6bb1247ace93a9b80";
-        sha256 = "1kzy5yppalcidsmv5yxmr6lpqplqj07kdqpn77fdp6fbb0y0sg11";
+        owner = "mitchellh";
+        repo = "gox";
+        rev = "ef1967b9f538fe467e6a82fc42ec5dff966ad4ea";
+        sha256 = "0i9s8fp6m2igx93ffv3rf5v5hz7cwrx7pbxrz4cg94hba3sy3nfj";
       };
     }
     {
-      root = "github.com/golang/protobuf";
+      root = "github.com/mitchellh/iochan";
       src = fetchFromGitHub {
-        owner = "golang";
-        repo = "protobuf";
-        rev = "a11b6342f0e28eab4059c0cabbad38cef38b9b6e";
-        sha256 = "1bjig0bwgw1r56r8paskm880lw36nh4c6n64v4ww6mszwmk7dkn7";
+        owner = "mitchellh";
+        repo = "iochan";
+        rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7";
+        sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx";
       };
     }
     {
@@ -84,8 +35,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "atlas-go";
-        rev = "137646809ce33b755be51e5e82b40775217ff74d";
-        sha256 = "06ilw0bwd3ijfcpkg84j3q9gwgllzwg0g6gab3w08cn1p49jicjg";
+        rev = "d1d08e8e25f0659388ede7bb8157aaa4895f5347";
+        sha256 = "0bbqh94i8qllp51ln1mmcjy5srny7s4xg0l353kccvk3c7s68m03";
       };
     }
     {
@@ -93,8 +44,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "go-checkpoint";
-        rev = "efefdc69845f7fa7245d20827d31fb27b848d955";
-        sha256 = "1vpi414bw3rsyg5rx52hpvjhnk2qazmsvl3f13g79zwwkvbj2vvq";
+        rev = "88326f6851319068e7b34981032128c0b1a6524d";
+        sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4";
       };
     }
     {
@@ -102,8 +53,17 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "go-msgpack";
-        rev = "71c2886f5a673a35f909803f38ece5810165097b";
-        sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j";
+        rev = "fa3f63826f7c23912c15263591e65d54d080b458";
+        sha256 = "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k";
+      };
+    }
+    {
+      root = "github.com/hashicorp/go-multierror";
+      src = fetchFromGitHub {
+        owner = "hashicorp";
+        repo = "go-multierror";
+        rev = "56912fb08d85084aa318edcf2bba735b97cf35c5";
+        sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r";
       };
     }
     {
@@ -111,8 +71,8 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "go-version";
-        rev = "bb92dddfa9792e738a631f04ada52858a139bcf7";
-        sha256 = "0fl5a6j6nk1xsxwjdpa24a24fxvgnvm3jjlgpyrnmbdn380zil3m";
+        rev = "999359b6b7a041ce16e695d51e92145b83f01087";
+        sha256 = "0z2bzphrdkaxh5vnvjh3g25d6cykchshwwbyqgji91mpgjd30pbm";
       };
     }
     {
@@ -120,71 +80,71 @@ let
       src = fetchFromGitHub {
         owner = "hashicorp";
         repo = "yamux";
-        rev = "9feabe6854fadca1abec9cd3bd2a613fe9a34000";
-        sha256 = "03lgbhwhiqk6rivc5cl6zxph5n2pdbdz95h0x7m0ngp3yk3aqgan";
+        rev = "ae139c4ae7fe21e9d99459d2acc57967cebb6918";
+        sha256 = "1p5h2wklj8lb1vnjnd5kw7cshfmiw7jmzw9radln955hzd5xzbnl";
       };
     }
     {
-      root = "github.com/howeyc/fsnotify";
+      root = "github.com/mitchellh/cli";
       src = fetchFromGitHub {
-        owner = "howeyc";
-        repo = "fsnotify";
-        rev = "4894fe7efedeeef21891033e1cce3b23b9af7ad2";
-        sha256 = "09r3h200nbw8a4d3rn9wxxmgma2a8i6ssaplf3zbdc2ykizsq7mn";
+        owner = "mitchellh";
+        repo = "cli";
+        rev = "8102d0ed5ea2709ade1243798785888175f6e415";
+        sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2";
       };
     }
     {
-      root = "github.com/kr/pretty";
+      root = "github.com/mitchellh/mapstructure";
       src = fetchFromGitHub {
-        owner = "kr";
-        repo = "pretty";
-        rev = "cb0850c1681cbca3233e84f7e6ec3e4c3f352085";
-        sha256 = "0j3jd7qlfv6iw7icn66y1fpdn88ri29n9qv9di92mkc6vjw4ifb1";
+        owner = "mitchellh";
+        repo = "mapstructure";
+        rev = "281073eb9eb092240d33ef253c404f1cca550309";
+        sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
       };
     }
     {
-      root = "github.com/kr/pty";
+      root = "github.com/mitchellh/osext";
       src = fetchFromGitHub {
-        owner = "kr";
-        repo = "pty";
-        rev = "05017fcccf23c823bfdea560dcc958a136e54fb7";
-        sha256 = "0f7xa8lkazif2jzacryryrg8rqz5lfl3j7hqvnis4qa8cjy5dpqb";
+        owner = "mitchellh";
+        repo = "osext";
+        rev = "0dd3f918b21bec95ace9dc86c7e70266cfc5c702";
+        sha256 = "02pczqml6p1mnfdrygm3rs02g0r65qx8v1bi3x24dx8wv9dr5y23";
       };
     }
     {
-      root = "github.com/kr/text";
+      root = "github.com/mitchellh/panicwrap";
       src = fetchFromGitHub {
-        owner = "kr";
-        repo = "text";
-        rev = "6807e777504f54ad073ecef66747de158294b639";
-        sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698";
+        owner = "mitchellh";
+        repo = "panicwrap";
+        rev = "45cbfd3bae250c7676c077fb275be1a2968e066a";
+        sha256 = "0mbha0nz6zcgp2pny2x03chq1igf9ylpz55xxq8z8g2jl6cxaghn";
       };
     }
     {
-      root = "github.com/mitchellh/cli";
+      root = "github.com/mitchellh/prefixedio";
       src = fetchFromGitHub {
         owner = "mitchellh";
-        repo = "cli";
-        rev = "e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0";
-        sha256 = "1fwf7wmlhri19bl2yyjd4zlgndgwwqrdry45clpszzjsr8b5wfgm";
+        repo = "prefixedio";
+        rev = "89d9b535996bf0a185f85b59578f2e245f9e1724";
+        sha256 = "0lc64rlizb412msd32am2fixkh0536pjv7czvgyw5fskn9kgk3y2";
       };
     }
     {
-      root = "github.com/mitchellh/go-fs";
+      root = "github.com/mitchellh/reflectwalk";
       src = fetchFromGitHub {
         owner = "mitchellh";
-        repo = "go-fs";
-        rev = "faaa223588dd7005e49bf66fa2d19e35c8c4d761";
-        sha256 = "19jsvy35g14f18ckymzxasy0zfd6n99zlqg6grpj1yqdfxfvqn9b";
+        repo = "reflectwalk";
+        rev = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6";
+        sha256 = "1nm2ig7gwlmf04w7dbqd8d7p64z2030fnnfbgnd56nmd7dz8gpxq";
       };
     }
     {
-      root = "github.com/mitchellh/go-vnc";
+      root = "github.com/mitchellh/go-fs";
       src = fetchFromGitHub {
         owner = "mitchellh";
-        repo = "go-vnc";
-        rev = "fc93dd80f5da4ccde0a9d97f0c73e56e04e0cf72";
-        sha256 = "03rwsp1frvfx6c7yxr711lq7jdgsr1gcwg14jw26xvbzzxwjvnsf";
+        repo = "go-fs";
+        rev = "a34c1b9334e86165685a9449b782f20465eb8c69";
+        sha256 = "11sy85p77ffmavpiichzybrfvjm1ilsi4clx98n3363arksavs5i";
       };
     }
     {
@@ -192,8 +152,83 @@ let
       src = fetchFromGitHub {
         owner = "mitchellh";
         repo = "goamz";
-        rev = "6932a73f35dfdd5489a95284552c0ae868be0944";
-        sha256 = "03hbakfxvxkj1r0xy2c4b8xpb7bw6nbryyxpwlii6qv7gsx478yw";
+        rev = "caaaea8b30ee15616494ee68abd5d8ebbbef05cf";
+        sha256 = "0bshq69ir9h2nszbr74yvcg5wnd9a5skfmr9bgk014k9wwk7dc72";
+      };
+    }
+    {
+      root = "github.com/mitchellh/multistep";
+      src = fetchFromGitHub {
+        owner = "mitchellh";
+        repo = "multistep";
+        rev = "162146fc57112954184d90266f4733e900ed05a5";
+        sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3";
+      };
+    }
+    {
+      root = "github.com/ActiveState/tail";
+      src = fetchFromGitHub {
+        owner = "ActiveState";
+        repo = "tail";
+        rev = "4b368d1590196ade29993d6a0896591403180bbd";
+        sha256 = "183y44skn75lkpsjd3zlbx8vc3b930p3nkpc1ybq3k50s4bzhsll";
+      };
+    }
+    {
+      root = "google.golang.org/api";
+      src = fetchgit {
+        url = "https://github.com/google/google-api-go-client.git";
+        rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80";
+        sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8";
+      };
+    }
+    {
+      root = "golang.org/x/crypto";
+      src = fetchgit {
+        url = "https://go.googlesource.com/crypto.git";
+        rev = "81bf7719a6b7ce9b665598222362b50122dfc13b";
+        sha256 = "0rwzc2ls842d0g588b5xik59srwzawch3nb1dlcqwm4a1132mvmr";
+      };
+    }
+    {
+      root = "golang.org/x/oauth2";
+      src = fetchgit {
+        url = "https://go.googlesource.com/oauth2.git";
+        rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a";
+        sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8";
+      };
+    }
+    {
+      root = "golang.org/x/net";
+      src = fetchgit {
+        url = "https://go.googlesource.com/net.git";
+        rev = "7654728e381988afd88e58cabfd6363a5ea91810";
+        sha256 = "08i6kkzbckbc5k15bdlqkbird48zmc24qr505hlxlb11djjgdiml";
+      };
+    }
+    {
+      root = "google.golang.org/appengine";
+      src = fetchgit {
+        url = "https://github.com/golang/appengine.git";
+        rev = "cdd515334b113fdc9b35cb1e7a3b457eeb5ad5cf";
+        sha256 = "0l0rddpfbddbi8kizg2n25w7bdhf99f0iz7ghwz7fq6k4rmq44ws";
+      };
+    }
+    {
+      root = "google.golang.org/cloud";
+      src = fetchgit {
+        url = "https://github.com/GoogleCloudPlatform/gcloud-golang.git";
+        rev = "e34a32f9b0ecbc0784865fb2d47f3818c09521d4";
+        sha256 = "1rzac44kzhd7r6abdy5qyj69y64wy9r73vnxsdalfr5m0i55fqk4";
+      };
+    }
+    {
+      root = "github.com/golang/protobuf";
+      src = fetchFromGitHub {
+        owner = "golang";
+        repo = "protobuf";
+        rev = "59b73b37c1e45995477aae817e4a653c89a858db";
+        sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
       };
     }
     {
@@ -206,227 +241,254 @@ let
       };
     }
     {
-      root = "github.com/mitchellh/iochan";
+      root = "github.com/racker/perigee";
       src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "iochan";
-        rev = "b584a329b193e206025682ae6c10cdbe03b0cd77";
-        sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b";
+        owner = "racker";
+        repo = "perigee";
+        rev = "44a7879d89b7040bcdb51164a83292ef5bf9deec";
+        sha256 = "04wscffagpbcfjs6br96n46aqy43cq6ndq16nlpvank0m98jaax0";
       };
     }
     {
-      root = "github.com/mitchellh/mapstructure";
+      root = "github.com/going/toolkit";
       src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "mapstructure";
-        rev = "442e588f213303bec7936deba67901f8fc8f18b1";
-        sha256 = "076svhy5jlnw4jykm3dsrx2dswifajrpr7d09mz9y6g3lg901rqd";
+        owner = "going";
+        repo = "toolkit";
+        rev = "5bff591dc40da25dcc875d3fa1a3373d74d45411";
+        sha256 = "15gnlqignm7xcp2chrz7d7qqlibkbfrrsvbcysk8lrj9l7md8vjf";
       };
     }
     {
-      root = "github.com/mitchellh/multistep";
+      root = "github.com/mitchellh/go-vnc";
       src = fetchFromGitHub {
         owner = "mitchellh";
-        repo = "multistep";
-        rev = "162146fc57112954184d90266f4733e900ed05a5";
-        sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3";
+        repo = "go-vnc";
+        rev = "723ed9867aed0f3209a81151e52ddc61681f0b01";
+        sha256 = "0nlya2rbmwb3jycqsyah1pn4386712mfrfiprprkbzcna9q7lp1h";
       };
     }
     {
-      root = "github.com/mitchellh/osext";
+      root = "github.com/howeyc/fsnotify";
       src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "osext";
-        rev = "0dd3f918b21bec95ace9dc86c7e70266cfc5c702";
-        sha256 = "02pczqml6p1mnfdrygm3rs02g0r65qx8v1bi3x24dx8wv9dr5y23";
+        owner = "howeyc";
+        repo = "fsnotify";
+        rev = "4894fe7efedeeef21891033e1cce3b23b9af7ad2";
+        sha256 = "09r3h200nbw8a4d3rn9wxxmgma2a8i6ssaplf3zbdc2ykizsq7mn";
       };
     }
     {
-      root = "github.com/mitchellh/packer";
+      root = "gopkg.in/tomb.v1";
+      src = fetchgit {
+        url = "https://gopkg.in/tomb.v1.git";
+        rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8";
+        sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+      };
+    }
+    {
+      root = "github.com/vaughan0/go-ini";
       src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "packer";
-        rev = "e3c2f01cb8d8f759c02bd3cfc9d27cc1a941d498";
-        sha256 = "0sp2qjdsf0cqmw11a3vfs9alyz76vf415vv71bwdarfagz466inw";
+        owner = "vaughan0";
+        repo = "go-ini";
+        rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
+        sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
       };
     }
     {
-      root = "github.com/mitchellh/panicwrap";
+      root = "github.com/aws/aws-sdk-go";
       src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "panicwrap";
-        rev = "45cbfd3bae250c7676c077fb275be1a2968e066a";
-        sha256 = "0mbha0nz6zcgp2pny2x03chq1igf9ylpz55xxq8z8g2jl6cxaghn";
+        owner = "aws";
+        repo = "aws-sdk-go";
+        rev = "f096b7d61df3d7d6d97f0e701f92616d1ea5420d";
+        sha256 = "0z2fknqxdyb5vw4am46cn60m15p9fjsqzpzaj2pamp436l0cpjkw";
       };
     }
     {
-      root = "github.com/mitchellh/prefixedio";
+      root = "github.com/digitalocean/godo";
       src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "prefixedio";
-        rev = "89d9b535996bf0a185f85b59578f2e245f9e1724";
-        sha256 = "0lc64rlizb412msd32am2fixkh0536pjv7czvgyw5fskn9kgk3y2";
+        owner = "digitalocean";
+        repo = "godo";
+        rev = "2a0d64a42bb60a95677748a4d5729af6184330b4";
+        sha256 = "0854577b08fw9bjflk044ph16p15agxhh6xbzn71rhfvxg5yg5mi";
       };
     }
     {
-      root = "github.com/motain/gocheck";
+      root = "github.com/dylanmei/winrmtest";
       src = fetchFromGitHub {
-        owner = "motain";
-        repo = "gocheck";
-        rev = "9beb271d26e640863a5bf4a3c5ea40ccdd466b84";
-        sha256 = "07arpwfdb51b5f7kzqnm5s5ndfmxv5j793hpn30nbdcya46diwjd";
+        owner = "dylanmei";
+        repo = "winrmtest";
+        rev = "025617847eb2cf9bd1d851bc3b22ed28e6245ce5";
+        sha256 = "1i0wq6r1vm3nhnia3ycm5l590gyia7cwh6971ppnn4rrdmvsw2qh";
       };
     }
     {
-      root = "github.com/racker/perigee";
+      root = "github.com/klauspost/pgzip";
       src = fetchFromGitHub {
-        owner = "racker";
-        repo = "perigee";
-        rev = "44a7879d89b7040bcdb51164a83292ef5bf9deec";
-        sha256 = "04wscffagpbcfjs6br96n46aqy43cq6ndq16nlpvank0m98jaax0";
+        owner = "klauspost";
+        repo = "pgzip";
+        rev = "47f36e165cecae5382ecf1ec28ebf7d4679e307d";
+        sha256 = "1bfka02xrhp4fg9pz2v4ppxa46b59bwy5n88c7hbbxqxm8z30yca";
       };
     }
     {
-      root = "github.com/rackspace/gophercloud";
+      root = "github.com/masterzen/winrm";
       src = fetchFromGitHub {
-        owner = "rackspace";
-        repo = "gophercloud";
-        rev = "d7f07fc0a7ff4b608c6f9e34197930093c7c7ee1";
-        sha256 = "1cyfvynwl5z6f9s0lmj92mhsriy7nl7kq5f8jay67wmdn0nhyybs";
+        owner = "masterzen";
+        repo = "winrm";
+        rev = "54ea5d01478cfc2afccec1504bd0dfcd8c260cfa";
+        sha256 = "0qzdmsjgcf5n0jzjf4gd22lhqwn9yagynk1izjz3978gr025p2zm";
       };
     }
     {
-      root = "github.com/rasa/oauth2-fork-b3f9a68";
+      root = "github.com/google/go-querystring";
       src = fetchFromGitHub {
-        owner = "rasa";
-        repo = "oauth2-fork-b3f9a68";
-        rev = "94a7bc9691e0841393b875eaad68fbfd069b2a18";
-        sha256 = "101bv0zwbchdql86x8c4qhvmlahkfcw4bnqw7v8hihqxd5zf9fxp";
+        owner = "google";
+        repo = "go-querystring";
+        rev = "2a60fc2ba6c19de80291203597d752e9ba58e4c0";
+        sha256 = "0raf6r3dd8rxxppzrbhp1y6k5csgfkfs7b0jylj65sbg0hbzxvbr";
       };
     }
     {
-      root = "github.com/ugorji/go";
+      root = "github.com/go-ini/ini";
       src = fetchFromGitHub {
-        owner = "ugorji";
-        repo = "go";
-        rev = "39815c8993d27d88435f3d267be35a6d26e43f03";
-        sha256 = "1g5nbcs3900chwv0jz1a9x0s3scxjhksi1268w112mq2k1rinq3j";
+        owner = "go-ini";
+        repo = "ini";
+        rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3";
+        sha256 = "0xi8zr9qw38sdbv95c2ip31yczbm4axdvmj3ljyivn9xh2nbxfia";
       };
     }
     {
-      root = "github.com/ugorji/go-msgpack";
+      root = "github.com/klauspost/compress";
       src = fetchFromGitHub {
-        owner = "ugorji";
-        repo = "go-msgpack";
-        rev = "75092644046c5e38257395b86ed26c702dc95b92";
-        sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98";
+        owner = "klauspost";
+        repo = "compress";
+        rev = "112706bf3743c241303219f9c5ce2e6635f69221";
+        sha256 = "1gyf5hf8wivbx6s99x2rxq2a335b49av2xb43nikgbzm4qn7win7";
       };
     }
     {
-      root = "github.com/vaughan0/go-ini";
+      root = "github.com/masterzen/simplexml";
       src = fetchFromGitHub {
-        owner = "vaughan0";
-        repo = "go-ini";
-        rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
-        sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
+        owner = "masterzen";
+        repo = "simplexml";
+        rev = "95ba30457eb1121fa27753627c774c7cd4e90083";
+        sha256 = "0pwsis1f5n4is0nmn6dnggymj32mldhbvihv8ikn3nglgxclz4kz";
       };
     }
     {
-      root = "github.com/vmihailenco/msgpack";
+      root = "github.com/masterzen/xmlpath";
       src = fetchFromGitHub {
-        owner = "vmihailenco";
-        repo = "msgpack";
-        rev = "1efcd9943dd320d41d8a00189e568d794f1b4e78";
-        sha256 = "0brbrss7hja2d06cca633ggn5jawqwb8p0prp5cg1m26w9f3hzis";
+        owner = "masterzen";
+        repo = "xmlpath";
+        rev = "13f4951698adc0fa9c1dda3e275d489a24201161";
+        sha256 = "1y81h7ymk3dp3w3a2iy6qd1dkm323rkxa27dzxw8vwy888j5z8bk";
       };
     }
     {
-      root = "github.com/xiocode/toolkit";
+      root = "github.com/jmespath/go-jmespath";
       src = fetchFromGitHub {
-        owner = "xiocode";
-        repo = "toolkit";
-        rev = "352fd7c6700074a81056cdfc9e82b3e8c5681ac5";
-        sha256 = "0p33zh57xpxyk2wyp9xahdxyrkq48ysihpr0n9kj713q0dh7x4a3";
+        owner = "jmespath";
+        repo = "go-jmespath";
+        rev = "c01cf91b011868172fdcd9f41838e80c9d716264";
+        sha256 = "0gfrqwl648qngp77g8m1g9g7difggq2cac4ydjw9bpx4bd7mw1rw";
       };
     }
     {
-      root = "golang.org/x/crypto";
-      src = fetchgit {
-        url = "https://go.googlesource.com/crypto";
-        rev = "bfc286917c5fcb7420d7e3092b50bbfd31b38a98";
-        sha256 = "04ryvpbd2z4q4wqaffmj4wc541y744rfjg6arhwf4qn64r171am0";
+      root = "github.com/klauspost/cpuid";
+      src = fetchFromGitHub {
+        owner = "klauspost";
+        repo = "cpuid";
+        rev = "349c675778172472f5e8f3a3e0fe187e302e5a10";
+        sha256 = "1s8baj42k66ny77qkm3n06kwayk4srwf4b9ss42612f3h86ka5i2";
       };
     }
     {
-      root = "golang.org/x/net";
-      src = fetchgit {
-        url = "https://go.googlesource.com/net";
-        rev = "2033b3a5e8688bdd590c647ca70a12384ddc6824";
-        sha256 = "06zla6nja6af735b2rskb5l2pjggw99v05fl4n306dcnvwj3gvg6";
+      root = "github.com/nu7hatch/gouuid";
+      src = fetchFromGitHub {
+        owner = "nu7hatch";
+        repo = "gouuid";
+        rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3";
+        sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj";
       };
     }
     {
-      root = "golang.org/x/text";
-      src = fetchgit {
-        url = "https://go.googlesource.com/text";
-        rev = "bfad311ce93436dc888b40d76c78f99dc3104473";
-        sha256 = "1mbhp5q24drz2l2x6ib3180i42f9015ry80bn7jhr7rwizvyp6lh";
+      root = "github.com/klauspost/crc32";
+      src = fetchFromGitHub {
+        owner = "klauspost";
+        repo = "crc32";
+        rev = "999f3125931f6557b991b2f8472172bdfa578d38";
+        sha256 = "00ws3hrszxdnyj0cjk9b8b44xc8x5hizm0h22x6m3bb4c5b487wv";
       };
     }
     {
-      root = "google.golang.org/appengine";
-      src = fetchgit {
-        url = "https://github.com/golang/appengine.git";
-        rev = "d1e7e222a24d1e085466ed8b44aedd572f5a51c4";
-        sha256 = "045dmq0m56m1n16fygdghmkaqh7xb2g80xrm7lkcbkf3763w8gfw";
+      root = "github.com/pierrec/lz4";
+      src = fetchFromGitHub {
+        owner = "pierrec";
+        repo = "lz4";
+        rev = "383c0d87b5dd7c090d3cddefe6ff0c2ffbb88470";
+        sha256 = "0l23bmzqfvgh61zlikj6iakg0kz7lybs8zf0nscylskl2hlr09rp";
       };
     }
     {
-      root = "gopkg.in/check.v1";
-      src = fetchgit {
-        url = "https://gopkg.in/check.v1";
-        rev = "64131543e7896d5bcc6bd5a76287eb75ea96c673";
-        sha256 = "0ybxgxkkmfhgd4pmjf7hgpp7d7zxsskc7kv9dklqbaf6aszsqbxl";
+      root = "github.com/packer-community/winrmcp";
+      src = fetchFromGitHub {
+        owner = "packer-community";
+        repo = "winrmcp";
+        rev = "3d184cea22ee1c41ec1697e0d830ff0c78f7ea97";
+        sha256 = "0g2rwwhykm1z099gwkg1nmb1ggnizqlm2pbmy3qsdvjnl5246ca4";
       };
     }
     {
-      root = "gopkg.in/tomb.v1";
-      src = fetchgit {
-        url = "https://gopkg.in/tomb.v1";
-        rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8";
-        sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+      root = "github.com/dylanmei/iso8601";
+      src = fetchFromGitHub {
+        owner = "dylanmei";
+        repo = "iso8601";
+        rev = "2075bf119b58e5576c6ed9f867b8f3d17f2e54d4";
+        sha256 = "0px5aq4w96yyjii586h3049xm7rvw5r8w7ph3axhyismrqddqgx1";
       };
     }
     {
-      root = "gopkg.in/vmihailenco/msgpack.v2";
-      src = fetchgit {
-        url = "https://gopkg.in/vmihailenco/msgpack.v2";
-        rev = "1efcd9943dd320d41d8a00189e568d794f1b4e78";
-        sha256 = "0brbrss7hja2d06cca633ggn5jawqwb8p0prp5cg1m26w9f3hzis";
+      root = "github.com/pierrec/xxHash";
+      src = fetchFromGitHub {
+        owner = "pierrec";
+        repo = "xxHash";
+        rev = "5a004441f897722c627870a981d02b29924215fa";
+        sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja";
+      };
+    }
+    {
+      root = "github.com/satori/go.uuid";
+      src = fetchFromGitHub {
+        owner = "satori";
+        repo = "go.uuid";
+        rev = "d41af8bb6a7704f00bc3b7cba9355ae6a5a80048";
+        sha256 = "0lw8k39s7hab737rn4nngpbsganrniiv7px6g41l6f6vci1skyn2";
       };
     }
     {
-      root = "labix.org/v2/mgo";
-      src = fetchbzr {
-        url = "https://launchpad.net/mgo/v2";
-        rev = "287";
-        sha256 = "0602x0liyp3w2v8cj1nyq73576vbxlxx1z1a8nn173pajxx9pm2z";
+      root = "github.com/rackspace/gophercloud";
+      src = fetchFromGitHub {
+        owner = "rackspace";
+        repo = "gophercloud";
+        rev = "680aa02616313d8399abc91f17a444cf9292f0e1";
+        sha256 = "0pxzvhh6l1gfn31k6g8fz3x4b6mz88cx2rgpims0ys5cl212zrp1";
       };
     }
     {
-      root = "launchpad.net/gocheck";
-      src = fetchbzr {
-        url = "https://launchpad.net/gocheck";
-        rev = "87";
-        sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0";
+      root = "gopkg.in/fsnotify.v0";
+      src = fetchFromGitHub {
+        owner = "go-fsnotify";
+        repo = "fsnotify";
+        rev = "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6";
+        sha256 = "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9";
       };
     }
     {
-      root = "launchpad.net/mgo";
-      src = fetchbzr {
-        url = "https://launchpad.net/mgo";
-        rev = "2";
-        sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x";
+      root = "github.com/tent/http-link-go";
+      src = fetchFromGitHub {
+        owner = "tent";
+        repo = "http-link-go";
+        rev = "ac974c61c2f990f4115b119354b5e0b47550e888";
+        sha256 = "1fph21b6vp4cm73fkkykffggi57m656x9fd1k369fr6jbvq5fffj";
       };
     }
   ];
diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix
new file mode 100644
index 0000000000000..f27b9500319e5
--- /dev/null
+++ b/pkgs/development/tools/sunxi-tools/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, pkgconfig, libusb }:
+stdenv.mkDerivation {
+  name = "sunxi-tools-1.3";
+
+  src = fetchgit {
+    url = "https://github.com/linux-sunxi/sunxi-tools";
+    rev = "be1b4c7400161b90437432076360c1f99970f54f";
+    sha256 = "0qbl4v66a3mvqai29q2y60zf2b5lj32mh9gyn44gfp0w2bsb10yj";
+  };
+
+  buildInputs = [ pkgconfig libusb ];
+
+  buildPhase = ''
+    make all misc
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin2fex fex2bin phoenix_info sunxi-bootinfo sunxi-fel sunxi-fexc sunxi-nand-part sunxi-pio $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tools for Allwinner A10 devices";
+    homepage = http://linux-sunxi.org/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ elitak ];
+  };
+}
diff --git a/pkgs/development/web/nodejs/no-xcode.patch b/pkgs/development/web/nodejs/no-xcode.patch
index 4754432ba4abb..27c9774ee6b10 100644
--- a/pkgs/development/web/nodejs/no-xcode.patch
+++ b/pkgs/development/web/nodejs/no-xcode.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
-index c002b11..eeb0400 100644
+index 407ead0..8bf64e7 100644
 --- a/tools/gyp/pylib/gyp/xcode_emulation.py
 +++ b/tools/gyp/pylib/gyp/xcode_emulation.py
 @@ -446,10 +446,16 @@ class XcodeSettings(object):
@@ -55,15 +55,3 @@ index c002b11..eeb0400 100644
  
      is_extension = self._IsIosAppExtension() or self._IsIosWatchKitExtension()
      if sdk_root and is_extension:
-@@ -1032,7 +1040,10 @@ class XcodeSettings(object):
-     sdk_root = self._SdkPath(config_name)
-     if not sdk_root:
-       sdk_root = ''
--    return l.replace('$(SDKROOT)', sdk_root)
-+    if self._SdkPath():
-+      return l.replace('$(SDKROOT)', sdk_root)
-+    else:
-+      return l
- 
-   def AdjustLibraries(self, libraries, config_name=None):
-     """Transforms entries like 'Cocoa.framework' in libraries into entries like
diff --git a/pkgs/development/web/nodejs/pkg-libpath.patch b/pkgs/development/web/nodejs/pkg-libpath.patch
deleted file mode 100644
index 8ad94c0e3e2f2..0000000000000
--- a/pkgs/development/web/nodejs/pkg-libpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index d199975..66d903b 100755
---- a/configure
-+++ b/configure
-@@ -734,7 +734,7 @@ def configure_library(lib, output):
-     # libpath needs to be provided ahead libraries
-     if pkg_libpath:
-       output['libraries'] += (
--          filter(None, map(str.strip, pkg_cflags.split('-L'))))
-+          pkg_libpath.split())
- 
-     default_libs = getattr(options, shared_lib + '_libname')
-     default_libs = map('-l{0}'.format, default_libs.split(','))
diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index f58e5e41720b5..65db17220c73b 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -41,7 +41,7 @@ in stdenv.mkDerivation {
     sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
   '';
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ];
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
 
   buildInputs = [ python zlib libuv openssl python ]
     ++ optionals stdenv.isLinux [ utillinux http-parser ];
diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index 5c6fc9f644b79..ef91e95a630fe 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -38,8 +38,11 @@ in stdenv.mkDerivation {
   dontDisableStatic = true;
   prePatch = ''
     patchShebangs .
+    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
   '';
 
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
+
   buildInputs = [ python which zlib libuv openssl python ]
     ++ optionals stdenv.isLinux [ utillinux http-parser ]
     ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
new file mode 100644
index 0000000000000..4cf33d2984f43
--- /dev/null
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchgit, cmake, zlib, boost,
+  openal, glm, freetype, mesa, glew, SDL2,
+  dejavu_fonts }:
+
+stdenv.mkDerivation rec {
+  name = "arx-libertatis-${version}";
+  version = "2016-02-02";
+
+  src = fetchgit {
+    url = "https://github.com/arx/ArxLibertatis";
+    rev = "205c6cda4d5ac10f3af4ea7bb89c2fc88dac7c9a";
+    sha256 = "0dy81pk4r94qq720kk6ynkjp2wr3z9hzm9h1x46nkkpn7fj8srrn";
+  };
+
+  buildInputs = [
+    cmake zlib boost openal glm
+    freetype mesa glew SDL2
+  ];
+
+  preConfigure = ''
+    cmakeFlags="-DDATA_DIR_PREFIXES=$out/share"
+  '';
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    ln -sf \
+      ${dejavu_fonts}/share/fonts/truetype/DejaVuSansMono.ttf \
+      $out/share/games/arx/misc/dejavusansmono.ttf
+  '';
+  
+  meta = with stdenv.lib; {
+    description = ''
+      A cross-platform, open source port of Arx Fatalis, a 2002
+      first-person role-playing game / dungeon crawler
+      developed by Arkane Studios.
+    '';
+    homepage = "http://arx-libertatis.org/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ rnhmjoj ];
+    platform = platforms.all;
+  };
+
+}
+
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index d91c110c34c0b..bc0b97b139b94 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -16,6 +16,7 @@ let
     dwarf-fortress = callPackage ./wrapper {
       themes = {
         "phoebus" = phoebus-theme;
+        "cla" = cla-theme;
       };
     };
 
@@ -28,6 +29,8 @@ let
     dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { };
 
     phoebus-theme = callPackage ./themes/phoebus.nix { };
+
+    cla-theme = callPackage ./themes/cla.nix { };
   };
 
 in self
diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix
new file mode 100644
index 0000000000000..09b2cc8b647b9
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/themes/cla.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub }:
+
+# On upgrade check https://github.com/DFgraphics/CLA/blob/master/manifest.json
+# for compatibility information.
+
+stdenv.mkDerivation {
+  name = "cla-theme-20160128";
+
+  src = fetchFromGitHub {
+    owner = "DFgraphics";
+    repo = "CLA";
+    rev = "94088b778ed6f91cbddcd3e33aa1e5efa67f3101";
+    sha256 = "0rx1375x9s791k9wzvj7sxcrv4xaggibxymzirayznvavr7zcsv1";
+  };
+
+  installPhase = ''
+    mkdir $out
+    cp -r data raw $out
+  '';
+
+  passthru.dfVersion = "0.42.05";
+
+  preferLocalBuild = true;
+
+  meta = with stdenv.lib; {
+    description = "CLA graphics set for Dwarf Fortress";
+    homepage = "http://www.bay12forums.com/smf/index.php?topic=105376.0";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ abbradar ];
+    license = licenses.free;
+  };
+}
diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix
index 2183a6245c0c2..ca459c6ef76e2 100644
--- a/pkgs/games/dwarf-fortress/themes/phoebus.nix
+++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchFromGitHub }:
 
-# On upgrade check https://github.com/fricy/Phoebus/blob/master/manifest.json
+# On upgrade check https://github.com/DFgraphics/Phoebus/blob/master/manifest.json
 # for compatibility information.
 
 stdenv.mkDerivation {
-  name = "phoebus-theme-20160118";
+  name = "phoebus-theme-20160128";
 
   src = fetchFromGitHub {
-    owner = "fricy";
+    owner = "DFgraphics";
     repo = "Phoebus";
-    rev = "2c5777b0f307b1d752a8a484c6a05b67531c84a9";
-    sha256 = "0a5ixm181wz7crr3rpa2mh0drb371j5hvizqninvdnhah2mypz8v";
+    rev = "52b19b69c7323f9002ad195ecd68ac02ff0099a2";
+    sha256 = "1pw5l5v7l1bvxzjf4fivmagpmghffvz0wlws2ksc7d5vy48ybcmg";
   };
 
   installPhase = ''
diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
index 1fd6178895db2..093dae562c244 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
+++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
@@ -39,3 +39,5 @@ done
 forcecopy_path data/index
 # For some reason, it's needed to be writable...
 forcecopy_path data/announcement
+forcecopy_path data/help
+forcecopy_path data/dipscript
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 66d01905aaf3a..3f8744d75cb2b 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = https://github.com/coelckers/gzdoom;
     description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
-    maintainer = [ stdenv.lib.maintainers.lassulus ];
+    maintainers = [ stdenv.lib.maintainers.lassulus ];
   };
 }
 
diff --git a/pkgs/games/jamp/default.nix b/pkgs/games/jamp/default.nix
deleted file mode 100644
index 0fbd79e77b005..0000000000000
--- a/pkgs/games/jamp/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-a @ { mesa, SDL, SDL_image, SDL_mixer, ... } :
-let
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    mesa SDL SDL_mixer SDL_image
-
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
-
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
-
-  preBuild = a.fullDepEntry (''
-    sed -e "s@/usr/games@$out/bin@g" -i Makefile
-    sed -e "s@/usr/@$out/@g" -i Makefile
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL.dev}/include/SDL"
-  '') ["minInit" "addInputs" "doUnpack"];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["preBuild" "doMakeInstall"];
-
-  meta = {
-    description = "A physics-based game";
-    maintainers = [ a.lib.maintainers.raskin ];
-    platforms = a.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/games/jamp/src-for-default.nix b/pkgs/games/jamp/src-for-default.nix
deleted file mode 100644
index c5980b251c0ae..0000000000000
--- a/pkgs/games/jamp/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="1.0.2";
-   name="jamp-1.0.2";
-   hash="13cjggyx63wmlcvpyllmd7aknfd4vzhxnwm030mas7z3h6wcsmk7";
-   url="http://perre.noud.ch/jamp/download.php?file=jamp-${version}.tar.gz";
-   advertisedUrl="http://perre.noud.ch/jamp/download.php?file=jamp-1.0.2.tar.gz";
-  
-  
-}
diff --git a/pkgs/games/jamp/src-info-for-default.nix b/pkgs/games/jamp/src-info-for-default.nix
deleted file mode 100644
index 9fb4ab9dbcc2e..0000000000000
--- a/pkgs/games/jamp/src-info-for-default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  downloadPage = "http://perre.noud.ch/jamp/";
-  baseName = "jamp";
-}
diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix
index 6cd5155e3af13..dba488016b995 100644
--- a/pkgs/games/lincity/default.nix
+++ b/pkgs/games/lincity/default.nix
@@ -1,24 +1,19 @@
-args @ { libX11, libXext, xextproto, libICE, libSM, xproto, libpng, zlib, ... }: with args;
-let
-  version = lib.attrByPath ["version"] "1.12.1" args;
-  sha256 = lib.attrByPath ["sha256"]
-    "0xmrp7vkkp1hfblb6nl3rh2651qsbcm21bnncpnma1sf40jaf8wj" args;
-  pkgName = "lincity";
-in
-rec {
+{ stdenv, fetchurl, libX11, libXext, xextproto, libICE, libSM, xproto, libpng, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "lincity-${version}";
+  version = "1.12.1";
+
   src = fetchurl {
-    url = "mirror://sourceforge/lincity/${pkgName}-${version}.tar.gz";
-    inherit sha256;
+    url = "mirror://sourceforge/lincity/${name}.tar.gz";
+    sha256 = "0xmrp7vkkp1hfblb6nl3rh2651qsbcm21bnncpnma1sf40jaf8wj";
   };
 
-  buildInputs = [libICE libpng libSM libX11 libXext
-    xextproto zlib xproto];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  buildInputs = [
+    libICE libpng libSM libX11 libXext
+    xextproto zlib xproto
+  ];
 
-  name = "${pkgName}-" + version;
   meta = {
     description = "City simulation game";
   };
diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
new file mode 100644
index 0000000000000..319453c801941
--- /dev/null
+++ b/pkgs/games/vassal/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "VASSAL-3.2.15";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/vassalengine/${name}-linux.tar.bz2";
+    sha256 = "10ng571nxr5zc2nlviyrk5bci8my67kq3qvhfn9bifzkxmjlqmk9";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/vassal $out/doc
+
+    cp CHANGES LICENSE README $out
+    cp -R lib/* $out/share/vassal
+    cp -R doc/* $out/doc
+
+    makeWrapper ${jre}/bin/java $out/bin/vassal \
+      --add-flags "-Duser.dir=$out -cp $out/share/vassal/Vengine.jar \
+      VASSAL.launch.ModuleManager"
+  '';
+
+  # Don't move doc to share/, VASSAL expects it to be in the root
+  forceShare = [ "man" "info" ];
+
+  meta = with stdenv.lib; {
+      description = "A free, open-source boardgame engine";
+      homepage = http://www.vassalengine.org/;
+      license = licenses.lgpl21;
+      maintainers = with maintainers; [ tvestelind ];
+      platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 31220b4aa6278..c7a81452f041f 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.12.4";
+  version = "1.12.5";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "19qyylylaljhk45lk2ja0xp7cx9iy4hx07l65zkg20a2v9h50lmz";
+    sha256 = "07d8ms9ayswg2g530p0zwmz3d77zv68l6nmc718iq9sbv90av6jr";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix
index cf46877ef7135..ae6ab99dad293 100644
--- a/pkgs/games/zandronum/bin.nix
+++ b/pkgs/games/zandronum/bin.nix
@@ -16,6 +16,7 @@
 , pango
 , SDL
 , zlib
+, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -46,6 +47,8 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
+  nativeBuildInputs = [ makeWrapper ];
+
   phases = [ "unpackPhase" "installPhase" ];
 
   sourceRoot = ".";
@@ -64,14 +67,17 @@ stdenv.mkDerivation rec {
       --set-rpath $libPath \
       $out/share/zandronum/zandronum-server
 
-    ln -s $out/share/zandronum/zandronum $out/bin/zandronum
-    ln -s $out/share/zandronum/zandronum-server $out/bin/zandronum-server
+    # If we don't set absolute argv0, zandronum.wad file is not found.
+    makeWrapper $out/share/zandronum/zandronum $out/bin/zandronum
+    makeWrapper $out/share/zandronum/zandronum-server $out/bin/zandronum-server
   '';
 
   meta = {
     homepage = http://zandronum.com/;
     description = "multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play.";
-    maintainer = [ stdenv.lib.maintainers.lassulus ];
+    maintainers = [ stdenv.lib.maintainers.lassulus ];
+    # Binary version has different version string than source code version.
+    license = stdenv.lib.licenses.unfreeRedistributable;
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix
index ecdf8cfdbd227..479a6abe9a47c 100644
--- a/pkgs/games/zandronum/default.nix
+++ b/pkgs/games/zandronum/default.nix
@@ -54,7 +54,7 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = http://zandronum.com/;
     description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software.";
-    maintainer = with maintainers; [ lassulus ];
+    maintainers = with maintainers; [ lassulus ];
     platforms = platforms.linux;
     license = licenses.bsdOriginal;
   };
diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix
index 110eff9397ce0..ab7a6d7cb4323 100644
--- a/pkgs/games/zangband/default.nix
+++ b/pkgs/games/zangband/default.nix
@@ -1,35 +1,40 @@
-a @ { ncurses, flex, bison, autoconf, automake, m4, coreutils, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, ncurses, flex, bison, autoconf, automake, m4, coreutils }:
+
+stdenv.mkDerivation rec {
+  name = "zangband-${version}";
+  version = "2.7.3";
 
-  version = a.lib.attrByPath ["version"] "2.7.3" a;
-  buildInputs = with a; [
-    ncurses flex bison autoconf automake m4
-  ];
-in
-rec {
   src = fetchurl {
     url = "ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/zangband-${version}.tar.gz";
     sha256 = "0654m8fzklsc8565sqdad76mxjsm1z9c280srq8863sd10af0bdq";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [
+    ncurses flex bison autoconf automake m4
+  ];
 
-  preConfigure = a.fullDepEntry (''
+  # fails during chmod due to broken permissions
+  dontMakeSourcesWritable = true;
+  postUnpack = ''
     chmod a+rwX -R .
+  '';
+
+  preConfigure = ''
     sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in
     sed -e '/FIXED_PATHS/d' -i src/z-config.h
     ./bootstrap
+  '';
+
+  preInstall = ''
     mkdir -p $out/share/games/zangband
     mkdir -p $out/share/man
     mkdir -p $out/bin
-  '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
+  '';
 
-  postInstall = a.fullDepEntry (''
+  postInstall = ''
     mv $out/bin/zangband $out/bin/.zangband.real
     echo '#! /bin/sh
-      PATH="$PATH:${a.coreutils}/bin"
+      PATH="$PATH:${coreutils}/bin"
 
       ZANGBAND_PATH="$HOME/.zangband"
       ORIG_PATH="'$out'"/share/games/zangband
@@ -49,14 +54,10 @@ rec {
       "'$out'/bin/.zangband.real" "$@"
     ' > $out/bin/zangband
     chmod +x $out/bin/zangband
-  '') ["minInit" "doUnpack"];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall" "postInstall"];
+  '';
 
-  name = "zangband-" + version;
   meta = {
     description = "rogue-like game";
-    license = a.lib.licenses.unfree;
+    license = stdenv.lib.licenses.unfree;
   };
 }
diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix
index de0f9c4db831d..3a301ed0f2b54 100644
--- a/pkgs/games/zdoom/default.nix
+++ b/pkgs/games/zdoom/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://zdoom.org/;
     description = "Enhanced port of the official DOOM source code";
-    maintainer = [ stdenv.lib.maintainers.lassulus ];
+    maintainers = [ stdenv.lib.maintainers.lassulus ];
   };
 }
 
diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix
index 2587765da688c..6c1ee05b7657b 100644
--- a/pkgs/misc/drivers/sundtek/default.nix
+++ b/pkgs/misc/drivers/sundtek/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let
-  version = "2015-12-12";
+  version = "2016-01-26";
   rpath = makeLibraryPath [ "$out/lib" "$out/bin" ];
   platform = with stdenv;
     if isx86_64 then "64bit"
@@ -15,7 +15,7 @@ in
   stdenv.mkDerivation {
     src = fetchurl {
       url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz";
-      sha256 = "0pjg4xww25z36dp64az4gdc0fxhz51f5kb8zvj03hqc774fxzpbq";
+      sha256 = "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp";
     };
     name = "sundtek-${version}";
 
@@ -38,6 +38,8 @@ in
         patchelf --set-rpath ${rpath} {} \;
     '';
 
+    preferLocalBuild = true;
+
     meta = {
       description = "Sundtek MediaTV driver";
       maintainers = [ maintainers.simonvandel ];
diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index ba26c44305bd9..148c8380d8caa 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -6,12 +6,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "mednafen-${version}";
-  version = "0.9.38.6";
+  name = "mednafen-${meta.version}";
 
   src = fetchurl {
     url = "http://mednafen.fobby.net/releases/files/${name}.tar.bz2";
-    sha256 = "0ivy0vqy1cjd5namn4bdm9ambay6rdccjl9x5418mjyqdhydlq4l";
+    sha256 = "1n6y7b86sv11vd6rv8if3wr4qyihkjai9km1s4smqcisi3pvxcqv";
   };
 
   buildInputs = with stdenv.lib;
@@ -26,6 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "0.9.38.7";
     description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator";
     homepage = http://mednafen.sourceforge.net/;
     license = licenses.gpl2;
diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix
index 60e458222d3c9..3854caf22423e 100644
--- a/pkgs/misc/emulators/mednafen/server.nix
+++ b/pkgs/misc/emulators/mednafen/server.nix
@@ -2,11 +2,10 @@
 
 stdenv.mkDerivation rec {
 
-  name = "mednafen-server-${version}";
-  version = "0.5.2";
+  name = "mednafen-server-${meta.version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/mednafen/Mednafen-Server/${version}/${name}.tar.gz";
+    url = "http://mednafen.fobby.net/releases/files/${name}.tar.gz";
     sha256="06fal6hwrb8gw94yp7plhcz55109128cgp35m7zs5vvjf1zfhcs9";
   };
 
@@ -16,6 +15,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "0.5.2";
     description = "Netplay server for Mednafen";
     homepage = http://mednafen.sourceforge.net/;
     license = licenses.gpl2;
diff --git a/pkgs/misc/emulators/mupen64plus/1.5.nix b/pkgs/misc/emulators/mupen64plus/1.5.nix
deleted file mode 100644
index 571e14347b496..0000000000000
--- a/pkgs/misc/emulators/mupen64plus/1.5.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}:
-
-stdenv.mkDerivation {
-  name = "mupen64plus-1.5";
-  src = fetchurl {
-    url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz;
-    sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq";
-  };
-  
-  buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ];
-  
-  preConfigure = ''
-    # Some C++ incompatibility fixes
-    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp
-    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Combine.cpp
-
-    # Fix some hardcoded paths
-    sed -i -e "s|/usr/local|$out|g" main/main.c
-
-    # Remove PATH environment variable from install script
-    sed -i -e "s|export PATH=|#export PATH=|" ./install.sh
-  '';
-  
-  buildPhase = "make all";
-  installPhase = "PREFIX=$out make install";
-  
-  meta = {
-    description = "A Nintendo 64 Emulator";
-    license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://code.google.com/p/mupen64plus;
-    maintainers = [ stdenv.lib.maintainers.sander ];
-  };
-}
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index 1a7e32efcbe18..69275a74b3563 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -1,62 +1,35 @@
-{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, fetchurl,
+{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage,
   pulseaudioSupport,
   wineRelease ? "stable"
 }:
 
-let sources = with lib.getAttr wineRelease (import ./versions.nix); {
-      version = wineVersion;
-      src = fetchurl {
-        url = "mirror://sourceforge/wine/wine-${wineVersion}.tar.bz2";
-        sha256 = wineSha256;
-      };
-
-      wineGecko32 = fetchurl {
-        url = "mirror://sourceforge/wine/wine_gecko-${geckoVersion}-x86.msi";
-        sha256 = geckoSha256;
-      };
-
-      wineGecko64 = fetchurl {
-        url = "mirror://sourceforge/wine/wine_gecko-${gecko64Version}-x86_64.msi";
-        sha256 = gecko64Sha256;
-      };
-
-      wineMono = fetchurl {
-        url = "mirror://sourceforge/wine/wine-mono-${monoVersion}.msi";
-        sha256 = monoSha256;
-      };
-    };
-    inherit (sources) version;
-in {
+let src = lib.getAttr wineRelease (callPackage ./sources.nix {});
+in with src; {
   wine32 = import ./base.nix {
     name = "wine-${version}";
-    inherit (sources) version src;
+    inherit src version pulseaudioSupport;
     inherit (pkgsi686Linux) lib stdenv;
-    inherit pulseaudioSupport;
     pkgArches = [ pkgsi686Linux ];
-    geckos = with sources; [ wineGecko32 ];
-    monos = with sources; [ wineMono ];
+    geckos = [ gecko32 ];
+    monos =  [ mono ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
   wine64 = import ./base.nix {
     name = "wine64-${version}";
-    inherit (sources) version src;
-    inherit lib stdenv;
-    inherit pulseaudioSupport;
+    inherit src version pulseaudioSupport lib stdenv;
     pkgArches = [ pkgs ];
-    geckos = with sources; [ wineGecko64 ];
-    monos = with sources; [ wineMono ];
+    geckos = [ gecko64 ];
+    monos =  [ mono ];
     configureFlags = "--enable-win64";
     platforms = [ "x86_64-linux" ];
   };
   wineWow = import ./base.nix {
     name = "wine-wow-${version}";
-    inherit (sources) version src;
-    inherit lib;
+    inherit src version pulseaudioSupport lib;
     stdenv = stdenv_32bit;
-    inherit pulseaudioSupport;
     pkgArches = [ pkgs pkgsi686Linux ];
-    geckos = with sources; [ wineGecko32 wineGecko64 ];
-    monos = with sources; [ wineMono ];
+    geckos = [ gecko32 gecko64 ];
+    monos =  [ mono ];
     buildScript = ./builder-wow.sh;
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
new file mode 100644
index 0000000000000..b44693502d735
--- /dev/null
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -0,0 +1,55 @@
+{ pkgs ? import <nixpkgs> {} }:
+let fetchurl = args@{url, sha256, ...}:
+  pkgs.fetchurl { inherit url sha256; } // args;
+    fetchFromGitHub = args@{owner, repo, rev, sha256, ...}:
+  pkgs.fetchFromGitHub { inherit owner repo rev sha256; } // args;
+in rec {
+
+  stable = fetchurl rec {
+    version = "1.8.1";
+    url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
+    sha256 = "15ya496qq24ipqii7ij8x8h5x8n21vgqa4h6binb74w5mzdd76hl";
+
+    ## see http://wiki.winehq.org/Gecko
+    gecko32 = fetchurl rec {
+      version = "2.40";
+      url = "mirror://sourceforge/wine/wine_gecko-${version}-x86.msi";
+      sha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s";
+    };
+    gecko64 = fetchurl rec {
+      version = "2.40";
+      url = "mirror://sourceforge/wine/wine_gecko-${version}-x86_64.msi";
+      sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3";
+    };
+    ## see http://wiki.winehq.org/Mono
+    mono = fetchurl rec {
+      version = "4.5.6";
+      url = "mirror://sourceforge/wine/wine-mono-${version}.msi";
+      sha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
+    };
+  };
+
+  unstable = fetchurl rec {
+    version = "1.9.3";
+    url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
+    sha256 = "0389xbs943iwdgv3a6pvcy2gxrwqzf20vrsbpd2yrj1lan2m8ps7";
+    inherit (stable) gecko32 gecko64 mono;
+  };
+
+  staging = fetchFromGitHub rec {
+    inherit (unstable) version;
+    sha256 = "0r932caxlkdw36f36f8y4h2r3anpl61fmqr9payb83fj55gsiq4d";
+    owner = "wine-compholio";
+    repo = "wine-staging";
+    rev = "v${version}";
+  };
+
+  winetricks = fetchFromGitHub rec {
+    version = "20160109";
+    sha256 = "0pnl5362g5q7py368vj07swbdp1fqbpvpq4jv4l5ddyclps8ajg8";
+    owner = "Winetricks";
+    repo = "winetricks";
+    rev = version;
+  };
+
+}
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index da4456c0ef980..9419aff1a39cf 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -1,18 +1,11 @@
-{ stdenv, callPackage, lib, fetchFromGitHub, wineUnstable, libtxc_dxtn_Name }:
+{ stdenv, callPackage, lib, wineUnstable, libtxc_dxtn_Name }:
 
 with callPackage ./util.nix {};
 
-let v = (import ./versions.nix).staging;
-    inherit (v) version;
-    patch = fetchFromGitHub {
-      inherit (v) sha256;
-      owner = "wine-compholio";
-      repo = "wine-staging";
-      rev = "v${version}";
-    };
+let patch = (callPackage ./sources.nix {}).staging;
     build-inputs = pkgNames: extra:
       (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;
-in assert (builtins.parseDrvName wineUnstable.name).version == version;
+in assert (builtins.parseDrvName wineUnstable.name).version == patch.version;
 
 stdenv.lib.overrideDerivation wineUnstable (self: {
   nativeBuildInputs = build-inputs [ libtxc_dxtn_Name ] self.nativeBuildInputs; 
diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
deleted file mode 100644
index 56a20a971ef97..0000000000000
--- a/pkgs/misc/emulators/wine/versions.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-rec {
-  stable = {
-    wineVersion = "1.8";
-    wineSha256  = "1x66lzpk7v8qx57clmcq5ag7yh3mqplf1plypwghgchjh70lafzk";
-    ## see http://wiki.winehq.org/Gecko
-    geckoVersion = "2.40";
-    geckoSha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s";
-    gecko64Version = "2.40";
-    gecko64Sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3";
-    ## see http://wiki.winehq.org/Mono
-    monoVersion = "4.5.6";
-    monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
-  };
-  unstable = {
-    wineVersion = "1.9.1";
-    wineSha256 = "1dhbp2jy9s3rqsbgc43jz967n2rls8dwdfi96qdxybg8kbxnachb";
-    inherit (stable)
-      geckoVersion geckoSha256
-      gecko64Version gecko64Sha256
-      monoVersion monoSha256;
-  };
-  staging = {
-    version = unstable.wineVersion;
-    sha256 = "05072wgxy8n6i71bb6649sm0ggh5c4g97clryrr8vkmgsklfkadi";
-  };
-  winetricks = {
-    version = "20160109";
-    sha256 = "0pnl5362g5q7py368vj07swbdp1fqbpvpq4jv4l5ddyclps8ajg8";
-  };
-}
diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix
index 39aaa098cfefb..2d729f7185faa 100644
--- a/pkgs/misc/emulators/wine/winetricks.nix
+++ b/pkgs/misc/emulators/wine/winetricks.nix
@@ -1,16 +1,10 @@
-{ stdenv, fetchFromGitHub, wine, perl, which, coreutils, zenity, curl
+{ stdenv, callPackage, wine, perl, which, coreutils, zenity, curl
 , cabextract, unzip, p7zip, gnused, gnugrep, bash } :
 
-let v = (import ./versions.nix).winetricks;
-in stdenv.mkDerivation rec {
-  name = "winetricks-${v.version}";
+stdenv.mkDerivation rec {
+  name = "winetricks-${src.version}";
 
-  src = fetchFromGitHub {
-    owner = "Winetricks";
-    repo = "winetricks";
-    rev = v.version;
-    sha256 = v.sha256;
-  };
+  src = (callPackage ./sources.nix {}).winetricks;
 
   buildInputs = [ perl which ];
 
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
index 60269c8dfbf66..ea79426d47e4c 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon";
     license = licenses.gpl3;
-    maintainer = [ maintainers.rycee ];
+    maintainers = [ maintainers.rycee ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 264a60cc20585..84386efeb3afd 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1586,6 +1586,17 @@ rec {
 
   };
 
+  vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vinegar-2016-01-30";
+    src = fetchgit {
+      url = "git://github.com/tpope/vim-vinegar";
+      rev = "75fc3824bc09053f22735d6726c5cfd614c15642";
+      sha256 = "19fc1487169f1d8941ffddda1ffadd842ef4a773de2d32536eae52cf494154a6";
+    };
+    dependencies = [];
+
+  };
+
   vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vundle-2015-11-04";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 207eed69160cc..a4dca009cdd98 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -122,4 +122,5 @@
 "vim-webdevicons"
 "vim2hs"
 "vimwiki"
+"vinegar"
 "vundle"
diff --git a/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch b/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch
new file mode 100644
index 0000000000000..749787c5b3a7f
--- /dev/null
+++ b/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch
@@ -0,0 +1,61 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2013-04-29
+Initial Package Version: 5.17
+Upstream Status:         unknown
+Origin:                  Arch Linux (Giovanni Campagna)
+Description:             Allow using obexd without systemd in the user session
+
+Not all sessions run systemd --user (actually, the majority
+doesn't), so the dbus daemon must be able to spawn obexd
+directly, and to do so it needs the full path of the daemon.
+---
+ Makefile.obexd                      | 4 ++--
+ obexd/src/org.bluez.obex.service    | 4 ----
+ obexd/src/org.bluez.obex.service.in | 4 ++++
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+ delete mode 100644 obexd/src/org.bluez.obex.service
+ create mode 100644 obexd/src/org.bluez.obex.service.in
+
+diff --git a/Makefile.obexd b/Makefile.obexd
+index 3760867..142e7c3 100644
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -2,12 +2,12 @@
+ if SYSTEMD
+ systemduserunitdir = @SYSTEMD_USERUNITDIR@
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+ 
+ dbussessionbusdir = @DBUS_SESSIONBUSDIR@
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+ 
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+ 
+ obex_plugindir = $(libdir)/obex/plugins
+ 
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
+deleted file mode 100644
+index a538088..0000000
+--- a/obexd/src/org.bluez.obex.service
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[D-BUS Service]
+-Name=org.bluez.obex
+-Exec=/bin/false
+-SystemdService=dbus-org.bluez.obex.service
+diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
+new file mode 100644
+index 0000000..9c815f2
+--- /dev/null
++++ b/obexd/src/org.bluez.obex.service.in
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@libexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service
+-- 
+1.8.3.1
+
+
diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 20fa830e32018..90ff4e2802110 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
       # gstreamer gst_plugins_base 
     ];
 
+  patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ];
+    
   preConfigure = ''
       substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm
       substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci "
@@ -68,6 +70,7 @@ stdenv.mkDerivation rec {
     # for bluez4 compatibility for NixOS
     mkdir $out/sbin
     ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
+    ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix
index ba3f478ddc22c..68db9345bd0e8 100644
--- a/pkgs/os-specific/linux/bluez/bluez5_28.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5_28.nix
@@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
     # for bluez4 compatibility for NixOS
     mkdir $out/sbin
     ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
+    ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix
index 95c851da30f82..60615fb1e5be6 100644
--- a/pkgs/os-specific/linux/drbd/default.nix
+++ b/pkgs/os-specific/linux/drbd/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = "SHELL=${stdenv.shell}";
 
-  installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d";
+  installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d DESTDIR=$(out)";
 
   meta = {
     homepage = http://www.drbd.org/;
diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix
new file mode 100644
index 0000000000000..06e6abfe41777
--- /dev/null
+++ b/pkgs/os-specific/linux/facetimehd/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, kernel }:
+
+# facetimehd is not supported for kernels older than 3.19";
+assert stdenv.lib.versionAtLeast kernel.version "3.19";
+
+stdenv.mkDerivation rec {
+
+  name = "facetimehd-${version}-${kernel.version}";
+  version = "git-20160127";
+
+  src = fetchFromGitHub {
+    owner = "patjak";
+    repo = "bcwc_pcie";
+    rev = "186e9f9101ed9bbd7cc8d470f840d4a74c585ca7";
+    sha256 = "1frsf6z6v94cz9fww9rbnk926jzl36fp3w2d1aw6djhzwm80a5gs";
+  };
+
+  preConfigure = ''
+    export INSTALL_MOD_PATH="$out"
+  '';
+
+  makeFlags = [
+    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/patjak/bcwc_pcie;
+    description = "Linux driver for the Facetime HD (Broadcom 1570) PCIe webcam";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.womfoo ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
new file mode 100644
index 0000000000000..05a293083b7fb
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, cpio, xz, pkgs }:
+
+let
+
+  version = "1.43";
+
+  dmgRange = "420107885-421933300"; # the whole download is 1.3GB, this cuts it down to 2MB
+
+  firmwareIn = "./System/Library/Extensions/AppleCameraInterface.kext/Contents/MacOS/AppleCameraInterface";
+  firmwareOut = "firmware.bin";
+  firmwareOffset = "81920";
+  firmwareSize = "603715";
+
+  # separated this here as the script will fail without the 'exit 0'
+  unpack = pkgs.writeScriptBin "unpack" ''
+    xzcat -Q $src | cpio --format odc -i -d ${firmwareIn}
+    exit 0
+  '';
+
+in
+
+stdenv.mkDerivation {
+
+  name = "facetimehd-firmware-${version}";
+
+  src = fetchurl {
+    url = "https://support.apple.com/downloads/DL1849/en_US/osxupd10.11.2.dmg";
+    sha256 = "1jw6sy9vj27amfak83cs2c7q856y4mk1wix3rl4q10yvd9bl4k9x";
+    curlOpts = "-r ${dmgRange}";
+  };
+
+  phases = [ "buildPhase" ];
+
+  buildInputs = [ cpio xz ];
+
+  buildPhase = ''
+    ${unpack}/bin/unpack
+    dd bs=1 skip=${firmwareOffset} count=${firmwareSize} if=${firmwareIn} of=${firmwareOut}.gz &> /dev/null
+    mkdir -p $out/lib/firmware/facetimehd
+    gunzip -c ${firmwareOut}.gz > $out/lib/firmware/facetimehd/${firmwareOut}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "facetimehd firmware";
+    homepage = https://support.apple.com/downloads/DL1849;
+    license = licenses.unfree;
+    maintainers = [ maintainers.womfoo ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 455088d8f5e90..61ea6c0c18cde 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2015-10-18";
+  version = "2015-12-04";
 
   # This repo is built by merging the latest versions of
   # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wkennington";
     repo = "linux-firmware";
-    rev = "f7694d34655a7f688033d0582f306b3f287b785d";
-    sha256 = "0pb6pq48hfcny34l3anln9g4dy1f4n8gzmfib9pk4l64648sylnl";
+    rev = "bbe4917c054eb0a73e250c6363341e3bf6725839";
+    sha256 = "1p9c74p8j8zmddljaan5i29h8wsbz8911dv2sykpnahg9r939ykd";
   };
 
   preInstall = ''
diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix
index da41c95dda273..b722815f2954e 100644
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/os-specific/linux/htop/default.nix
@@ -1,11 +1,11 @@
 { fetchFromGitHub, stdenv, autoreconfHook, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "htop-1.0.3-239-229d0058";
+  name = "htop-2.0.0";
 
   src = fetchFromGitHub {
-    sha256 = "1bym6ligd8db4iyv2m1y7aylh7f9fmk71v67rkhird05hx1xb80r";
-    rev = "229d005851af8dca595b3df8e385375fb9c382b4";
+    sha256 = "1z8rzf3ndswk3090qypl0bqzq9f32w0ik2k5x4zd7jg4hkx66k7z";
+    rev = "2.0.0";
     repo = "htop";
     owner = "hishamhm";
   };
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 90b4a6a48244f..fc54715ea7b8b 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -21,6 +21,12 @@
 with stdenv.lib;
 
 ''
+  # Compress kernel modules for a sizable disk space savings.
+  ${optionalString (versionAtLeast version "3.18") ''
+    MODULE_COMPRESS y
+    MODULE_COMPRESS_XZ y
+  ''}
+
   # Debugging.
   DEBUG_KERNEL y
   TIMER_STATS y
@@ -355,6 +361,9 @@ with stdenv.lib;
   X86_CHECK_BIOS_CORRUPTION y
   X86_MCE y
 
+  # PCI-Expresscard hotplug support
+  HOTPLUG_PCI_PCIE y
+
   # Linux containers.
   NAMESPACES? y #  Required by 'unshare' used by 'nixos-install'
   RT_GROUP_SCHED? y
diff --git a/pkgs/os-specific/linux/kernel/cve-2016-0728.patch b/pkgs/os-specific/linux/kernel/cve-2016-0728.patch
deleted file mode 100644
index 5eec95c629303..0000000000000
--- a/pkgs/os-specific/linux/kernel/cve-2016-0728.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 05fd13592b60c3e9873f56705f80ff934e98b046 Mon Sep 17 00:00:00 2001
-From: David Howells <dhowells@redhat.com>
-Date: Mon, 18 Jan 2016 10:53:31 +0000
-Subject: [PATCH] KEYS: Fix keyring ref leak in join_session_keyring()
-
-This fixes CVE-2016-0728.
-
-If a thread is asked to join as a session keyring the keyring that's already
-set as its session, we leak a keyring reference.
-
-This can be tested with the following program:
-
-	#include <stddef.h>
-	#include <stdio.h>
-	#include <sys/types.h>
-	#include <keyutils.h>
-
-	int main(int argc, const char *argv[])
-	{
-		int i = 0;
-		key_serial_t serial;
-
-		serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
-				"leaked-keyring");
-		if (serial < 0) {
-			perror("keyctl");
-			return -1;
-		}
-
-		if (keyctl(KEYCTL_SETPERM, serial,
-			   KEY_POS_ALL | KEY_USR_ALL) < 0) {
-			perror("keyctl");
-			return -1;
-		}
-
-		for (i = 0; i < 100; i++) {
-			serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
-					"leaked-keyring");
-			if (serial < 0) {
-				perror("keyctl");
-				return -1;
-			}
-		}
-
-		return 0;
-	}
-
-If, after the program has run, there something like the following line in
-/proc/keys:
-
-3f3d898f I--Q---   100 perm 3f3f0000     0     0 keyring   leaked-keyring: empty
-
-with a usage count of 100 * the number of times the program has been run,
-then the kernel is malfunctioning.  If leaked-keyring has zero usages or
-has been garbage collected, then the problem is fixed.
-
-Reported-by: Yevgeny Pats <yevgeny@perception-point.io>
-Signed-off-by: David Howells <dhowells@redhat.com>
-RH-bugzilla: 1298036
----
- security/keys/process_keys.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
-index 43b4cddbf2b3..7877e5cd4e23 100644
---- a/security/keys/process_keys.c
-+++ b/security/keys/process_keys.c
-@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
- 		ret = PTR_ERR(keyring);
- 		goto error2;
- 	} else if (keyring == new->session_keyring) {
-+		key_put(keyring);
- 		ret = 0;
- 		goto error2;
- 	}
--- 
-2.5.0
-
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 59d3642e62278..af14434b08f2c 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -57,10 +57,6 @@ let
     autoModules = stdenv.platform.kernelAutoModules;
     arch = stdenv.platform.kernelArch;
 
-    preConfigure = ''
-        buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=Thu Jan 1 00:00:01 UTC 1970")
-    '';
-
     crossAttrs = let
         cp = stdenv.cross.platform;
       in {
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 6a4531d9deb48..afca9b9c35e46 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.92";
+  version = "3.10.96";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0z0jdix1mfpnnc8cxw7rzpnhxdayckpnrasvxi1qf0dwhcqgk92d";
+    sha256 = "0wnlvbyg92q48kz5cn3bznjkkzpsik8z51dqhcxdpddy1k6iqb3k";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+  kernelPatches = args.kernelPatches;
 
   features.iwlwifi = true;
   features.efiBootStub = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 1e58d4e50291e..378a2b854f9eb 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.50";
+  version = "3.12.53";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1bn07wsrcbg4qgqd4v2810c3qc0ifbcza0fyj8s54yd78g9qj4lj";
+    sha256 = "1f2h4z8lk1s0h5lw7n3yb47dhpbr7gzma7ifsslwhyjg7s44cb27";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+  kernelPatches = args.kernelPatches;
 
   features.iwlwifi = true;
   features.efiBootStub = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 62f1be8b92b13..9ad5a336de3bb 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,16 +1,15 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.58";
-  # Remember to update grsecurity!
+  version = "3.14.60";
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0jw1023cpn4bjmi0db86lrxri9xj75cj8p2iqs44jabvh35idl7l";
+    sha256 = "1zwq0j4slqg33z4yyk5s35hdzrq0g7jk1bd2kvgvkyqn1dkkvh0j";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+  kernelPatches = args.kernelPatches;
 
   features.iwlwifi = true;
   features.efiBootStub = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 86258308c1e03..9b90ea3556b13 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.25";
+  version = "3.18.26";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "14pz8mvk48i2y1ffkhczjcm2icpb2g9xlpzyrvvis42n5178fjf6";
+    sha256 = "0bhf8x1h5crc9kimprjs7q74p86gsqsdr8nz54nv33c6zmryqsic";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+  kernelPatches = args.kernelPatches;
 
   features.iwlwifi = true;
   features.efiBootStub = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index 29d4870597a37..fbcfa17a8bc78 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1.15";
+  version = "4.1.17";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "18sr0dl5ax6pcx6nqp9drb4l6a38g07vxihiqpbwb231jv68h8j7";
+    sha256 = "084ij19vgm27ljrjabqqmlqn27p168nsm9grhr6rajid4n79h6ab";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+  kernelPatches = args.kernelPatches;
 
   features.iwlwifi = true;
   features.efiBootStub = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index cf17e915f8bf5..18bc11926214b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,16 +1,15 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4";
-  modDirVersion = "4.4.0";
+  version = "4.4.1";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2";
+    sha256 = "0mwaqvl7dkasidciah1al57a1djnsk46ha5mjy4psq2inj71klky";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+  kernelPatches = args.kernelPatches;
 
   features.iwlwifi = true;
   features.efiBootStub = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index 2b0e3017979f9..6a1d8da5a92bc 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -7,7 +7,7 @@ import ./generic.nix (args // rec {
 
   extraMeta = {
     branch = "3.18";
-    maintainer = stdenv.lib.maintainers.layus;
+    maintainers = stdenv.lib.maintainers.layus;
   };
 
   src = fetchurl {
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index c70d6f79f38b9..8dc55f6e6a842 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4-rc8";
-  modDirVersion = "4.4.0-rc8";
-  extraMeta.branch = "4.4";
+  version = "4.5-rc3";
+  modDirVersion = "4.5.0-rc3";
+  extraMeta.branch = "4.5";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "0cwf80lryzhdajd3r97b33ym5njjpf5rbcbjzz7lja0w9xs1dvwj";
+    sha256 = "fae5b3b318d6ca7d142b2947e8df3e4091e2330dc509ba19503abf4b9c314986";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux.upstream.template b/pkgs/os-specific/linux/kernel/linux.upstream.template
deleted file mode 100644
index 624b83d45b331..0000000000000
--- a/pkgs/os-specific/linux/kernel/linux.upstream.template
+++ /dev/null
@@ -1,13 +0,0 @@
-url "http://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_VERSION_RC:+testing/}"
-version_link "linux-${LINUX_VERSION}.*tar[.]xz\$"
-version '.*linux-([0-9.]+(-rc[0-9]+)?)[.]tar.*' '\1'
-target "linux-${LINUX_VERSION}.nix"
-name "linux_${LINUX_VERSION/./_}"
-
-do_overwrite() {
-  ensure_hash
-  set_var_value version "$CURRENT_VERSION"
-  set_var_value sha256 "$CURRENT_HASH"
-  [ -n "$LINUX_VERSION_RC" ] && set_var_value testing true '' '' 1
-  [ -z "$LINUX_VERSION_RC" ] && set_var_value testing false '' '' 1
-}
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 3882638ee9542..cc98430a843f4 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -102,7 +102,8 @@ let
         make $makeFlags "''${makeFlagsArray[@]}" oldconfig
         runHook postConfigure
 
-        buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=Thu Jan 1 00:00:01 UTC 1970")
+        # Note: we can get rid of this once http://permalink.gmane.org/gmane.linux.kbuild.devel/13800 is merged.
+        buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)")
       '';
 
       buildFlags = [
@@ -128,6 +129,9 @@ let
         mkdir -p $out/dtbs
         cp $buildRoot/arch/$karch/boot/dts/*.dtb $out/dtbs
       '' else "") + (if isModular then ''
+        if [ -z "$dontStrip" ]; then
+          installFlagsArray+=("INSTALL_MOD_STRIP=1")
+        fi
         make modules_install $makeFlags "''${makeFlagsArray[@]}" \
           $installFlags "''${installFlagsArray[@]}"
         unlink $out/lib/modules/${modDirVersion}/build
@@ -189,9 +193,6 @@ let
       # !!! This leaves references to gcc in $dev
       # that we might be able to avoid
       postFixup = if isModular then ''
-        if [ -z "$dontStrip" ]; then
-            find $out -name "*.ko" -print0 | xargs -0 -r ''${crossConfig+$crossConfig-}strip -S
-        fi
         # !!! Should this be part of stdenv? Also patchELF should take an argument...
         prefix=$dev
         patchELF
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 7e95f1dedb1a4..3f7afd9032267 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -22,7 +22,7 @@ let
     { name = "grsecurity-${grversion}-${kversion}";
       inherit grversion kversion revision;
       patch = fetchurl {
-        url = "http://grsecurity.net/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch";
+        url = "https://github.com/slashbeast/grsecurity-scrape/blob/master/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true";
         inherit sha256;
       };
       features.grsecurity = true;
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 1b12a0076b459..12449a0a7ddab 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -8,11 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "10lzfkmnpq6a43a3gkx7x633njh216w0bjwz31rv8a1jlgg1sfxs";
   };
 
-  # Disable xz/zlib support to prevent needing them in the initrd.
-  
-  buildInputs = [ pkgconfig libxslt /* xz zlib */ ];
+  buildInputs = [ pkgconfig libxslt xz /* zlib */ ];
 
-  configureFlags = [ "--sysconfdir=/etc" /* "--with-xz" "--with-zlib" */ ];
+  configureFlags = [ "--sysconfdir=/etc" "--with-xz" /* "--with-zlib" */ ];
 
   patches = [ ./module-dir.patch ];
 
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 113d59d641dc9..c185d69c5540b 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "129";
+  version = "131";
 
   src = fetchFromGitHub {
-    sha256 = "143xh5zvgax88yhg6mg6img64nrda85yybf76fgsk7a8gc57ghyk";
+    sha256 = "1hqb06gdx5bw4jh6xix0z5qhi4956asykf43zk1m1mjsj8lkzaps";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";
diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index 3c94362b820c8..4246e51232173 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "pagemon-${version}";
-  version = "0.01.06";
+  version = "0.01.08";
 
   src = fetchFromGitHub {
-    sha256 = "0p6mzmyjn5dq1ma9ld47gnrszyf0yph76dd5k7hl60a5zq5741aa";
+    sha256 = "079x8ah33nh4faqcy0jy24x30l40j5m00d57aawaayaq18smqs3f";
     rev = "V${version}";
     repo = "pagemon";
     owner = "ColinIanKing";
diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix
index ecffa7bec59a0..f58dadfd10cea 100644
--- a/pkgs/os-specific/linux/pam_u2f/default.nix
+++ b/pkgs/os-specific/linux/pam_u2f/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "pam_u2f-${version}";
-  version = "1.0.1";
+  version = "1.0.4";
 
   src     = fetchurl {
     url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz";
-    sha256 = "08lmc2il877k7djkjmza3k0n6ij8b4hx4x9dl6wwfdjqsr8d2zfp";
+    sha256 = "189j0wgx6fs146vfp88djqpl1flpfb3962l1a2marlp6d12jwm3i";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix
new file mode 100644
index 0000000000000..b4f93e9de3fb2
--- /dev/null
+++ b/pkgs/os-specific/linux/pflask/default.nix
@@ -0,0 +1,33 @@
+{ lib, stdenv, fetchurl, python, waf }:
+
+stdenv.mkDerivation rec {
+  name = "pflask-${version}";
+  version = "git-2015-12-17";
+  rev = "599418bb6453eaa0ccab493f9411f13726c1a636";
+
+  src = fetchurl {
+    url = "https://github.com/ghedo/pflask/archive/${rev}.tar.gz";
+    sha256 = "2545fca37f9da484b46b6fb5e3a9bbba6526a9725189fe4af5227ef6e6fca440";
+  };
+
+  buildInputs = [ python ];
+
+  configurePhase = ''
+    ln -s ${waf} waf
+    python waf configure --prefix=$out
+  '';
+  buildPhase = ''
+    python waf build
+  '';
+  installPhase = ''
+    python waf install
+  '';
+
+  meta = {
+    description = "Lightweight process containers for Linux";
+    homepage    = "https://ghedo.github.io/pflask/";
+    license     = lib.licenses.bsd2;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index ef1dbf00b52c9..59083a8b040e6 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe"
+    substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset"
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index b164693612df7..0f066e380c1b1 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod
 , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
-, glib, kbd, libxslt, coreutils, libgcrypt, libapparmor, audit, lz4
+, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4
 , kexectools, libmicrohttpd, linuxHeaders, libseccomp
 , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
 , enableKDbus ? false
@@ -9,14 +9,14 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  version = "228";
+  version = "229";
   name = "systemd-${version}";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "systemd";
-    rev = "b737c07cc0234acfa87282786025d556bca91c3f";
-    sha256 = "0wca8zkn39914c232andvf3v0ni6ylv154kz3s9fcvg47rhpd5n1";
+    rev = "4936f6e6c05162516a685ebd227b55816cf2b670";
+    sha256 = "1q0pyrljmq73qcan9rfqsiw66l1g159m5in5qgb8zwlwhl928670";
   };
 
   patches = [ ./hwdb-location.diff ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl
-      /* cryptsetup */ libuuid m4 glib libxslt libgcrypt
+      /* cryptsetup */ libuuid m4 glib libxslt libgcrypt libgpgerror
       libmicrohttpd kexectools libseccomp libffi audit lz4 libapparmor
       /* FIXME: we may be able to prevent the following dependencies
          by generating an autoconf'd tarball, but that's probably not
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
       "--with-sysvinit-path="
       "--with-sysvrcnd-path="
       "--with-rc-local-script-path-stop=/etc/halt.local"
-    ] ++ stdenv.lib.optional enableKDbus "--enable-kdbus";
+    ] ++ (if enableKDbus then [ "--enable-kdbus" ] else [ "--disable-kdbus" ]);
 
   preConfigure =
     ''
diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix
index 2b5949959516c..99f8d45b4c1d8 100644
--- a/pkgs/servers/mail/dspam/default.nix
+++ b/pkgs/servers/mail/dspam/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, makeWrapper
-, gawk, gnused, gnugrep, coreutils
+, gawk, gnused, gnugrep, coreutils, which
 , perl, NetSMTP
 , withMySQL ? false, zlib, libmysql
 , withPgSQL ? false, postgresql
@@ -15,7 +15,7 @@ let
              ++ lib.optional withSQLite "sqlite3_drv"
              ++ lib.optional withDB "libdb4_drv"
             );
-  maintenancePath = lib.makeSearchPath "bin" [ gawk gnused gnugrep coreutils ];
+  maintenancePath = lib.makeSearchPath "bin" [ gawk gnused gnugrep coreutils which ];
 
 in stdenv.mkDerivation rec {
   name = "dspam-3.10.2";
@@ -83,7 +83,7 @@ in stdenv.mkDerivation rec {
     # Install maintenance script
     install -Dm755 contrib/dspam_maintenance/dspam_maintenance.sh $out/bin/dspam_maintenance
     sed -i \
-      -e '2iexport PATH=${maintenancePath}:$PATH' \
+      -e "2iexport PATH=$out/bin:${maintenancePath}:\$PATH" \
       -e 's,/usr/[a-z0-9/]*,,g' \
       -e 's,^DSPAM_CONFIGDIR=.*,DSPAM_CONFIGDIR=/etc/dspam,' \
       -e "s,^DSPAM_HOMEDIR=.*,DSPAM_HOMEDIR=/var/lib/dspam," \
@@ -93,6 +93,7 @@ in stdenv.mkDerivation rec {
       -e "s,^PGSQL_BIN_DIR=.*,PGSQL_BIN_DIR=/run/current-system/sw/bin," \
       -e "s,^SQLITE_BIN_DIR=.*,SQLITE_BIN_DIR=/run/current-system/sw/bin," \
       -e "s,^SQLITE3_BIN_DIR=.*,SQLITE3_BIN_DIR=/run/current-system/sw/bin," \
+      -e 's,^DSPAM_CRON_LOCKFILE=.*,DSPAM_CRON_LOCKFILE=/run/dspam/dspam_maintenance.pid,' \
       $out/bin/dspam_maintenance
   '';
 
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 03367c7b50d95..7acca907729c6 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
     "--with-queue-user=smtpq"
     "--with-ca-file=/etc/ssl/certs/ca-certificates.crt"
     "--with-libevent-dir=${libevent.dev}"
+    "--enable-table-db"
   ];
 
   installFlags = [
diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix
new file mode 100644
index 0000000000000..f45dd3b7248a3
--- /dev/null
+++ b/pkgs/servers/mail/postfix/pfixtools.nix
@@ -0,0 +1,48 @@
+{ stdenv, lib, fetchFromGitHub, git, gperf, pcre, unbound, libev, tokyocabinet, pkgconfig, bash, libsrs2 }:
+
+let
+  version = "0.9";
+
+  pfixtoolsSrc = fetchFromGitHub {
+    owner = "Fruneau";
+    repo = "pfixtools";
+    rev = "pfixtools-${version}";
+    sha256 = "1vmbrw686f41n6xfjphfshn96vl07ynvnsyjdw9yfn9bfnldcjcq";
+  };
+
+  srcRoot = "pfixtools-${pfixtoolsSrc.rev}-src";
+
+  libCommonSrc = fetchFromGitHub {
+    owner = "Fruneau";
+    repo = "libcommon";
+    rev = "b07e6bdea3d24748e0d39783d7d817096d10cc67";
+    sha256 = "14fxldp29j4vmfmhfgwwi37pj8cz0flm1aykkxlbgakz92d4pm35";
+  };
+
+in
+
+stdenv.mkDerivation {
+  name = "pfixtools-${version}";
+
+  src = pfixtoolsSrc;
+
+  buildInputs = [git gperf pcre unbound libev tokyocabinet pkgconfig bash libsrs2];
+
+  postUnpack = ''
+    cp -Rp ${libCommonSrc}/* ${srcRoot}/common;
+    chmod -R +w ${srcRoot}/common;
+  '';
+
+  postPatch = ''
+    substituteInPlace postlicyd/policy_tokens.sh \
+                      --replace /bin/bash ${bash}/bin/bash;
+  '';
+
+  makeFlags = "DESTDIR=$(out) prefix=";
+
+  meta = {
+    description = "a collection of postfix-related tools";
+    license = with lib.licenses; [ bsd3 ];
+    homepage = https://github.com/Fruneau/pfixtools;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
index 45c6254662806..ad40b57f8a608 100644
--- a/pkgs/servers/mail/rmilter/default.nix
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/vstakhov/rmilter";
     license = licenses.bsd2; 
     description = "server, used to integrate rspamd and milter compatible MTA, for example postfix or sendmail";
-    maintainer = maintainers.avnik;
+    maintainers = maintainers.avnik;
   };
 }
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index a3b20820a6e03..1f9c36b737777 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/vstakhov/rspamd";
     license = licenses.bsd2; 
     description = "advanced spam filtering system";
-    maintainer = maintainers.avnik;
+    maintainers = maintainers.avnik;
   };
 }
diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index cac8eb3fba810..d0f70a554f7e7 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -11,8 +11,8 @@
 
 let
 
-  version = "2.1.12";
-  sha256 = "0ngibzw7lx2nppzsq5hn6adbkyzns6bnhsrkllqpimyjf27sjfq1";
+  version = "2.1.13";
+  sha256 = "09b3vf5jsv70xlfimj30v8l1zw7c5xdgpw5fpmn6jh8n3gigybqh";
 
 in
 
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index d88f7a89493de..2974b91152e26 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "plex-${version}";
-  version = "0.9.14.6.1620";
-  vsnHash = "e0b7243";
+  version = "0.9.15.2.1663";
+  vsnHash = "7efd046";
 
   src = fetchurl {
     url    = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm";
-    sha256 = "0br82yxnvjapvsrb0mbfd12mx7qqi9zh623jnivsjk2gxbfd3ki1";
+    sha256 = "f06225807c6284914bca1cfaec4490d594c53a2c794d916b321658388d40f9cf";
   };
 
   buildInputs = [ rpmextract glibc ];
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 66ed31bab7b98..02f5363be8e7d 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation rec {
   name = "${if libOnly then "lib" else ""}pulseaudio-${version}";
-  version = "7.1";
+  version = "8.0";
 
   src = fetchurl {
     url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz";
-    sha256 = "1ndrac0j528lsg3b8wcsgvzds38ml0ja4m57xsn953rj51552rz6";
+    sha256 = "128rrlvrgb4ia3pbzipf5mi6nvrpm6zmxn5r3bynqiikhvify3k9";
   };
 
   patches = [ ./caps-fix.patch ];
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
 
   postInstall = lib.optionalString libOnly ''
     rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
-    sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $out/lib/libpulsecore-${version}.la
+    sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $out/lib/pulseaudio/libpulsecore-${version}.la
   ''
     + ''moveToOutput lib/cmake "$dev" '';
 
diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
new file mode 100644
index 0000000000000..cdc2905d62db0
--- /dev/null
+++ b/pkgs/servers/quagga/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchurl, libcap, libnl, readline, net_snmp, less, perl, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "quagga-${version}";
+  version = "0.99.24.1";
+
+  src = fetchurl {
+    url = "mirror://savannah/quagga/${name}.tar.gz";
+    sha256 = "0kvmc810m7ssrvgb3213271rpywyxb646v5bzjl1jl88vx3imbl4";
+  };
+
+  buildInputs =
+    [ readline net_snmp ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libcap libnl ];
+
+  nativeBuildInputs = [ perl texinfo ];
+
+  configureFlags = [
+    "--sysconfdir=/etc/quagga"
+    "--localstatedir=/run/quagga"
+    "--sbindir=$(out)/libexec/quagga"
+    "--disable-exampledir"
+    "--enable-user=quagga"
+    "--enable-group=quagga"
+    "--enable-configfile-mask=0640"
+    "--enable-logfile-mask=0640"
+    "--enable-vtysh"
+    "--enable-vty-group=quaggavty"
+    "--enable-snmp"
+    "--enable-multipath=64"
+    "--enable-rtadv"
+    "--enable-irdp"
+    "--enable-opaque-lsa"
+    "--enable-ospf-te"
+    "--enable-pimd"
+    "--enable-isis-topology"
+  ];
+
+  preConfigure = ''
+    substituteInPlace vtysh/vtysh.c --replace \"more\" \"${less}/bin/less\"
+  '';
+
+  postInstall = ''
+    rm -f $out/bin/test_igmpv3_join
+    mv -f $out/libexec/quagga/ospfclient $out/bin/
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Quagga BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite";
+    longDescription = ''
+      GNU Quagga is free software which manages TCP/IP based routing protocols.
+      It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2, and RIPng as
+      well as the IPv6 versions of these.
+
+      As the predecessor Zebra has been considered orphaned, the Quagga project
+      has been formed by members of the zebra mailing list and the former
+      zebra-pj project to continue developing.
+
+      Quagga uses threading if the kernel supports it, but can also run on
+      kernels that do not support threading. Each protocol has its own daemon.
+
+      It is more than a routed replacement, it can be used as a Route Server and
+      a Route Reflector.
+    '';
+    homepage = http://www.quagga.net/;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ tavyc ];
+  };
+}
diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix
new file mode 100644
index 0000000000000..a37703ae7fd78
--- /dev/null
+++ b/pkgs/servers/search/elasticsearch/2.x.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "2.2.0";
+  name = "elasticsearch-${version}";
+
+  src = fetchurl {
+    url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz";
+    sha256 = "0c2d0mpcr8lpvifvgp2pfj7avdi7fa8a5vib0gqdap7mw60wqw7d";
+  };
+
+  patches = [ ./es-home-2.x.patch ];
+
+  buildInputs = [ makeWrapper jre ] ++
+    (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R bin config lib $out
+
+    # don't want to have binary with name plugin
+    mv $out/bin/plugin $out/bin/elasticsearch-plugin
+       wrapProgram $out/bin/elasticsearch ${if (!stdenv.isDarwin)
+        then ''--prefix PATH : "${utillinux}/bin/"''
+        else ''--prefix PATH : "${getopt}/bin"''} \
+      --set JAVA_HOME "${jre}"
+    wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}"
+  '';
+
+  meta = {
+    description = "Open Source, Distributed, RESTful Search Engine";
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = [
+      maintainers.offline
+      maintainers.markWot
+    ];
+  };
+}
diff --git a/pkgs/servers/search/elasticsearch/es-home-2.x.patch b/pkgs/servers/search/elasticsearch/es-home-2.x.patch
new file mode 100644
index 0000000000000..0c80e8651145d
--- /dev/null
+++ b/pkgs/servers/search/elasticsearch/es-home-2.x.patch
@@ -0,0 +1,31 @@
+diff -rupN a/bin/elasticsearch b/bin/elasticsearch
+--- a/bin/elasticsearch	2015-11-18 21:48:18.000000000 +0100
++++ b/bin/elasticsearch	2015-12-04 00:52:21.032475098 +0100
+@@ -72,7 +72,11 @@ while [ -h "$SCRIPT" ] ; do
+ done
+ 
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++
++if [ -z "$ES_HOME" ]; then
++    echo "You must set the ES_HOME var" >&2
++    exit 1
++fi
+ 
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
+diff -rupN a/bin/plugin b/bin/plugin
+--- a/bin/plugin	2015-11-18 21:48:18.000000000 +0100
++++ b/bin/plugin	2015-12-04 00:52:55.947453619 +0100
+@@ -17,7 +17,10 @@ while [ -h "$SCRIPT" ] ; do
+ done
+ 
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++if [ -z "$ES_HOME" ]; then
++    echo "You must set the ES_HOME var" >&2
++    exit 1
++fi
+ 
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index c5daaa626a7ae..5fec92a5bf8af 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -66,40 +66,34 @@ let
 
 in {
 
-  postgresql90 = common {
-    version = "9.0.23";
-    psqlSchema = "9.0";
-    sha256 = "1pnpni95r0ry112z6ycrqk5m6iw0vd4npg789czrl4qlr0cvxg1x";
-  };
-
   postgresql91 = common {
-    version = "9.1.19";
+    version = "9.1.20";
     psqlSchema = "9.1";
-    sha256 = "1ihf9h353agsm5p2dr717dvraxvsw6j7chbn3qxdcz8la5s0bmfb";
+    sha256 = "0dr9hz1a0ax30f6jvnv2rck0zzxgk9x7nh4n1xgshrf26i1nq7kd";
   };
 
   postgresql92 = common {
-    version = "9.2.14";
+    version = "9.2.15";
     psqlSchema = "9.2";
-    sha256 = "0bi9zfsfhj84mnaa41ar63j9qgzsnac1wwgjhy2c6j0a68zhphjl";
+    sha256 = "0q1yahkfys78crf59avp02ibd0lp3z7h626xchyfi6cqb03livbw";
   };
 
   postgresql93 = common {
-    version = "9.3.10";
+    version = "9.3.11";
     psqlSchema = "9.3";
-    sha256 = "0c8mailildnqnndwpmnqf8ymxmk1qf5w5dq02hjqmydgfq7lyi75";
+    sha256 = "08ba951nfiy516flaw352shj1zslxg4ryx3w5k0adls1r682l8ix";
   };
 
   postgresql94 = common {
-    version = "9.4.5";
+    version = "9.4.6";
     psqlSchema = "9.4";
-    sha256 = "0faav7k3nlhh1z7j1r3adrhx1fpsji3jixmm2abjm93fdg350z5q";
+    sha256 = "19j0845i195ksg9pvnk3yc2fr62i7ii2bqgbidfjq556056izknb";
   };
 
   postgresql95 = common {
-    version = "9.5.0";
+    version = "9.5.1";
     psqlSchema = "9.5";
-    sha256 = "f1c0d3a1a8aa8c92738cab0153fbfffcc4d4158b3fee84f7aa6bfea8283978bc";
+    sha256 = "1ljvijaja5zy4i5b1450drbj8m3fcm3ly1zzaakp75x30s2rsc3b";
   };
 
 
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 22b4e750772a0..7ba97cf35b045 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1568,11 +1568,11 @@ let
   }) // {inherit ;};
 
   xf86inputevdev = (mkDerivation "xf86inputevdev" {
-    name = "xf86-input-evdev-2.10.0";
+    name = "xf86-input-evdev-2.10.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.0.tar.bz2;
-      sha256 = "05yihr84rf209yyjvin8ab55h504b30c7dck8kgrwykvn272k5yh";
+      url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.tar.bz2;
+      sha256 = "05z05n39v8s2b0hwhcjb1bca7j8gc62bv9jxnibawwmjym3jp75g";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index ddda39c76f7ff..d0a812e45d6a1 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -119,7 +119,7 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.10.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 2fb6f7a4b2df7..f1fa6bed00c23 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -17,154 +17,162 @@ let
   ctlpath = lib.makeSearchPath "bin" [ bash gnused gnugrep coreutils utillinux procps ];
 
   fakegit = writeScriptBin "git" ''
-    #! ${stdenv.shell}
-    exit 0
+    #! ${stdenv.shell} -e
+    if [ "$1" = "describe" ]; then
+      [ -r .rev ] && cat .rev || true
+    fi
   '';
 
-  # These can be extracted from `rebar.config.script`
+  # These can be extracted from `rebar.config`
   # Some dependencies are from another packages. Try commenting them out; then during build
   # you'll get necessary revision information.
   ejdeps = {
-    p1_cache_tab = fetchFromGitHub {
+    cache_tab = fetchFromGitHub {
       owner = "processone";
       repo = "cache_tab";
-      rev = "f7ea12b0ba962a3d2f9a406d2954cf7de4e27230";
-      sha256 = "043rz66s6vhcbk02qjhn1r8jv8yyy4gk0gsknmk7ya6wq2v1farw";
+      rev = "1.0.1";
+      sha256 = "1mq5vgqskb0v2pdn6i3610hzd9iyjznh8143pdbz8z57rrhxpxg4";
     };
     p1_tls = fetchFromGitHub {
       owner = "processone";
       repo = "tls";
-      rev = "e56321afd974e9da33da913cd31beebc8e73e75f";
-      sha256 = "0k8dx8mww2ilr4y5m2llhqh673l0z7r73f0lh7klyf57wfqy7hzk";
+      rev = "1.0.0";
+      sha256 = "1q6l5drgmwj4fp4nfh0075lczplia4n40sirk9pd5x76d59qcmnj";
     };
     p1_stringprep = fetchFromGitHub {
       owner = "processone";
       repo = "stringprep";
-      rev = "3c640237a3a7831dc39de6a6d329d3a9af25c579";
-      sha256 = "0mwlkivkfj16bdv80jr8kqa0vcqglxkq90m9qn0m6zp4bjc3jm3n";
+      rev = "1.0.0";
+      sha256 = "105xc0af61xrd4vjxrg49gxbij8x0fq4yribywa8qly303d1nwwa";
     };
     p1_xml = fetchFromGitHub {
       owner = "processone";
       repo = "xml";
-      rev = "1c8b016b0ac7986efb823baf1682a43565449e65";
-      sha256 = "192jhj0cwwypbiass3rm2449410pqyk3mgrdg7yyvqwmjzzkmh87";
+      rev = "1.1.1";
+      sha256 = "07zxc8ky78sd2mcbhhrxha68arbbk8vyayn9gwi402avnqcic7cx";
     };
     esip = fetchFromGitHub {
       owner = "processone";
       repo = "p1_sip";
-      rev = "d662d3fe7f6288b444ea321d854de0bd6d40e022";
-      sha256 = "1mwzkkv01vr9n13h6h3100jrrlgb683ncq9jymnbxqxk6rn7xjd1";
+      rev = "1.0.0";
+      sha256 = "02k920995b0js6srarx0rabavs428rl0dp7zz90x74l8b589zq9a";
     };
     p1_stun = fetchFromGitHub {
       owner = "processone";
       repo = "stun";
-      rev = "061bdae484268cbf0457ad4797e74b8516df3ad1";
-      sha256 = "0zaw8yq4sk7x4ybibcq93k9b6rb7fn03i0k8gb2dnlipmbcdd8cf";
+      rev = "0.9.0";
+      sha256 = "0ghf2p6z1m55f5pm4pv5gj7h7fdcwcsyqz1wzax4w8bgs9id06dm";
     };
     p1_yaml = fetchFromGitHub {
       owner = "processone";
       repo = "p1_yaml";
-      rev = "79f756ba73a235c4d3836ec07b5f7f2b55f49638";
-      sha256 = "05jjw02ay8v34izwgi5zizqp1mj68ypjilxn59c262xj7c169pzh";
+      rev = "1.0.0";
+      sha256 = "0is0vr8ygh3fbiyf0jb85cfpfakxmx31fqk6s4j90gmfhlbm16f8";
     };
     p1_utils = fetchFromGitHub {
       owner = "processone";
       repo = "p1_utils";
-      rev = "d7800881e6702723ce58b7646b60c9e4cd25d563";
-      sha256 = "07p47ccrdjymjmn6rn9jlcyg515bs9l0iwfbc75qsk10ddnmbvdi";
+      rev = "1.0.2";
+      sha256 = "11b71bnc90riy1qplkpwx6l1yr9849jai3ckri35cavfsk35j687";
     };
     jiffy = fetchFromGitHub {
       owner = "davisp";
       repo = "jiffy";
-      rev = "cfc61a2e952dc3182e0f9b1473467563699992e2";
-      sha256 = "1c2x71x90jlx4585znxz8fg46q3jxm80nk7v184lf4pqa1snk8kk";
+      rev = "0.14.5";
+      sha256 = "1xs01cl4gq1x6sjj7d1qgg4iq9iwzv3cjqjrj0kr7rqrbfqx2nq3";
     };
     oauth2 = fetchFromGitHub {
-      owner = "prefiks";
+      owner = "kivra";
       repo = "oauth2";
-      rev = "e6da9912e5d8f658e7e868f41a102d085bdbef59";
-      sha256 = "0di33bkj8xc7h17z1fs4birp8a88c1ds72jc4xz2qmz8kh7q9m3k";
+      rev = "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8";
+      sha256 = "0mbmw6668l945iqppba991793nmmkyvvf18zxgdahxcwgxg1majn";
     };
     xmlrpc = fetchFromGitHub {
       owner = "rds13";
       repo = "xmlrpc";
-      rev = "42e6e96a0fe7106830274feed915125feb1056f3";
-      sha256 = "10dk480s6z653lr5sap4rcx3zsfmg68hgapvc4jvcyf7vgg12d3s";
+      rev = "1.15";
+      sha256 = "0ihwag2hgw9rswxygallc4w1yipgpd6arw3xpr799ib7ybsn8x81";
     };
 
     p1_mysql = fetchFromGitHub {
       owner = "processone";
       repo = "mysql";
-      rev = "dfa87da95f8fdb92e270741c2a53f796b682f918";
-      sha256 = "1nw7n1xvid4yqp57s94drdjf6ffap8zpy8hkrz9yffzkhk9biz5y";
+      rev = "1.0.0";
+      sha256 = "1v3g75hhfpv5bnrar23y7lsk3pd02xl5cy4mj13j0qxl6bc4dgss";
     };
     p1_pgsql = fetchFromGitHub {
       owner = "processone";
       repo = "pgsql";
-      rev = "e72c03c60bfcb56bbb5d259342021d9cb3581dac";
-      sha256 = "0y89995h7g8bi12qi1m4cdzcswsljbv7y8zb43rjg5ss2bcq7kb6";
+      rev = "1.0.0";
+      sha256 = "1r7dkjzxhwplmhvgvdx990xn98gpslckah5jpkx8c2gm9nj3xi33";
     };
     sqlite3 = fetchFromGitHub {
       owner = "alexeyr";
       repo = "erlang-sqlite3";
-      rev = "8350dc603804c503f99c92bfd2eab1dd6885758e";
-      sha256 = "0d0pbqmi3hsvzjp4vjp7a6bq3pjvkfv0spszh6485x9cmxsbwfpc";
+      rev = "cbc3505f7a131254265d3ef56191b2581b8cc172";
+      sha256 = "1xrvygv0zhslsqf8044m5ml1zr6di7znvv2zycg3amsz190w0w2g";
     };
     p1_pam = fetchFromGitHub {
       owner = "processone";
       repo = "epam";
-      rev = "d3ce290b7da75d780a03e86e7a8198a80e9826a6";
-      sha256 = "0s0czrgjvc1nw7j66x8b9rlajcap0yfnv6zqd4gs76ky6096qpb0";
+      rev = "1.0.0";
+      sha256 = "0dlbmfwndhyg855vnhwyccxcjqzf2wcgc7522mjb9q38cva50rpr";
     };
     p1_zlib = fetchFromGitHub {
       owner = "processone";
       repo = "zlib";
-      rev = "e3d4222b7aae616d7ef2e7e2fa0bbf451516c602";
-      sha256 = "0z960nwva8x4lw1k91i53kpn2bjbf1v1amslkyp8sx2gc5zf0gbn";
+      rev = "1.0.0";
+      sha256 = "1a6m7wz6cbb8526fwhmgm7mva62absmvyjm8cjnq7cs0mzp18r0m";
+    };
+    hamcrest = fetchFromGitHub {
+      owner = "hyperthunk";
+      repo = "hamcrest-erlang";
+      rev = "908a24fda4a46776a5135db60ca071e3d783f9f6";
+      sha256 = "0irxidwrb37m0xwls6q9nn2zfs3pyxrgbnjgrhnh7gm35ib51hkj";
     };
     riakc = fetchFromGitHub {
       owner = "basho";
       repo = "riak-erlang-client";
-      rev = "1.4.2";
-      sha256 = "128jz83n1990m9c2fzwsif6hyapmq46720nzfyyb4z2j75vn85zz";
+      rev = "527722d12d0433b837cdb92a60900c2cb5df8942";
+      sha256 = "13rkwibsjsl2gdysvf11r1hqfrf89hjgpa0x0hz2910f2ryqll3y";
     };
     # dependency of riakc
     riak_pb = fetchFromGitHub {
       owner = "basho";
       repo = "riak_pb";
-      rev = "1.4.4.0";
-      sha256 = "054fg9gaxk4n0id0qs6k8i919qvxsvmh76m6fgfbmixyfxh5jp3w";
+      rev = "2.1.0.7";
+      sha256 = "1p0qmjq069f7j1m29dv36ayvz8m0pcm94ccsnv5blykfg2c5ja0c";
     };
     # dependency of riak_pb
     protobuffs = fetchFromGitHub {
       owner = "basho";
       repo = "erlang_protobuffs";
-      rev = "0.8.1p1";
-      sha256 = "1x75a26y1gx6pzr829i4sx2mxm5w40kb6hfd5y511him56jcczna";
+      rev = "0.8.2";
+      sha256 = "0w4jmsnc9x2ykqh1q6b12pl8a9973dxdhqk3y0ph17n83q5xz3h7";
     };
     rebar_elixir_plugin = fetchFromGitHub {
-      owner = "yrashk";
+      owner = "processone";
       repo = "rebar_elixir_plugin";
-      rev = "7058379b7c7e017555647f6b9cecfd87cd50f884";
-      sha256 = "1s5bvbrhal866gbp72lgp0jzphs2cmgmafmka0pylwj30im41c71";
+      rev = "0.1.0";
+      sha256 = "0x04ff53mxwd9va8nl4m70dbamp6p4dpxs646c168iqpnpadk3sk";
     };
     elixir = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "elixir";
-      rev = "1d9548fd285d243721b7eba71912bde2ffd1f6c3";
-      sha256 = "1lxn9ly73rm797p6slfx7grsq32nn6bz15qhkbra834rj01fqzh8";
+      rev = "v1.1.0";
+      sha256 = "0r5673x2qdvfbwmvyvj8ddvzgxnkl3cv9jsf1yzsxgdifjbrzwx7";
     };
     p1_iconv = fetchFromGitHub {
       owner = "processone";
       repo = "eiconv";
-      rev = "8b7542b1aaf0a851f335e464956956985af6d9a2";
-      sha256 = "1w3k41fpynqylc2vnirz0fymlidpz0nnym0070f1f1s3pd6g5906";
+      rev = "0.9.0";
+      sha256 = "1ikccpj3aq6mip6slrq8c7w3kilpb82dr1jdy8kwajmiy9cmsq97";
     };
     lager = fetchFromGitHub {
       owner = "basho";
       repo = "lager";
-      rev = "4d2ec8c701e1fa2d386f92f2b83b23faf8608ac3";
-      sha256 = "03aav3cid0qpl1n8dn83hk0p70rw05nqvhq1abdh219nrlk9gfmx";
+      rev = "3.0.2";
+      sha256 = "04l40dlqpl2y6ddpbpknmnjf537bjvrmg8r0jnmw1h60dgyb2ydk";
     };
     # dependency of lager
     goldrush = fetchFromGitHub {
@@ -176,31 +184,31 @@ let
     p1_logger = fetchFromGitHub {
       owner = "processone";
       repo = "p1_logger";
-      rev = "3e19507fd5606a73694917158767ecb3f5704e3f";
-      sha256 = "0mq86gh8x3bgqcpwdjkdn7m3bj2006gbarnj7cn5dfs21m2h2mdn";
+      rev = "1.0.0";
+      sha256 = "0z11xsr139a75w09syjws4sja6ky2l9rsrwkjr6wcl7p1jz02h4r";
     };
     meck = fetchFromGitHub {
       owner = "eproxus";
       repo = "meck";
-      rev = "fc362e037f424250130bca32d6bf701f2f49dc75";
-      sha256 = "056yca394f8mbg8vwxxlq47dbjx48ykdrg4lvnbi5gfijl786i3s";
+      rev = "0.8.2";
+      sha256 = "0s4qbvryap46cz63awpbv5zzmlcay5pn2lixgmgvcjarqv70cbs7";
     };
     eredis = fetchFromGitHub {
       owner = "wooga";
       repo = "eredis";
-      rev = "770f828918db710d0c0958c6df63e90a4d341ed7";
-      sha256 = "0qv8hldn5972328pa1qz2lbblw1p2283js5y98dc8papldkicvmm";
+      rev = "v1.0.8";
+      sha256 = "10fr3kbc2nd2liggsq4y77nfirndzapcxzkjgyp06bpr9cjlvhlm";
     };
 
   };
 
 in stdenv.mkDerivation rec {
-  version = "15.11";
+  version = "16.01";
   name = "ejabberd-${version}";
 
   src = fetchurl {
     url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
-    sha256 = "0sll1si9pd4v7yibzr8hp18hfrbxsa5nj9h7qsldvy7r4md4n101";
+    sha256 = "10fnsw52gxybw731yka63ma8mj39g4i0nsancwp9nlvhb2flgk72";
   };
 
   nativeBuildInputs = [ fakegit ];
@@ -216,13 +224,13 @@ in stdenv.mkDerivation rec {
   LANG = "en_US.UTF-8";
 
   depsNames =
-    [ "p1_cache_tab" "p1_tls" "p1_stringprep" "p1_xml" "esip" "p1_stun" "p1_yaml" "p1_utils" "jiffy" "oauth2" "xmlrpc" ]
+    [ "cache_tab" "p1_tls" "p1_stringprep" "p1_xml" "esip" "p1_stun" "p1_yaml" "p1_utils" "jiffy" "oauth2" "xmlrpc" ]
     ++ lib.optional withMysql "p1_mysql"
     ++ lib.optional withPgsql "p1_pgsql"
     ++ lib.optional withSqlite "sqlite3"
     ++ lib.optional withPam "p1_pam"
     ++ lib.optional withZlib "p1_zlib"
-    ++ lib.optionals withRiak [ "riakc" "riak_pb" "protobuffs" ]
+    ++ lib.optionals withRiak [ "hamcrest" "riakc" "riak_pb" "protobuffs" ]
     ++ lib.optionals withElixir [ "rebar_elixir_plugin" "elixir" ]
     ++ lib.optional withIconv "p1_iconv"
     ++ lib.optionals withLager [ "lager" "goldrush" ]
@@ -232,8 +240,7 @@ in stdenv.mkDerivation rec {
   ;
 
   configureFlags =
-    [ "--enable-nif"
-      (lib.enableFeature withMysql "mysql")
+    [ (lib.enableFeature withMysql "mysql")
       (lib.enableFeature withPgsql "pgsql")
       (lib.enableFeature withSqlite "sqlite")
       (lib.enableFeature withPam "pam")
@@ -247,6 +254,7 @@ in stdenv.mkDerivation rec {
     ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite}";
 
   depsPaths = map (x: builtins.getAttr x ejdeps) depsNames;
+  depsRevs = map (x: x.rev) depsPaths;
 
   enableParallelBuilding = true;
 
@@ -254,12 +262,19 @@ in stdenv.mkDerivation rec {
     mkdir deps
     depsPathsA=( $depsPaths )
     depsNamesA=( $depsNames )
+    depsRevsA=( $depsRevs )
     for i in {0..${toString (builtins.length depsNames - 1)}}; do
-      cp -R ''${depsPathsA[$i]} deps/''${depsNamesA[$i]}
+      path="deps/''${depsNamesA[$i]}"
+      cp -R ''${depsPathsA[$i]} "$path"
+      chmod -R +w "$path"
+      echo "''${depsRevsA[$i]}" > "$path/.rev"
     done
-    chmod -R +w deps
     touch deps/.got
     patchShebangs .
+
+    for i in deps/*; do
+      [ -x "$i/configure" ] && ( cd "$i"; ./configure ) || true
+    done
   '';
 
   postInstall = ''
diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 631073da4d4a2..45c42947c5a4c 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -19,12 +19,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.9.8";
+  version = "0.9.10";
   name = "prosody-${version}";
 
   src = fetchurl {
     url = "http://prosody.im/downloads/source/${name}.tar.gz";
-    sha256 = "0wbq4ps69l09fjb5dfjzab6i30hzpi4bvyj5kc44gf70arf42w4l";
+    sha256 = "0bv6s5c0iizz015hh1lxlwlw1iwvisywajm2rcrbdfyrskzfwdj8";
   };
 
   communityModules = fetchhg {
diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix
index 4481ad4a14a67..f732e29acc957 100644
--- a/pkgs/servers/xmpp/pyIRCt/default.nix
+++ b/pkgs/servers/xmpp/pyIRCt/default.nix
@@ -1,37 +1,39 @@
-a @ { xmpppy, pythonIRClib, python, makeWrapper, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages } :
+
+stdenv.mkDerivation rec {
+  name = "pyIRCt-${version}";
+  version = "0.4";
 
-  version = a.lib.attrByPath ["version"] "0.4" a;
-  buildInputs = with a; [
-    xmpppy pythonIRClib python makeWrapper
-  ];
-in
-rec {
   src = fetchurl {
     url = "mirror://sourceforge/xmpppy/irc-transport-${version}.tar.gz";
     sha256 = "0gbc0dvj1p3088b6x315yjrlwnc5vvzp0var36wlf9z60ghvk8yb";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [ pythonPackages.wrapPython ];
+
+  pythonPath = [
+    xmpppy pythonIRClib
+  ];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
-  deploy = a.fullDepEntry (''
+  # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
+
+  installPhase = ''
     mkdir -p $out/bin $out/share/${name}
-    sed -e 's@/usr/bin/@${a.python}/bin/@' -i irc.py
+    sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py
     sed -e '/configFiles/iimport os' -i config.py
-    cp * $out/share/$name
-    echo "#! /bin/sh" > $out/bin/pyIRCt
-    echo "cd $out/share/${name}" >> $out/bin/pyIRCt
-    echo "./irc.py \"$@\"" >> $out/bin/pyIRCt
+    cp * $out/share/${name}
+    cat > $out/bin/pyIRCt <<EOF
+      #! /bin/sh
+      cd $out/share/${name}
+      ./irc.py \"$@\"
+    EOF
     chmod a+rx  $out/bin/pyIRCt $out/share/${name}/irc.py
-  '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
+    wrapPythonPrograms
+  '';
 
-  name = "pyIRCt-" + version;
   meta = {
     description = "IRC transport module for XMPP";
   };
diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix
index eb4f55f7aebd1..f5a91b28633f5 100644
--- a/pkgs/servers/xmpp/pyMAILt/default.nix
+++ b/pkgs/servers/xmpp/pyMAILt/default.nix
@@ -1,39 +1,37 @@
-a @ { xmpppy, python, makeWrapper, fetchcvs, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, python, xmpppy, pythonPackages, fetchcvs } :
 
-  buildInputs = with a; [
-    xmpppy python makeWrapper
-  ];
-in
-rec {
-  src = a.fetchcvs {
+stdenv.mkDerivation rec {
+  name = "pyMAILt-${version}";
+  version = "20090101";
+
+  src = fetchcvs {
 		cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy";
 		module = "xmpppy/mail-transport";
 		date = "2009-01-01";
 		sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e";
 	};
 
-  inherit buildInputs;
-  configureFlags = [];
+  pythonPath = [ xmpppy ];
+  buildInputs = [ pythonPackages.wrapPython ];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/mail.py" a.pythonWrapperArguments)];
-  deploy = a.fullDepEntry (''
+  installPhase = ''
     cd mail-transport
     mkdir -p $out/bin $out/share/${name}
-    sed -e 's@/usr/bin/@${a.python}/bin/@' -i mail.py
+    sed -e 's@/usr/bin/@${python}/bin/@' -i mail.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py
     sed -e '/configFiles/iimport os' -i config.py
     cp * $out/share/$name
-    echo "#! /bin/sh" > $out/bin/pyMAILt
-    echo "cd $out/share/${name}" >> $out/bin/pyMAILt
-    echo "./mail.py \"$@\"" >> $out/bin/pyMAILt
+    cat > $out/bin/pyMAILt <<EOF
+      #! /bin/sh
+      cd $out/share/${name}
+      ./mail.py \"$@\"
+    EOF
     chmod a+rx  $out/bin/pyMAILt $out/share/${name}/mail.py
-  '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
+    wrapPythonPrograms
+  '';
 
-  name = "pyMAILt-20090101";
   meta = {
     description = "Email transport module for XMPP";
   };
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 1419b180d728f..11eeb18661c0a 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish"
     sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py"
+    sed -i "s|command manpath|command ${man_db}/bin/manpath|" "$out/share/fish/functions/man.fish"
   '' + ''
     sed -i "s|/sbin /usr/sbin||" \
            "$out/share/fish/functions/__fish_complete_subcommand_root.fish"
diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 474486b6d6ceb..87161a6442a42 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     homepage = http://anonscm.debian.org/cgit/d-i/console-setup.git;
     license = licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [ dezgeg ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix
index 977a82230a529..87487442ada97 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/pkgs/tools/X11/screen-message/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchdarcs, autoreconfHook, pkgconfig, gtk3 }:
+{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk3 }:
 
 stdenv.mkDerivation {
   name = "screen-message-0.23";
 
-  src = fetchdarcs {
-    url = "http://darcs.nomeata.de/screen-message.debian";
-    rev = "0.23-1";
+  srcs = fetchgit {
+    url = "git://git.nomeata.de/darcs-mirror-screen-message.debian.git";
+    rev = "refs/tags/0_23-1";
+    sha256 = "fddddd28703676b2908af71cca7225e6c7bdb15b2fdfd67679cac129028a431c";
   };
 
   buildInputs = [ autoreconfHook pkgconfig gtk3 ];
diff --git a/pkgs/tools/admin/webdruid/default.nix b/pkgs/tools/admin/webdruid/default.nix
deleted file mode 100644
index ee4dabf78e78b..0000000000000
--- a/pkgs/tools/admin/webdruid/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-a @ { zlib, libpng, freetype, gd, which, libxml2, geoip, ... } :
-let
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    zlib libpng freetype gd which libxml2
-    geoip
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
-
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall" "doLinks"];
-
-  doLinks = a.fullDepEntry (''
-    ln -s shared_en.xsl $out/share/webdruid/classic/shared.xsl
-  '') ["minInit"];
-
-  meta = {
-    description = "A web log analyzer";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = a.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/tools/admin/webdruid/src-for-default.nix b/pkgs/tools/admin/webdruid/src-for-default.nix
deleted file mode 100644
index 73102be6afe53..0000000000000
--- a/pkgs/tools/admin/webdruid/src-for-default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-rec {
-  advertisedUrl="http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz";
-  version = "0.6.0-alpha5";
-  url="mirror://sourceforge/webdruid/webdruid-${version}.tar.gz";
-  hash = "1aiqffccayvf02snl9la62zqb1674cp4rv19af6xyxgvw4334hw0";
-  name = "webdruid-0.6.0-alpha5";
-  
-}
diff --git a/pkgs/tools/admin/webdruid/src-info-for-default.nix b/pkgs/tools/admin/webdruid/src-info-for-default.nix
deleted file mode 100644
index 9a4eff296828c..0000000000000
--- a/pkgs/tools/admin/webdruid/src-info-for-default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  downloadPage = "http://sourceforge.net/projects/webdruid/files/";
-  choiceCommand = ''head -1 | sed -re "$skipRedirectSF"'';
-  versionExtractorSedScript = ''$extractReleaseSF'';
-  versionReferenceCreator = ''s@$version@\''${version}@g'';
-  baseName = "webdruid";
-}
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 3cdd4b4f0a2ed..82e1af54ccf63 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchFromGitHub, writeScript, glibcLocales
 , buildPythonPackage, pythonPackages, python, imagemagick
 
-, enableAcoustid   ? true
-, enableBadfiles   ? true, flac ? null, mp3val ? null
-, enableDiscogs    ? true
-, enableEchonest   ? true
-, enableFetchart   ? true
-, enableLastfm     ? true
-, enableMpd        ? true
-, enableReplaygain ? true, bs1770gain ? null
-, enableThumbnails ? true
-, enableWeb        ? true
+, enableAcousticbrainz ? true
+, enableAcoustid       ? true
+, enableBadfiles       ? true, flac ? null, mp3val ? null
+, enableDiscogs        ? true
+, enableEchonest       ? true
+, enableEmbyupdate     ? true
+, enableFetchart       ? true
+, enableLastfm         ? true
+, enableMpd            ? true
+, enableReplaygain     ? true, bs1770gain ? null
+, enableThumbnails     ? true
+, enableWeb            ? true
 
 # External plugins
 , enableAlternatives ? false
@@ -33,10 +35,12 @@ with stdenv.lib;
 
 let
   optionalPlugins = {
+    acousticbrainz = enableAcousticbrainz;
     badfiles = enableBadfiles;
     chroma = enableAcoustid;
     discogs = enableDiscogs;
     echonest = enableEchonest;
+    embyupdate = enableEmbyupdate;
     fetchart = enableFetchart;
     lastgenre = enableLastfm;
     lastimport = enableLastfm;
@@ -48,10 +52,10 @@ let
   };
 
   pluginsWithoutDeps = [
-    "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart"
+    "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "edit" "embedart"
     "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate"
     "importadded" "importfeeds" "info" "inline" "ipfs" "keyfinder" "lyrics"
-    "mbcollection" "mbsync" "metasync" "missing" "permissions" "play"
+    "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "permissions" "play"
     "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the"
     "types" "zero"
   ];
@@ -66,14 +70,14 @@ let
 
 in buildPythonPackage rec {
   name = "beets-${version}";
-  version = "1.3.15";
+  version = "1.3.17";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "sampsyo";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "17mbkilqqkxxa8ra8b4zlsax712jb0nfkvcx9iyq9303rqwv5sx2";
+    sha256 = "1fskxx5xxjqf4xmfjrinh7idjiq6qncb24hiyccv09l47fr1yipc";
   };
 
   propagatedBuildInputs = [
@@ -87,14 +91,17 @@ in buildPythonPackage rec {
     pythonPackages.unidecode
     python.modules.sqlite3
     python.modules.readline
-  ] ++ optional enableAcoustid   pythonPackages.pyacoustid
-    ++ optional enableFetchart   pythonPackages.requests2
-    ++ optional enableDiscogs    pythonPackages.discogs_client
-    ++ optional enableEchonest   pythonPackages.pyechonest
-    ++ optional enableLastfm     pythonPackages.pylast
-    ++ optional enableMpd        pythonPackages.mpd
-    ++ optional enableThumbnails pythonPackages.pyxdg
-    ++ optional enableWeb        pythonPackages.flask
+  ] ++ optional enableAcoustid     pythonPackages.pyacoustid
+    ++ optional (enableFetchart
+              || enableEmbyupdate
+              || enableAcousticbrainz)
+                                   pythonPackages.requests2
+    ++ optional enableDiscogs      pythonPackages.discogs_client
+    ++ optional enableEchonest     pythonPackages.pyechonest
+    ++ optional enableLastfm       pythonPackages.pylast
+    ++ optional enableMpd          pythonPackages.mpd
+    ++ optional enableThumbnails   pythonPackages.pyxdg
+    ++ optional enableWeb          pythonPackages.flask
     ++ optional enableAlternatives (import ./alternatives-plugin.nix {
       inherit stdenv buildPythonPackage pythonPackages fetchFromGitHub;
     });
@@ -114,7 +121,7 @@ in buildPythonPackage rec {
 
   postPatch = ''
     sed -i -e '/assertIn.*item.*path/d' test/test_info.py
-    echo echo completion tests passed > test/test_completion.sh
+    echo echo completion tests passed > test/rsrc/test_completion.sh
 
     sed -i -e '/^BASH_COMPLETION_PATHS *=/,/^])$/ {
       /^])$/i u"${completion}"
@@ -186,7 +193,7 @@ in buildPythonPackage rec {
     description = "Music tagger and library organizer";
     homepage = http://beets.radbox.org;
     license = licenses.mit;
-    maintainers = with maintainers; [ aszlig iElectric pjones ];
+    maintainers = with maintainers; [ aszlig iElectric pjones profpatsch ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index 1854071d6cc21..c287efe8e1122 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "obnam-${version}";
-  version = "1.19";
+  version = "1.19.1";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "1591f3mqhgda486wkpb8q4mq685sy6yn3ypbpzx77wii51licxar";
+    sha256 = "096abbvz2c9vm8r7zm82yqrd7zj04pb1xzlv6z0dspkngd0cfdqc";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index d60b4b3614a00..e095b2d4e073f 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "0.4.7";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
-    sha256 = "09l917979qfqk44dbgsa9vs37a2qj4ga43553zcgvnps02wlja8s";
+    sha256 = "18jwhvzj3kv8lpr6fgild7a574lsak93fc1z8nvhcdbc1b1n2dsj";
     rev = "v${version}";
     repo = "zstd";
     owner = "Cyan4973";
diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
new file mode 100644
index 0000000000000..74e7686a3d178
--- /dev/null
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
+
+stdenv.mkDerivation rec {
+  name = "darling-dmg-${version}";
+  version = "1.0.4";
+
+  src = fetchFromGitHub {
+    owner = "darlinghq";
+    repo = "darling-dmg";
+    rev = "v${version}";
+    sha256 = "0x285p16zfnp0p6injw1frc8krif748sfgxhdd7gb75kz0dfbkrk";
+  };
+
+  buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ];
+
+  cmakeConfigureFlagFlags = ["-DCMAKE_BUILD_TYPE=RELEASE"];
+
+  meta = {
+    homepage = http://www.darlinghq.org/;
+    description = "Darling lets you open OS X dmgs on Linux";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 7a15b00b365f7..c28349a31ccfd 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -1,8 +1,11 @@
 {stdenv, fetchurl
   , freeglut, ghostscriptX, imagemagick, fftw 
-  , boehmgc, mesa, ncurses, readline, gsl, libsigsegv
+  , boehmgc, mesa_glu, mesa_noglu, ncurses, readline, gsl, libsigsegv
   , python, zlib, perl, texLive, texinfo, xz
 }:
+
+assert stdenv.isLinux;
+
 let
   s = # Generated upstream information
   rec {
@@ -15,30 +18,39 @@ let
   };
   buildInputs = [
    freeglut ghostscriptX imagemagick fftw 
-   boehmgc mesa ncurses readline gsl libsigsegv
+   boehmgc mesa_glu mesa_noglu mesa_noglu.osmesa ncurses readline gsl libsigsegv
    python zlib perl texLive texinfo xz
   ];
 in
 stdenv.mkDerivation {
   inherit (s) name version;
   inherit buildInputs;
+
   src = fetchurl {
     inherit (s) url sha256;
   };
+
   preConfigure = ''
     export HOME="$PWD"
     patchShebangs . 
     sed -e 's@epswrite@eps2write@g' -i runlabel.in
     xz -d < ${texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex
     cp texinfo-*/doc/texinfo.tex doc/
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${boehmgc}/include/gc"
+    rm *.tar.gz
+    configureFlags="$configureFlags --with-latex=$out/share/texmf/tex/latex --with-context=$out/share/texmf/tex/context/third"
   '';
+
+  NIX_CFLAGS_COMPILE = [ "-I${boehmgc}/include/gc" ];
+
   postInstall = ''
     mv -v "$out/share/info/asymptote/"*.info $out/share/info/
     sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info
     rmdir $out/share/info/asymptote
     rm $out/share/info/dir
   '';
+
+  enableParallelBuilding = true;
+
   meta = {
     inherit (s) version;
     description =  "A tool for programming graphics intended to replace Metapost";
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index cb37d893378e9..c357c96fac8d0 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -1,42 +1,19 @@
-a @ { cmake, patchelf, imagemagick, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, cmake, patchelf, imagemagick }:
 
+stdenv.mkDerivation rec {
+  name = "cuneiform-${version}";
   version = "1.1.0";
-  buildInputs = with a; [
-    cmake imagemagick patchelf
-  ];
-in
-rec {
+
   src = fetchurl {
     url = "https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2";
     sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doCmake" "doMakeInstall" "postInstall"];
-
-  libc = if a.stdenv ? glibc then a.stdenv.glibc else "";
-
-  doCmake = a.fullDepEntry(''
-    mkdir -p $PWD/builddir
-    cd builddir
-    export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib"
-    cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc.out}/lib
-  '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
-
-  needLib64 = a.stdenv.system == "x86_64-linux";
-
-  postInstall = a.fullDepEntry(''
-    patchelf --set-rpath $out/lib${if needLib64 then "64" else ""}${if a.stdenv.cc.cc != null then ":${a.stdenv.cc.cc}/lib" else ""}${if a.stdenv.cc.cc != null && needLib64 then ":${a.stdenv.cc.cc}/lib64" else ""}:${a.imagemagick}/lib $out/bin/cuneiform
-  '') ["minInit" "addInputs" "doMakeInstall"];
+  buildInputs = [
+    cmake imagemagick
+  ];
 
-  name = "cuneiform-" + version;
   meta = {
-    inherit version;
     description = "Multi-language OCR system";
   };
 }
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 153611e058747..7b0cbc16e11aa 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vips-8.1.1";
+  name = "vips-8.2.2";
 
   src = fetchurl {
     url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz";
-    sha256 = "014sgpqj832vl5k212jv25sjakrsifnspjfclywpmn7cwaqwjlvx";
+    sha256 = "12b319aicr129cpi5sixwd3q91y97vwwva6b044zy54px4s8ls0g";
   };
 
   buildInputs =
diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix
index 3d1a2aa5bdc0b..6e268ef5941db 100644
--- a/pkgs/tools/graphics/welkin/default.nix
+++ b/pkgs/tools/graphics/welkin/default.nix
@@ -1,57 +1,35 @@
-x@{builderDefsPackage
-  , jre
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    ["jre"];
+{ stdenv, fetchsvn, jre, makeWrapper }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="welkin";
-    version="1.1";
-    name="${baseName}-${version}";
-    url="http://simile.mit.edu/dist/welkin/${name}.tar.gz";
-    hash="0hr2xvfz887fdf2ysiqydv6m13gbdl5x0fh4960i655d5imvd5x0";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
+stdenv.mkDerivation rec {
+  name = "welkin-${version}";
+  version = "1.1";
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  src = fetchsvn {
+    url = "http://simile.mit.edu/repository/welkin";
+    rev = "9638";
+    sha256 = "1bqh3vam7y805xrmdw7k0ckcfwjg88wypxgv3njkkwyn7kxnfnqp";
+  };
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doDeploy" "createBin"];
+  sourceRoot = "welkin-r9638/tags/${version}";
 
-  doDeploy = a.simplyShare "welkin";
+  buildInputs = [ jre makeWrapper ];
 
-  createBin = a.fullDepEntry ''
-    mkdir -p "$out/bin"
-    echo "#! ${a.stdenv.shell}" > "$out/bin/welkin"
-    echo "export JAVA_HOME=${jre}" >> "$out/bin/welkin"
-    echo "\"$out/share/welkin/welkin.sh\" \"\$@\"" >> "$out/bin/welkin"
-    sed -e 's@[.]/lib/welkin[.]jar@"'"$out"'/share/welkin/lib/welkin.jar"@' -i "$out/share/welkin/welkin.sh"
-    chmod a+x "$out/bin/welkin"
-  '' ["minInit" "defEnsureDir"];
+  installPhase = ''
+    mkdir -p $out/{bin,share}
+    cp -R . $out/share
+    cp $out/share/welkin.sh $out/bin/welkin
+    sed -e 's@\./lib/welkin\.jar@'"$out"'/share/lib/welkin.jar@' -i $out/bin/welkin
+    wrapProgram $out/bin/welkin \
+      --set JAVA_HOME ${jre}
+    chmod a+x $out/bin/welkin
+  '';
 
   meta = {
     description = "An RDF visualizer";
-    maintainers = with a.lib.maintainers;
-    [
+    maintainers = with stdenv.lib.maintainers; [
       raskin
     ];
     hydraPlatforms = [];
-    license = a.lib.licenses.free;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://simile.mit.edu/dist/welkin/";
-    };
+    license = stdenv.lib.licenses.free;
   };
-}) x
+}
diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix
new file mode 100644
index 0000000000000..fbe7188ef9ac9
--- /dev/null
+++ b/pkgs/tools/inputmethods/m17n-db/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, gettext}:
+
+stdenv.mkDerivation rec {
+  name = "m17n-db-1.7.0";
+
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
+    sha256 = "1w08hnsbknrcjlzp42c99bgwc9hzsnf5m4apdv0dacql2s09zfm2";
+  };
+
+  buildInputs = [ gettext ];
+
+  configureFlags = stdenv.lib.optional (stdenv ? glibc)
+    "--with-charmaps=${stdenv.glibc}/share/i18n/charmaps"
+  ;
+
+  meta = {
+    homepage = http://www.nongnu.org/m17n/;
+    description = "Multilingual text processing library (database)";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+  };
+}
diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix
new file mode 100644
index 0000000000000..982f35a9fe682
--- /dev/null
+++ b/pkgs/tools/inputmethods/m17n-lib/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, m17n_db}:
+stdenv.mkDerivation rec {
+  name = "m17n-lib-1.7.0";
+
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
+    sha256 = "10yv730i25g1rpzv6q49m6xn4p8fjm7jdwvik2h70sn8w3hm7f4f";
+  };
+
+  buildInputs = [ m17n_db ];
+
+  meta = {
+    homepage = http://www.nongnu.org/m17n/;
+    description = "Multilingual text processing library (runtime)";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+  };
+}
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 160efe2ded8f0..19de302e7b1fd 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy}:
+{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs,
+ cmake, anthy, automoc4, m17n_lib, m17n_db}:
 
 stdenv.mkDerivation rec {
   version = "1.8.6";
@@ -13,6 +14,9 @@ stdenv.mkDerivation rec {
     kdelibs
     cmake
     anthy
+    automoc4
+    m17n_lib
+    m17n_db
   ];
 
   patches = [ ./immodules_cache.patch ];
diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
new file mode 100644
index 0000000000000..fb83e6996e33c
--- /dev/null
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "bibutils-${version}";
+  version = "5.6";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz";
+    sha256 = "08vlaf1rs881v61hb0dnab5brbpbwbv2hqlxmw0yaycknqwbmiwz";
+  };
+
+  configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ];
+  dontAddPrefix = true;
+
+  doCheck = true;
+  checkTarget = "test";
+
+  meta = with stdenv.lib; {
+    description = "Bibliography format interconversion";
+    longDescription = "The bibutils program set interconverts between various bibliography formats using a common MODS-format XML intermediate. For example, one can convert RIS-format files to Bibtex by doing two transformations: RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N programs are required and not N²-N. These programs operate on the command line and are styled after standard UNIX-like filters.";
+    homepage = "http://sourceforge.net/p/bibutils/home/Bibutils/";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.garrison ];
+  };
+}
diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix
index 72656d2969de3..1bae4b16bd82e 100644
--- a/pkgs/tools/misc/cpulimit/default.nix
+++ b/pkgs/tools/misc/cpulimit/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "A tool to throttle the CPU usage of programs";
     platforms = with platforms; linux ++ freebsd;
     license = licenses.gpl2;
-    maintainer = [maintainers.rycee];
+    maintainers = [maintainers.rycee];
   };
 }
diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix
index 32d6b6fa6ef17..5969c95623696 100644
--- a/pkgs/tools/misc/dvtm/default.nix
+++ b/pkgs/tools/misc/dvtm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "dvtm-0.14";
+  name = "dvtm-0.15";
 
   meta = {
     description = "Dynamic virtual terminal manager";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.gz";
-    sha256 = "0ykl8dz7ivjgdzhmhlgidnp2ffh5gxq9lbg276w7iid4z10v76wa";
+    sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g";
   };
 
   buildInputs = [ ncurses ];
diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index c0593e5c01778..d1551eb4ccd62 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -1,31 +1,25 @@
-a @ { intltool, perl, gettext, libusb, pkgconfig, bluez, readline, pcsclite, libical, gtk, glib, libXpm, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, intltool, perl, gettext, libusb, pkgconfig, bluez
+, readline, pcsclite, libical, gtk, glib, libXpm }:
 
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
+stdenv.mkDerivation rec {
+  name = "gnokii-${version}";
+  version = "0.6.31";
+
+  src = fetchurl {
+    sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8";
+    url = "http://www.gnokii.org/download/gnokii/${name}.tar.gz";
+  };
+
+  buildInputs = [
     perl intltool gettext libusb
     glib gtk pkgconfig bluez readline
     libXpm pcsclite libical
   ];
-in
-
-assert a.stdenv ? glibc;
-
-rec {
-  src = a.fetchUrlFromSrcInfo s;
-
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = [ "doConfigure" "doMakeInstall"];
 
-  inherit(s) name;
   meta = {
     description = "Cellphone tool";
     homepage = http://www.gnokii.org;
-    maintainers = [a.lib.maintainers.raskin];
-    platforms = with a.lib.platforms; linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/gnokii/src-for-default.nix b/pkgs/tools/misc/gnokii/src-for-default.nix
deleted file mode 100644
index af2768ddfa3b3..0000000000000
--- a/pkgs/tools/misc/gnokii/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="0.6.31";
-   name="gnokii-0.6.31";
-   hash="0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8";
-   url="http://www.gnokii.org/download/gnokii/gnokii-${version}.tar.gz";
-   advertisedUrl="http://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.gz";
-  
-  
-}
diff --git a/pkgs/tools/misc/gnokii/src-info-for-default.nix b/pkgs/tools/misc/gnokii/src-info-for-default.nix
deleted file mode 100644
index 6d68b555b181e..0000000000000
--- a/pkgs/tools/misc/gnokii/src-info-for-default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  downloadPage = "http://www.gnokii.org/download/gnokii/?C=M;O=D";
-  baseName = "gnokii";
-}
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 7e8a8312f5094..c45c62cb3adad 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20151222";
+  name = "parallel-20160122";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "03czpnsj77xxzqxzzr1b39ym9acn94hknzbilbh28v5q1wk7r4mf";
+    sha256 = "1xs8y8jh7wyjs27079xz0ja7xfi4dywz8d6hbkl44mafdnnfjfiy";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix
index 3d0d03f6c4a24..ab72dc69fa470 100644
--- a/pkgs/tools/misc/progress/default.nix
+++ b/pkgs/tools/misc/progress/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchFromGitHub, ncurses }:
+{ stdenv, fetchFromGitHub, pkgconfig, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "progress-${version}";
-  version = "0.12.1";
+  version = "0.13";
 
   src = fetchFromGitHub {
     owner = "Xfennec";
     repo = "progress";
     rev = "v${version}";
-    sha256 = "0lwj0zdcdsl1wczk3yq7wfpyw3zi87h8x2z8yjp0wgnr45bbqibl";
+    sha256 = "0xzpcvz4n0h8m0mhxgpvn1qg8993naip3asjbk3nmk3d4lbyh0b3";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ncurses ];
 
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index 11f9d32b15457..524e61dfaf37d 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ];
   
   postInstall = ''
-    # for munin support
-    mv $out/lib/perl/5*/*/*.pm $out/lib/perl/5*/
+    # for munin and rrdtool support
+    mkdir -p $out/lib/perl5/site_perl/
+    mv $out/lib/perl/5* $out/lib/perl5/site_perl/
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index bd1d8501eeaa8..34b65973650b9 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -34,7 +34,7 @@ python2Packages.buildPythonPackage rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/andreafrancia/trash-cli;
     description = "Command line tool for the desktop trash can";
-    maintainer = [ maintainers.rycee ];
+    maintainers = [ maintainers.rycee ];
     license = licenses.gpl2;
   };
 }
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 04e88fd98d5f3..8901869926378 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.7.3";
+  version = "0.8.1";
   name = "vdirsyncer-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz";
-    sha256 = "0ahi5ngqwsrv30bgziz35dx4gif7rbn9vqv340pigbzmywjxz1ry";
+    sha256 = "1abflqw6x30xd2dlj58cr5n62x98kc0ia9f9vr8l64k2z1fjlq78";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix
index 1c9dbfe623548..e532739ecd4f1 100644
--- a/pkgs/tools/networking/altermime/default.nix
+++ b/pkgs/tools/networking/altermime/default.nix
@@ -1,50 +1,28 @@
-x@{builderDefsPackage
-  
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="altermime";
-    version="0.3.10";
-    name="${baseName}-${version}";
-    url="http://www.pldaniels.com/${baseName}/${name}.tar.gz";
-    hash="0vn3vmbcimv0n14khxr1782m76983zz9sf4j2kz5v86lammxld43";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
+stdenv.mkDerivation rec {
+  baseName = "altermime";
+  name = "${baseName}-${version}";
+  version = "0.3.10";
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  src = fetchurl {
+    url = "http://www.pldaniels.com/${baseName}/${name}.tar.gz";
+    sha256 = "0vn3vmbcimv0n14khxr1782m76983zz9sf4j2kz5v86lammxld43";
+  };
 
-  patches = map a.fetchurl (import ./debian-patches.nix);
+  patches = map fetchurl (import ./debian-patches.nix);
 
-  phaseNames = ["doPatch" "fixTarget" "doMakeInstall"];
-  fixTarget = a.fullDepEntry (''
+  postPatch = ''
     sed -i Makefile -e "s@/usr/local@$out@"
     mkdir -p "$out/bin"
-  '') ["doUnpack" "minInit" "defEnsureDir"];
-      
+  '';
+
   meta = {
     description = "MIME alteration tool";
-    maintainers = with a.lib.maintainers;
-    [
+    maintainers = with stdenv.lib.maintainers; [
       raskin
     ];
-    platforms = with a.lib.platforms;
-      linux;
+    platforms = with stdenv.lib.platforms; linux;
     downloadPage = "http://www.pldaniels.com/altermime/";
-    inherit version;
-    updateWalker = true;
   };
-}) x
-
+}
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index 1b5767653fe29..24010e20f3749 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchgit, qtbase, makeWrapper, libX11 }:
+{ stdenv, fetchFromGitHub, qtbase, makeWrapper, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "cmst-2014.12.05";
-  rev = "refs/tags/${name}";
-  src = fetchgit {
-    url = "git://github.com/andrew-bibb/cmst.git";
-    inherit rev;
-    sha256 = "070rxv3kyn41ra7nnk1wbqvy6fjg38h7hrdv4dn71b201kmzd194";
+  name = "cmst-2016.01.28";
+
+  src = fetchFromGitHub {
+    sha256 = "1zf4jnrnbi05mrq1fnsji5zx60h1knrkr64pwcz2c7q8p59k4646";
+    rev    = name;
+    repo   = "cmst";
+    owner  = "andrew-bibb";
   };
 
   buildInputs = [ qtbase makeWrapper ];
@@ -27,7 +28,6 @@ stdenv.mkDerivation rec {
     substituteInPlace ./apps/rootapp/rootapp.pro \
       --replace "/etc" "$out/etc" \
       --replace "/usr/share" "$out/share"
-
   '';
 
   buildPhase = ''
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 5e283943baf41..8a950e3fc934e 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   name = "curl-7.45.0";
 
   src = fetchurl {
-    url = "http://curl.haxx.se/download/${name}.tar.bz2";
+    url = "http://ngcobalt13.uxnr.de/mirror/curl/${name}.tar.bz2";
     sha256 = "1slq5c0v9wa8hajgimhkxhvsrd07jmih8sa3gjsl597qp5k4w5b5";
   };
 
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index 0ec0f35f1bd48..c76c6d0dd7f4c 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://matt.ucc.asn.au/dropbear/dropbear.html;
-    description = "An small footprint implementation of the SSH 2 protocol";
+    description = "A small footprint implementation of the SSH 2 protocol";
     license = licenses.mit;
     maintainers = with maintainers; [ abbradar ];
     platforms = platforms.unix;
diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix
new file mode 100644
index 0000000000000..2ff22c0618117
--- /dev/null
+++ b/pkgs/tools/networking/email/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, lib, fetchFromGitHub, openssl }:
+
+let
+  eMailSrc = fetchFromGitHub {
+    #awaiting acceptance of https://github.com/deanproxy/eMail/pull/29
+    owner = "jerith666";
+    repo = "eMail";
+    rev = "d9fd259f952b573d320916ee34e807dd3dd24b1f";
+    sha256 = "0q4ly4bhlv6lrlj5kmjs491aah1afmkjyw63i9yqnz4d2k6npvl9";
+  };
+
+  srcRoot = "eMail-${eMailSrc.rev}-src";
+
+  dlibSrc = fetchFromGitHub {
+    owner = "deanproxy";
+    repo = "dlib";
+    rev = "f62f29e918748b7cea476220f7492672be81c9de";
+    sha256 = "0h34cikch98sb7nsqjnb9wl384c8ndln3m6yb1172l4y89qjg9rr";
+  };
+
+in
+
+stdenv.mkDerivation {
+  name = "email-git-2016-01-31";
+  src = eMailSrc;
+
+  buildInputs = [ openssl ];
+
+  unpackPhase = ''
+    unpackPhase;
+    cp -Rp ${dlibSrc}/* ${srcRoot}/dlib;
+    chmod -R +w ${srcRoot}/dlib;
+  '';
+
+  meta = {
+    description = "Command line SMTP client";
+    license = with lib.licenses; [ gpl2 ];
+    homepage = http://deanproxy.com/code;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index ff41beaeb05b1..2d490b917a4e4 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "0gb6bdsyb7m0jkilln9h7z2l8gr8ia10jah17ygc15jzycygijis";
+    sha256 = "1nkf3dplvyg2lgygd3jd4bqh5s4nm6ppyks3a05a1dcbwm8ws42y";
   };
 
   buildInputs = [ boost zlib openssl ];
diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index e88ae7a1403e8..7334ecc3e92e3 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-1.9.20160113";
+  name = "miniupnpd-1.9.20160209";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "084ii5vb54rr8sg50cqvsw5rj6linj23p3gnxwfyl100dkkgvcaa";
+    sha256 = "0r4giqsr39s17mn9lmmy3zawrfj7kj9im7nzv7mx3rgz2ncw092z";
     name = "${name}.tar.gz";
   };
 
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 77ef86baec361..5829dc9d5509d 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -3,12 +3,12 @@
 , gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.13";
+  version = "0.9.16";
   name = "mu-${version}";
 
   src = fetchurl {
     url = "https://github.com/djcb/mu/archive/v${version}.tar.gz";
-    sha256 = "0wj33pma8xgjvn2akk7khzbycwn4c9sshxvzdph9dnpy7gyqxj51";
+    sha256 = "0p7hqri1r1x6750x138cc29mh81kdav2dcim26y58s8an206h25g";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix
index c8ff0c7a16094..dfa9b26a38e87 100644
--- a/pkgs/tools/networking/nethogs/default.nix
+++ b/pkgs/tools/networking/nethogs/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     homepage = http://nethogs.sourceforge.net/;
     platforms = platforms.linux;
-    maintainer = [ maintainers.rycee ];
+    maintainers = [ maintainers.rycee ];
   };
 }
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index fecaabe95f947..73e92aa4b8e57 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -23,11 +23,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "openssh-6.9p1";
+  name = "openssh-7.1p2";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1zkci5nbpb4frmzj2vr3kv9j47x2h72kvybcpr0d8mzk73sls1vf";
+    sha256 = "1gbbvszz74lkc7b2mqr3ccgpm65zj0k5h7a2ssh0c7pjvhjg0xfx";
   };
 
   prePatch = optionalString hpnSupport
@@ -36,7 +36,16 @@ stdenv.mkDerivation rec {
       export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
     '';
 
-  patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch ./disable-roaming.patch ]
+  patches =
+    [ ./locale_archive.patch
+
+      # Fix "HostKeyAlgoritms +...", which we need to enable DSA
+      # host key support.
+      (fetchurl {
+        url = "https://pkgs.fedoraproject.org/cgit/rpms/openssh.git/plain/openssh-7.1p1-hostkeyalgorithms.patch?id=c98f5597250d6f9a8e8d96960beb6306d150ef0f";
+        sha256 = "029lzp9qv1af8wdm0wwj7qwjj1nimgsjj214jqm3amwz0857qgvp";
+      })
+    ]
     ++ optional withGssapiPatches gssapiSrc;
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ]
diff --git a/pkgs/tools/networking/openssh/disable-roaming.patch b/pkgs/tools/networking/openssh/disable-roaming.patch
deleted file mode 100644
index cd81d52f6c181..0000000000000
--- a/pkgs/tools/networking/openssh/disable-roaming.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b842c1891b9979e30a6b53292a236ceb9231be79 Mon Sep 17 00:00:00 2001
-From: Franz Pletz <fpletz@fnordicwalking.de>
-Date: Thu, 14 Jan 2016 16:25:50 +0100
-Subject: [PATCH] Disable roaming, fixes CVE-2016-0777 and CVE-0216-0778
-
-Based on http://ftp.openbsd.org/pub/OpenBSD/patches/5.8/common/010_ssh.patch.sig
----
- readconf.c | 5 ++---
- ssh.c      | 3 ---
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/readconf.c b/readconf.c
-index db7d0bb..5b03f97 100644
---- a/readconf.c
-+++ b/readconf.c
-@@ -1660,7 +1660,7 @@ initialize_options(Options * options)
- 	options->tun_remote = -1;
- 	options->local_command = NULL;
- 	options->permit_local_command = -1;
--	options->use_roaming = -1;
-+	options->use_roaming = 0;
- 	options->visual_host_key = -1;
- 	options->ip_qos_interactive = -1;
- 	options->ip_qos_bulk = -1;
-@@ -1835,8 +1835,7 @@ fill_default_options(Options * options)
- 		options->tun_remote = SSH_TUNID_ANY;
- 	if (options->permit_local_command == -1)
- 		options->permit_local_command = 0;
--	if (options->use_roaming == -1)
--		options->use_roaming = 1;
-+	options->use_roaming = 0;
- 	if (options->visual_host_key == -1)
- 		options->visual_host_key = 0;
- 	if (options->ip_qos_interactive == -1)
-diff --git a/ssh.c b/ssh.c
-index 3fd5a94..e8428b5 100644
---- a/ssh.c
-+++ b/ssh.c
-@@ -1931,9 +1931,6 @@ ssh_session2(void)
- 			fork_postauth();
- 	}
- 
--	if (options.use_roaming)
--		request_roaming();
--
- 	return client_loop(tty_flag, tty_flag ?
- 	    options.escape_char : SSH_ESCAPECHAR_NONE, id);
- }
--- 
-2.7.0
-
diff --git a/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch b/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch
deleted file mode 100644
index 02e9eb3a9739a..0000000000000
--- a/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/openssh.git/commit/openssh-6.9p1-security-7.0.patch?h=f22&id=4776fad91e7e1f626f33e8c240d0ccecd663554d
-
-diff --git a/sshpty.c b/sshpty.c
-index 7bb7641..15da8c6 100644
---- a/sshpty.c
-+++ b/sshpty.c
-@@ -1,4 +1,4 @@
--/* $OpenBSD: sshpty.c,v 1.29 2014/09/03 18:55:07 djm Exp $ */
-+/* $OpenBSD: sshpty.c,v 1.30 2015/07/30 23:09:15 djm Exp $ */
- /*
-  * Author: Tatu Ylonen <ylo@cs.hut.fi>
-  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-@@ -197,7 +197,7 @@ pty_setowner(struct passwd *pw, const char *tty)
- 	/* Determine the group to make the owner of the tty. */
- 	grp = getgrnam("tty");
- 	gid = (grp != NULL) ? grp->gr_gid : pw->pw_gid;
--	mode = (grp != NULL) ? 0622 : 0600;
-+	mode = (grp != NULL) ? 0620 : 0600;
- 
- 	/*
- 	 * Change owner and mode of the tty as required.
-diff --git a/monitor.c b/monitor.c
-index b410965..f1b873d 100644
---- a/monitor.c
-+++ b/monitor.c
-@@ -1084,9 +1084,7 @@ extern KbdintDevice sshpam_device;
- int
- mm_answer_pam_init_ctx(int sock, Buffer *m)
- {
--
- 	debug3("%s", __func__);
--	authctxt->user = buffer_get_string(m, NULL);
- 	sshpam_ctxt = (sshpam_device.init_ctx)(authctxt);
- 	sshpam_authok = NULL;
- 	buffer_clear(m);
-@@ -1166,14 +1166,16 @@ mm_answer_pam_respond(int sock, Buffer *m)
- int
- mm_answer_pam_free_ctx(int sock, Buffer *m)
- {
-+	int r = sshpam_authok != NULL && sshpam_authok == sshpam_ctxt;
- 
- 	debug3("%s", __func__);
- 	(sshpam_device.free_ctx)(sshpam_ctxt);
-+	sshpam_ctxt = sshpam_authok = NULL;
- 	buffer_clear(m);
- 	mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m);
- 	auth_method = "keyboard-interactive";
- 	auth_submethod = "pam";
--	return (sshpam_authok == sshpam_ctxt);
-+	return r;
- }
- #endif
- 
-diff --git a/monitor_wrap.c b/monitor_wrap.c
-index e6217b3..eac421b 100644
---- a/monitor_wrap.c
-+++ b/monitor_wrap.c
-@@ -614,7 +614,6 @@ mm_sshpam_init_ctx(Authctxt *authctxt)
- 
- 	debug3("%s", __func__);
- 	buffer_init(&m);
--	buffer_put_cstring(&m, authctxt->user);
- 	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m);
- 	debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__);
- 	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m);
diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix
index 2d21369072994..a6dcd1fc0c3e7 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/tools/networking/privoxy/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }:
 
-stdenv.mkDerivation {
-  name = "privoxy-3.0.22";
+stdenv.mkDerivation rec{
+
+  name = "privoxy-3.0.24";
 
   src = fetchurl {
-    url = mirror://sourceforge/ijbswa/Sources/3.0.22%20%28stable%29/privoxy-3.0.22-stable-src.tar.gz;
-    sha256 = "0hfcxyb0i7dr6jfxw0y4kqcr09p8gjvcs7igyizyl5in3zn4y88s";
+    url = "mirror://sourceforge/ijbswa/Sources/3.0.22%20%28stable%29/${name}-stable-src.tar.gz";
+    sha256 = "a381f6dc78f08de0d4a2342d47a5949a6608073ada34b933137184f3ca9fb012";
   };
 
   buildInputs = [ autoreconfHook zlib pcre w3m man ];
@@ -17,4 +18,5 @@ stdenv.mkDerivation {
     platforms = platforms.all;
     maintainers = [ maintainers.phreedom ];
   };
+
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 3a7158994a9cb..8369873368934 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -86,25 +86,25 @@ let
 
 in rec {
 
-   nix = nixStable;
-
-   nixStable = common rec {
-     name = "nix-1.11.1";
-     src = fetchurl {
-       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-       sha256 = "21a99b3d0afdbe10241aaf506738fd0a81ff868e3d7c666e3cb6b621a926ea7a";
-     };
-   };
-
-   nixUnstable = nixStable;
-   /*
-   nixUnstable = lib.lowPrio (common rec {
-     name = "nix-1.11pre4379_786046c";
-     src = fetchurl {
-       url = "http://hydra.nixos.org/build/30375557/download/4/${name}.tar.xz";
-       sha256 = "ff42c70697fce7ca6eade622a31e5fbe45aed0edf1204fb491b40df207a807d5";
-     };
-   });
-   */
+  nix = nixStable;
+
+  nixStable = common rec {
+    name = "nix-1.11.2";
+    src = fetchurl {
+      url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
+      sha256 = "fc1233814ebb385a2a991c1fb88c97b344267281e173fea7d9acd3f9caf969d6";
+    };
+  };
+
+  nixUnstable = nixStable;
+  /*
+  nixUnstable = lib.lowPrio (common rec {
+    name = "nix-1.11pre4379_786046c";
+    src = fetchurl {
+      url = "http://hydra.nixos.org/build/30375557/download/4/${name}.tar.xz";
+      sha256 = "ff42c70697fce7ca6eade622a31e5fbe45aed0edf1204fb491b40df207a807d5";
+    };
+  });
+  */
 
 }
diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix
new file mode 100644
index 0000000000000..bde9756ee1a0e
--- /dev/null
+++ b/pkgs/tools/security/cipherscan/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, lib, fetchFromGitHub, pkgconfig, openssl, makeWrapper, python, coreutils }:
+
+stdenv.mkDerivation rec {
+  name = "cipherscan-${version}";
+  version = "2015-12-17";
+  src = fetchFromGitHub {
+    owner = "jvehent";
+    repo = "cipherscan";
+    rev = "18b0d1b952d027d20e38f07329817873ec077d26";
+    sha256 = "0b6fkfm2y8w04am4krspmapcc5ngn603n5rlwyjly92z2dawc7h8";
+  };
+  buildInputs = [ makeWrapper python ];
+  patches = [ ./path.patch ];
+  buildPhase = ''
+    substituteInPlace cipherscan \
+      --replace "@OPENSSLBIN@" \
+                "${openssl}/bin/openssl" \
+      --replace "@TIMEOUTBIN@" \
+                "${coreutils}/bin/timeout" \
+      --replace "@READLINKBIN@" \
+                "${coreutils}/bin/readlink"
+
+    substituteInPlace analyze.py \
+      --replace "@OPENSSLBIN@" \
+                "${openssl}/bin/openssl"
+  '';
+  installPhase = ''
+    mkdir -p $out/bin
+
+    cp cipherscan $out/bin
+    cp openssl.cnf $out/bin
+    cp analyze.py $out/bin
+
+    wrapProgram $out/bin/analyze.py --set PYTHONPATH "$PYTHONPATH"
+  '';
+  meta = with lib; {
+    description = "Very simple way to find out which SSL ciphersuites are supported by a target";
+    homepage = "https://github.com/jvehent/cipherscan";
+    license = licenses.mpl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/tools/security/cipherscan/path.patch b/pkgs/tools/security/cipherscan/path.patch
new file mode 100644
index 0000000000000..3b6d8ef805098
--- /dev/null
+++ b/pkgs/tools/security/cipherscan/path.patch
@@ -0,0 +1,93 @@
+diff --git a/analyze.py b/analyze.py
+index bb62af8..e929253 100755
+--- a/analyze.py
++++ b/analyze.py
+@@ -418,13 +418,7 @@ def build_ciphers_lists(opensslbin):
+ 
+     # use system openssl if not on linux 64
+     if not opensslbin:
+-        if platform.system() == 'Linux' and platform.architecture()[0] == '64bit':
+-            opensslbin = mypath + '/openssl'
+-        elif platform.system() == 'Darwin' and platform.architecture()[0] == '64bit':
+-            opensslbin = mypath + '/openssl-darwin64'
+-        else:
+-            opensslbin='openssl'
+-            print("warning: analyze.py is using system's openssl, which may limit the tested ciphers and recommendations")
++        opensslbin = "@OPENSSLBIN@"
+ 
+     logging.debug('Loading all ciphers: ' + allC)
+     all_ciphers = subprocess.Popen([opensslbin, 'ciphers', allC],
+diff --git a/cipherscan b/cipherscan
+index 236b34f..a240d13 100755
+--- a/cipherscan
++++ b/cipherscan
+@@ -30,43 +30,12 @@ if [[ -n $NOAUTODETECT ]]; then
+ else
+     case "$(uname -s)" in
+         Darwin)
+-            opensslbin_name="openssl-darwin64"
+-
+-            READLINKBIN=$(which greadlink 2>/dev/null)
+-            if [[ -z $READLINKBIN ]]; then
+-                echo "greadlink not found. (try: brew install coreutils)" 1>&2
+-                exit 1
+-            fi
+-            TIMEOUTBIN=$(which gtimeout 2>/dev/null)
+-            if [[ -z $TIMEOUTBIN ]]; then
+-                echo "gtimeout not found. (try: brew install coreutils)" 1>&2
+-                exit 1
+-            fi
++            READLINKBIN="@READLINKBIN@"
++            TIMEOUTBIN="@TIMEOUTBIN@"
+             ;;
+         *)
+-            opensslbin_name="openssl"
+-
+-            # test that readlink or greadlink (darwin) are present
+-            READLINKBIN="$(which readlink)"
+-
+-            if [[ -z $READLINKBIN ]]; then
+-                READLINKBIN="$(which greadlink)"
+-                if [[ -z $READLINKBIN ]]; then
+-                    echo "neither readlink nor greadlink are present. install coreutils with {apt-get,yum,brew} install coreutils" 1>&2
+-                    exit 1
+-                fi
+-            fi
+-
+-            # test that timeout or gtimeout (darwin) are present
+-            TIMEOUTBIN="$(which timeout)"
+-
+-            if [[ -z $TIMEOUTBIN ]]; then
+-                TIMEOUTBIN="$(which gtimeout)"
+-                if [[ -z $TIMEOUTBIN ]]; then
+-                    echo "neither timeout nor gtimeout are present. install coreutils with {apt-get,yum,brew} install coreutils" 1>&2
+-                    exit 1
+-                fi
+-            fi
++            READLINKBIN="@READLINKBIN@"
++            TIMEOUTBIN="@TIMEOUTBIN@"
+ 
+             # Check for busybox, which has different arguments
+             TIMEOUTOUTPUT="$($TIMEOUTBIN --help 2>&1)"
+@@ -1944,20 +1913,7 @@ do
+ done
+ 
+ if [[ -z $OPENSSLBIN ]]; then
+-    readlink_result=$("$READLINKBIN" -f "$0")
+-    if [[ -z $readlink_result ]]; then
+-        echo "$READLINKBIN -f $0 failed, aborting." 1>&2
+-        exit 1
+-    fi
+-    REALPATH=$(dirname "$readlink_result")
+-    if [[ -z $REALPATH ]]; then
+-        echo "dirname $REALPATH failed, aborting." 1>&2
+-        exit 1
+-    fi
+-    OPENSSLBIN="${REALPATH}/${opensslbin_name}"
+-    if ! [[ -x "${OPENSSLBIN}" ]]; then
+-        OPENSSLBIN="$(which openssl)"  # fallback to generic openssl
+-    fi
++    OPENSSLBIN="@OPENSSLBIN@"
+ fi
+ # use custom config file to enable GOST ciphers
+ if [[ -e $DIRNAMEPATH/openssl.cnf ]]; then
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index bafcd88f1b90c..dc86c6e420ef0 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -13,15 +13,13 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.1.10";
+  name = "gnupg-2.1.11";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1ybcsazjm21i2ys1wh49cz4azmqz7ghx5rb6hm4gm93i2zc5igck";
+    sha256 = "06mn2viiwsyq991arh5i5fhr9jyxq2bi0jkdj7ndfisxihngpc5p";
   };
 
-  patches = [ ./gpgkey2ssh-21.patch ];
-
   postPatch = stdenv.lib.optionalString stdenv.isLinux ''
     sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
   ''; #" fix Emacs syntax highlighting :-(
diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch
deleted file mode 100644
index 198869423e5cb..0000000000000
--- a/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
-index f12c5f4..2e3f2ac 100644
---- a/tools/gpgkey2ssh.c
-+++ b/tools/gpgkey2ssh.c
-@@ -281,7 +281,7 @@ main (int argc, char **argv)
-   keyid = argv[1];
- 
-   asprintf (&command,
--            "gpg2 --list-keys --with-colons --with-key-data '%s'",
-+            "@out@/bin/gpg2 --list-keys --with-colons --with-key-data '%s'",
-             keyid);
-   if (! command)
-     {
diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix
new file mode 100644
index 0000000000000..d040aaa6aea8e
--- /dev/null
+++ b/pkgs/tools/security/haka/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, cmake, swig, wireshark, check, rsync, libpcap, gawk, libedit, pcre }:
+
+let version = "0.3.0"; in
+
+stdenv.mkDerivation rec {
+  name = "haka-${version}";
+
+  src = fetchurl {
+    name = "haka_${version}_source.tar.gz";
+    url = "https://github.com/haka-security/haka/releases/download/v${version}/haka_${version}_source.tar.gz";
+
+    # https://github.com/haka-security/haka/releases/download/v${version}/haka_${version}_source.tar.gz.sha1.txt
+    sha1 = "87625ed32841cc0b3aa92aa49397ce71ce434bc2";
+  };
+
+  preConfigure = ''
+    sed -i 's,/etc,'$out'/etc,' src/haka/haka.c
+    sed -i 's,/etc,'$out'/etc,' src/haka/CMakeLists.txt
+    sed -i 's,/opt/haka/etc,$out/opt/haka/etc,' src/haka/haka.1
+    sed -i 's,/etc,'$out'/etc,' doc/user/tool_suite_haka.rst
+  '';
+
+  buildInputs = [ cmake swig wireshark check rsync libpcap gawk libedit pcre ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    dscription = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files";
+    homepage = http://www.haka-security.org/;
+    license = stdenv.lib.licenses.mpl20;
+    maintaineres = [ stdenv.lib.maintainers.tvestelind ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 03720d6abe1af..56e20726793d6 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
     sha256 = "05bk3lrp5jwg0v338lvylp7glpliydzz4jf5pjr6k3kagrv3jyik";
   };
 
-  patches = if stdenv.isDarwin then [ ./no-darwin-getopt.patch ] else null;
+  patches =
+    [ ./program-name.patch ] ++
+    stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/tools/security/pass/program-name.patch b/pkgs/tools/security/pass/program-name.patch
new file mode 100644
index 0000000000000..db01942f638de
--- /dev/null
+++ b/pkgs/tools/security/pass/program-name.patch
@@ -0,0 +1,13 @@
+diff --git a/src/password-store.sh b/src/password-store.sh
+index 6313384..6607a98 100755
+--- a/src/password-store.sh
++++ b/src/password-store.sh
+@@ -573,7 +573,7 @@ cmd_git() {
+ # END subcommand functions
+ #
+ 
+-PROGRAM="${0##*/}"
++PROGRAM="pass"
+ COMMAND="$1"
+ 
+ case "$1" in
diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix
new file mode 100644
index 0000000000000..3491feccc45cb
--- /dev/null
+++ b/pkgs/tools/security/rarcrack/default.nix
@@ -0,0 +1,39 @@
+{stdenv, fetchFromGitHub, libxml2, file, p7zip, unrar, unzip}:
+
+stdenv.mkDerivation rec {
+  name = "rarcrack-${version}";
+  version = "0.2";
+
+  src = fetchFromGitHub {
+    owner = "jaredsburrows";
+    repo = "Rarcrack";
+    rev = "35ead64cd2b967eec3e3e3a4c328b89b11ff32a0";
+    sha256 = "134fq84896w5vp8vg4qg0ybpb466njibigyd7bqqm1xydr07qrgn";
+  };
+
+  buildInputs = [ libxml2 file p7zip unrar unzip ];
+  buildFlags = if stdenv.cc.isClang then [ "CC=clang" ] else null;
+  installFlags = "PREFIX=\${out}";
+
+  patchPhase = ''
+   substituteInPlace rarcrack.c --replace "file -i" "${file}/bin/file -i"
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "This program can crack zip,7z and rar file passwords";
+    longDescription = ''
+    If you forget your password for compressed archive (rar, 7z, zip), this program is the solution.
+    This program uses bruteforce algorithm to find correct password. You can specify wich characters will be used in password generations.
+    Warning: Please don't use this program for any illegal things!
+    '';
+    homepage = https://github.com/jaredsburrows/Rarcrack;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ davidak ];
+    platforms = with platforms; unix;
+  };
+}
+
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index ca3e3aa10566a..ced4d868ee038 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -16,13 +16,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "5.0.7";
+  version = "5.5";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
     sha256 = if stdenv.is64bit then
-      "0igqh02bcdr0b4m6df46l1l1z38d4nh4pyfn6jqsvahacdl2qbsg" else
-      "1401j340348rqwd5c1m8hnxw7qkwpzqfa64q01cp08lz9cxxml4r";
+      "0glv2zffls1as71idbfg3l34kmsv48f3sk59swl6k8l75nvxlzjk" else
+      "0xbsixxs1hj0ydmazgi796xgvlsvbrkh8vfgaiyqcvgx4vf4ggwf";
   };
 
   desktopItem = makeDesktopItem {
diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix
new file mode 100644
index 0000000000000..47233532df3cb
--- /dev/null
+++ b/pkgs/tools/system/lr/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+let
+  version = "0.2";
+in
+stdenv.mkDerivation {
+  name = "lr-${version}";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "chneukirchen";
+    repo = "lr";
+    rev = "v${version}";
+    sha256 = "1wn1j0cf84r4nli92myf3waackh2p6r2hkavgx6533x15kdyfnf7";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  meta = {
+    homepage = "http://github.com/chneukirchen/lr";
+    description = "List files recursively";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [stdenv.lib.maintainers.globin];
+  };
+}
diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix
new file mode 100644
index 0000000000000..2f34b354d52e2
--- /dev/null
+++ b/pkgs/tools/system/nq/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "nq-${version}";
+  version = "0.1";
+  src = fetchFromGitHub {
+    owner = "chneukirchen";
+    repo = "nq";
+    rev = "v${version}";
+    sha256 = "17n0yqhpsys3s872ki5rf82ky73ylahz6xi9x0rfrv7fqr5nzsz4";
+  };
+  makeFlags = "PREFIX=$(out)";
+  postPatch = ''
+    sed -i tq \
+      -e 's|\bfq\b|'$out'/bin/fq|g' \
+      -e 's|\bnq\b|'$out'/bin/nq|g'
+  '';
+  meta = with lib; {
+    description = "Unix command line queue utility";
+    homepage = "https://github.com/chneukirchen/nq";
+    license = licenses.publicDomain;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix
new file mode 100644
index 0000000000000..303374942c0d4
--- /dev/null
+++ b/pkgs/tools/system/xe/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "xe-${version}";
+  version = "0.5";
+  src = fetchFromGitHub {
+    owner = "chneukirchen";
+    repo = "xe";
+    rev = "v${version}";
+    sha256 = "0rv9npgjb695slql39asyp6znv9r3a6jbcsrsa1cmhk82iy4bljc";
+  };
+  makeFlags = "PREFIX=$(out)";
+  meta = with lib; {
+    description = "Simple xargs and apply replacement";
+    homepage = "https://github.com/chneukirchen/xe";
+    license = licenses.publicDomain;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix
index 53e683561fb82..b22a1da226418 100644
--- a/pkgs/tools/text/colordiff/default.nix
+++ b/pkgs/tools/text/colordiff/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.colordiff.org/;
     license = licenses.gpl3;
     platforms = platforms.linux ++ platforms.darwin;
-    maintainer = with maintainers; [ nckx ];
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix
new file mode 100644
index 0000000000000..3310c1a2fe4ac
--- /dev/null
+++ b/pkgs/tools/text/popfile/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchzip, makeWrapper, perlPackages,
+... }:
+
+stdenv.mkDerivation rec {
+  appname = "popfile";
+  version = "1.1.3";
+  name = "${appname}-${version}";
+
+  src = fetchzip {
+    url = "http://getpopfile.org/downloads/${appname}-${version}.zip";
+    sha256 = "0gcib9j7zxk8r2vb5dbdz836djnyfza36vi8215nxcdfx1xc7l63";
+    stripRoot = false;
+  };
+
+  buildInputs = [ makeWrapper ] ++ (with perlPackages; [
+    ## These are all taken from the popfile documentation as applicable to Linux
+    ## http://getpopfile.org/docs/howtos:allplatformsrequireperl
+    perl
+    DBI
+    DBDSQLite
+    Digest
+    DigestMD5
+    HTMLTagset
+    MIMEBase64 # == MIMEQuotedPrint
+    TimeDate # == DateParse
+    HTMLTemplate
+    # IO::Socket::Socks is not in nixpkgs
+    # IOSocketSocks 
+    IOSocketSSL
+    NetSSLeay
+    SOAPLite
+  ]);
+
+
+  phases = [ "unpackPhase" "installPhase" "patchPhase" "postInstall" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    # I user `cd` rather than `cp $out/* ...` b/c the * breaks syntax
+    # highlighting in emacs for me.
+    cd $src
+    cp -r * $out/bin
+    cd $out/bin
+    chmod +x *.pl
+  '';
+
+  patchPhase = "patchShebangs $out";
+
+  postInstall = ''
+    find $out -name '*.pl' -executable | while read path; do
+      wrapProgram "$path" \
+        --prefix PERL5LIB : $PERL5LIB:$out/bin \
+        --set POPFILE_ROOT $out/bin \
+        --set POPFILE_USER \$\{POPFILE_USER:-\$HOME/.popfile\} \
+        --run "test -d \$POPFILE_USER || mkdir -m 0700 -p \$POPFILE_USER"
+    done
+  '';
+
+  meta = {
+    description = "An email classification system that automatically sorts messages and fights spam.";
+    homepage = http://getpopfile.org;
+    license = stdenv.lib.licenses.gpl2;
+
+    # Should work on OS X, but havent tested it.
+    # Windows support is more complicated.
+    # http://getpopfile.org/docs/faq:systemrequirements
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}
+  
diff --git a/pkgs/tools/typesetting/tex/disser/default.nix b/pkgs/tools/typesetting/tex/disser/default.nix
deleted file mode 100644
index cbbc3844fefb3..0000000000000
--- a/pkgs/tools/typesetting/tex/disser/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-x@{builderDefsPackage
-  , unzip, texLive, texLiveCMSuper, texLiveAggregationFun
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    ["texLive" "texLiveCMSuper" "texLiveAggregationFun"];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames))
-    ++ [(a.texLiveAggregationFun {paths=[a.texLive a.texLiveCMSuper];})];
-  sourceInfo = rec {
-    baseName="disser";
-    version="1.3.0";
-    name="${baseName}-${version}";
-    project="${baseName}";
-    url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.zip";
-    hash="1iab3va6xw53l8xzmd83kbnzqah9f6imzzfd3c2054q53p0ndlim";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "doMakeInstall"];
-
-  setVars = a.noDepEntry ''
-    export HOME="$TMPDIR"
-  '';
-
-  makeFlags = ["DESTDIR=$out/share/texmf-dist"];
-
-  meta = {
-    description = "Russian PhD thesis LaTeX package";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux; # platform-independent
-    license = a.lib.licenses.free; # LaTeX Project Public License
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/disser/files/disser/";
-    };
-  };
-}) x
diff --git a/pkgs/tools/virtualization/azure-cli/node-packages.nix b/pkgs/tools/virtualization/azure-cli/node-packages.nix
index 9601e4215abe5..2cf7380caee72 100644
--- a/pkgs/tools/virtualization/azure-cli/node-packages.nix
+++ b/pkgs/tools/virtualization/azure-cli/node-packages.nix
@@ -13,12 +13,12 @@
       sha1 = "ed205574c05ae93c68f0b59909588242f2c9ccf8";
     };
     deps = {
-      "date-utils-1.2.17" = self.by-version."date-utils"."1.2.17";
-      "jws-3.1.0" = self.by-version."jws"."3.1.0";
+      "date-utils-1.2.18" = self.by-version."date-utils"."1.2.18";
+      "jws-3.1.1" = self.by-version."jws"."3.1.1";
       "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
-      "request-2.67.0" = self.by-version."request"."2.67.0";
+      "request-2.69.0" = self.by-version."request"."2.69.0";
       "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
-      "xmldom-0.1.20" = self.by-version."xmldom"."0.1.20";
+      "xmldom-0.1.22" = self.by-version."xmldom"."0.1.22";
       "xpath.js-1.0.6" = self.by-version."xpath.js"."1.0.6";
       "async-1.5.2" = self.by-version."async"."1.5.2";
     };
@@ -40,12 +40,12 @@
       sha1 = "7946eb374c837730bd3cc49b0894928154e505d0";
     };
     deps = {
-      "date-utils-1.2.17" = self.by-version."date-utils"."1.2.17";
-      "jws-3.1.0" = self.by-version."jws"."3.1.0";
+      "date-utils-1.2.18" = self.by-version."date-utils"."1.2.18";
+      "jws-3.1.1" = self.by-version."jws"."3.1.1";
       "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
-      "request-2.67.0" = self.by-version."request"."2.67.0";
+      "request-2.69.0" = self.by-version."request"."2.69.0";
       "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
-      "xmldom-0.1.20" = self.by-version."xmldom"."0.1.20";
+      "xmldom-0.1.22" = self.by-version."xmldom"."0.1.22";
       "xpath.js-1.0.6" = self.by-version."xpath.js"."1.0.6";
       "async-1.5.2" = self.by-version."async"."1.5.2";
     };
@@ -150,21 +150,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."asn1.js"."^2.0.3" =
-    self.by-version."asn1.js"."2.2.1";
-  by-version."asn1.js"."2.2.1" = self.buildNodePackage {
-    name = "asn1.js-2.2.1";
-    version = "2.2.1";
+  by-spec."assert-plus".">=0.2.0 <0.3.0" =
+    self.by-version."assert-plus"."0.2.0";
+  by-version."assert-plus"."0.2.0" = self.buildNodePackage {
+    name = "assert-plus-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/asn1.js/-/asn1.js-2.2.1.tgz";
-      name = "asn1.js-2.2.1.tgz";
-      sha1 = "c8ba4dd68e84431288126230cb2045bdfa9fbfe1";
+      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+      name = "assert-plus-0.2.0.tgz";
+      sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
     };
     deps = {
-      "bn.js-2.2.0" = self.by-version."bn.js"."2.2.0";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimalistic-assert-1.0.0" = self.by-version."minimalistic-assert"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -172,7 +169,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."assert-plus"."0.1.x" =
+  by-spec."assert-plus"."^0.1.5" =
     self.by-version."assert-plus"."0.1.5";
   by-version."assert-plus"."0.1.5" = self.buildNodePackage {
     name = "assert-plus-0.1.5";
@@ -191,27 +188,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."assert-plus".">=0.2.0 <0.3.0" =
+  by-spec."assert-plus"."^0.2.0" =
     self.by-version."assert-plus"."0.2.0";
-  by-version."assert-plus"."0.2.0" = self.buildNodePackage {
-    name = "assert-plus-0.2.0";
-    version = "0.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
-      name = "assert-plus-0.2.0.tgz";
-      sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."assert-plus"."^0.1.5" =
-    self.by-version."assert-plus"."0.1.5";
   by-spec."async"."0.1.x" =
     self.by-version."async"."0.1.22";
   by-version."async"."0.1.22" = self.buildNodePackage {
@@ -347,6 +325,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."aws4"."^1.2.1" =
+    self.by-version."aws4"."1.2.1";
+  by-version."aws4"."1.2.1" = self.buildNodePackage {
+    name = "aws4-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws4/-/aws4-1.2.1.tgz";
+      name = "aws4-1.2.1.tgz";
+      sha1 = "52b5659a4d32583d405f65e1124ac436d07fe5ac";
+    };
+    deps = {
+      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."azure-arm-apiapp"."0.1.3" =
     self.by-version."azure-arm-apiapp"."0.1.3";
   by-version."azure-arm-apiapp"."0.1.3" = self.buildNodePackage {
@@ -410,20 +408,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."azure-arm-compute"."0.13.0" =
-    self.by-version."azure-arm-compute"."0.13.0";
-  by-version."azure-arm-compute"."0.13.0" = self.buildNodePackage {
-    name = "azure-arm-compute-0.13.0";
-    version = "0.13.0";
+  by-spec."azure-arm-compute"."0.14.0" =
+    self.by-version."azure-arm-compute"."0.14.0";
+  by-version."azure-arm-compute"."0.14.0" = self.buildNodePackage {
+    name = "azure-arm-compute-0.14.0";
+    version = "0.14.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.13.0.tgz";
-      name = "azure-arm-compute-0.13.0.tgz";
-      sha1 = "0442a5f9d49d9dea8fc7391a100c916e19e0b1d9";
+      url = "http://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.14.0.tgz";
+      name = "azure-arm-compute-0.14.0.tgz";
+      sha1 = "5c2d2b981541b703335294a60718bd96a19cd285";
     };
     deps = {
-      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
-      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+      "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0";
+      "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0";
     };
     optionalDependencies = {
     };
@@ -444,7 +442,7 @@
     };
     deps = {
       "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
-      "moment-2.11.1" = self.by-version."moment"."2.11.1";
+      "moment-2.11.2" = self.by-version."moment"."2.11.2";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
     };
@@ -559,19 +557,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."azure-arm-network"."0.10.6" =
-    self.by-version."azure-arm-network"."0.10.6";
-  by-version."azure-arm-network"."0.10.6" = self.buildNodePackage {
-    name = "azure-arm-network-0.10.6";
-    version = "0.10.6";
+  by-spec."azure-arm-network"."0.12.0" =
+    self.by-version."azure-arm-network"."0.12.0";
+  by-version."azure-arm-network"."0.12.0" = self.buildNodePackage {
+    name = "azure-arm-network-0.12.0";
+    version = "0.12.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.10.6.tgz";
-      name = "azure-arm-network-0.10.6.tgz";
-      sha1 = "d7e77e34fe41007a54154475185ac405e59073b3";
+      url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.12.0.tgz";
+      name = "azure-arm-network-0.12.0.tgz";
+      sha1 = "676f042f643c49d2af0071dd809789b53a70162b";
     };
     deps = {
-      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0";
+      "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0";
     };
     optionalDependencies = {
     };
@@ -579,20 +578,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."azure-arm-rediscache"."0.1.0" =
-    self.by-version."azure-arm-rediscache"."0.1.0";
-  by-version."azure-arm-rediscache"."0.1.0" = self.buildNodePackage {
-    name = "azure-arm-rediscache-0.1.0";
-    version = "0.1.0";
+  by-spec."azure-arm-rediscache"."0.2.0" =
+    self.by-version."azure-arm-rediscache"."0.2.0";
+  by-version."azure-arm-rediscache"."0.2.0" = self.buildNodePackage {
+    name = "azure-arm-rediscache-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.1.0.tgz";
-      name = "azure-arm-rediscache-0.1.0.tgz";
-      sha1 = "2527ce57541fc5264627f93f62e4ffcfd01df498";
+      url = "http://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.0.tgz";
+      name = "azure-arm-rediscache-0.2.0.tgz";
+      sha1 = "cd9a25e4a2e0e58accdba5064811ddaa62eafeef";
     };
     deps = {
-      "ms-rest-1.2.0" = self.by-version."ms-rest"."1.2.0";
-      "ms-rest-azure-1.2.0" = self.by-version."ms-rest-azure"."1.2.0";
+      "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0";
+      "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0";
     };
     optionalDependencies = {
     };
@@ -621,19 +620,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."azure-arm-storage"."0.11.0" =
-    self.by-version."azure-arm-storage"."0.11.0";
-  by-version."azure-arm-storage"."0.11.0" = self.buildNodePackage {
-    name = "azure-arm-storage-0.11.0";
-    version = "0.11.0";
+  by-spec."azure-arm-storage"."0.12.1-preview" =
+    self.by-version."azure-arm-storage"."0.12.1-preview";
+  by-version."azure-arm-storage"."0.12.1-preview" = self.buildNodePackage {
+    name = "azure-arm-storage-0.12.1-preview";
+    version = "0.12.1-preview";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.11.0.tgz";
-      name = "azure-arm-storage-0.11.0.tgz";
-      sha1 = "ba5bc8d616b835ddb6149d462a424d534ac87c95";
+      url = "http://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.12.1-preview.tgz";
+      name = "azure-arm-storage-0.12.1-preview.tgz";
+      sha1 = "e793fe390348d809763623bbdc7ab5a7d1dd0d27";
     };
     deps = {
-      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0";
+      "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0";
     };
     optionalDependencies = {
     };
@@ -641,16 +641,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."azure-arm-trafficmanager"."0.10.4" =
-    self.by-version."azure-arm-trafficmanager"."0.10.4";
-  by-version."azure-arm-trafficmanager"."0.10.4" = self.buildNodePackage {
-    name = "azure-arm-trafficmanager-0.10.4";
-    version = "0.10.4";
+  by-spec."azure-arm-trafficmanager"."0.10.5" =
+    self.by-version."azure-arm-trafficmanager"."0.10.5";
+  by-version."azure-arm-trafficmanager"."0.10.5" = self.buildNodePackage {
+    name = "azure-arm-trafficmanager-0.10.5";
+    version = "0.10.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.4.tgz";
-      name = "azure-arm-trafficmanager-0.10.4.tgz";
-      sha1 = "f1a788c3c97c7c6f8d82cef6034bbdbe68bb29e3";
+      url = "http://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.5.tgz";
+      name = "azure-arm-trafficmanager-0.10.5.tgz";
+      sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01";
     };
     deps = {
       "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
@@ -891,15 +891,15 @@
     cpu = [ ];
   };
   by-spec."azure-cli"."*" =
-    self.by-version."azure-cli"."0.9.13";
-  by-version."azure-cli"."0.9.13" = self.buildNodePackage {
-    name = "azure-cli-0.9.13";
-    version = "0.9.13";
+    self.by-version."azure-cli"."0.9.15";
+  by-version."azure-cli"."0.9.15" = self.buildNodePackage {
+    name = "azure-cli-0.9.15";
+    version = "0.9.15";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-cli/-/azure-cli-0.9.13.tgz";
-      name = "azure-cli-0.9.13.tgz";
-      sha1 = "6792c21c0b826d07759e0c7e9b718c291be1381f";
+      url = "http://registry.npmjs.org/azure-cli/-/azure-cli-0.9.15.tgz";
+      name = "azure-cli-0.9.15.tgz";
+      sha1 = "c629199efd96c217c8b4341c5b8489c119fdbe4a";
     };
     deps = {
       "adal-node-0.1.17" = self.by-version."adal-node"."0.1.17";
@@ -908,18 +908,18 @@
       "azure-arm-apiapp-0.1.3" = self.by-version."azure-arm-apiapp"."0.1.3";
       "azure-arm-authorization-2.0.0" = self.by-version."azure-arm-authorization"."2.0.0";
       "azure-arm-commerce-0.1.1" = self.by-version."azure-arm-commerce"."0.1.1";
-      "azure-arm-compute-0.13.0" = self.by-version."azure-arm-compute"."0.13.0";
+      "azure-arm-compute-0.14.0" = self.by-version."azure-arm-compute"."0.14.0";
       "azure-arm-hdinsight-0.1.0" = self.by-version."azure-arm-hdinsight"."0.1.0";
       "azure-arm-hdinsight-jobs-0.1.0" = self.by-version."azure-arm-hdinsight-jobs"."0.1.0";
       "azure-arm-insights-0.10.2" = self.by-version."azure-arm-insights"."0.10.2";
-      "azure-arm-network-0.10.6" = self.by-version."azure-arm-network"."0.10.6";
-      "azure-arm-trafficmanager-0.10.4" = self.by-version."azure-arm-trafficmanager"."0.10.4";
+      "azure-arm-network-0.12.0" = self.by-version."azure-arm-network"."0.12.0";
+      "azure-arm-trafficmanager-0.10.5" = self.by-version."azure-arm-trafficmanager"."0.10.5";
       "azure-arm-dns-0.10.1" = self.by-version."azure-arm-dns"."0.10.1";
       "azure-arm-website-0.10.0" = self.by-version."azure-arm-website"."0.10.0";
-      "azure-arm-rediscache-0.1.0" = self.by-version."azure-arm-rediscache"."0.1.0";
+      "azure-arm-rediscache-0.2.0" = self.by-version."azure-arm-rediscache"."0.2.0";
       "azure-arm-datalake-analytics-0.1.2" = self.by-version."azure-arm-datalake-analytics"."0.1.2";
       "azure-arm-datalake-store-0.1.2" = self.by-version."azure-arm-datalake-store"."0.1.2";
-      "azure-extra-0.1.12" = self.by-version."azure-extra"."0.1.12";
+      "azure-extra-0.2.12" = self.by-version."azure-extra"."0.2.12";
       "azure-gallery-2.0.0-pre.18" = self.by-version."azure-gallery"."2.0.0-pre.18";
       "azure-keyvault-0.10.1" = self.by-version."azure-keyvault"."0.10.1";
       "azure-asm-compute-0.11.0" = self.by-version."azure-asm-compute"."0.11.0";
@@ -929,13 +929,13 @@
       "azure-monitoring-0.10.2" = self.by-version."azure-monitoring"."0.10.2";
       "azure-asm-network-0.10.2" = self.by-version."azure-asm-network"."0.10.2";
       "azure-arm-resource-0.10.7" = self.by-version."azure-arm-resource"."0.10.7";
-      "azure-arm-storage-0.11.0" = self.by-version."azure-arm-storage"."0.11.0";
+      "azure-arm-storage-0.12.1-preview" = self.by-version."azure-arm-storage"."0.12.1-preview";
       "azure-asm-sb-0.10.1" = self.by-version."azure-asm-sb"."0.10.1";
       "azure-asm-sql-0.10.1" = self.by-version."azure-asm-sql"."0.10.1";
       "azure-asm-storage-0.10.1" = self.by-version."azure-asm-storage"."0.10.1";
       "azure-asm-subscription-0.10.1" = self.by-version."azure-asm-subscription"."0.10.1";
       "azure-asm-website-0.10.1" = self.by-version."azure-asm-website"."0.10.1";
-      "azure-storage-0.6.0" = self.by-version."azure-storage"."0.6.0";
+      "azure-storage-0.7.0" = self.by-version."azure-storage"."0.7.0";
       "caller-id-0.1.0" = self.by-version."caller-id"."0.1.0";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "commander-1.0.4" = self.by-version."commander"."1.0.4";
@@ -950,7 +950,7 @@
       "kuduscript-1.0.6" = self.by-version."kuduscript"."1.0.6";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "moment-2.6.0" = self.by-version."moment"."2.6.0";
-      "ms-rest-azure-1.2.0" = self.by-version."ms-rest-azure"."1.2.0";
+      "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0";
       "node-forge-0.6.23" = self.by-version."node-forge"."0.6.23";
       "node-uuid-1.2.0" = self.by-version."node-uuid"."1.2.0";
       "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0";
@@ -980,7 +980,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "azure-cli" = self.by-version."azure-cli"."0.9.13";
+  "azure-cli" = self.by-version."azure-cli"."0.9.15";
   by-spec."azure-common"."0.9.12" =
     self.by-version."azure-common"."0.9.12";
   by-version."azure-common"."0.9.12" = self.buildNodePackage {
@@ -997,7 +997,7 @@
       "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3";
       "dateformat-1.0.2-1.2.3" = self.by-version."dateformat"."1.0.2-1.2.3";
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
-      "tunnel-0.0.3" = self.by-version."tunnel"."0.0.3";
+      "tunnel-0.0.4" = self.by-version."tunnel"."0.0.4";
       "request-2.45.0" = self.by-version."request"."2.45.0";
       "validator-3.1.0" = self.by-version."validator"."3.1.0";
       "envconf-0.0.4" = self.by-version."envconf"."0.0.4";
@@ -1026,7 +1026,7 @@
       "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3";
       "dateformat-1.0.2-1.2.3" = self.by-version."dateformat"."1.0.2-1.2.3";
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
-      "tunnel-0.0.3" = self.by-version."tunnel"."0.0.3";
+      "tunnel-0.0.4" = self.by-version."tunnel"."0.0.4";
       "request-2.45.0" = self.by-version."request"."2.45.0";
       "validator-3.22.2" = self.by-version."validator"."3.22.2";
       "envconf-0.0.4" = self.by-version."envconf"."0.0.4";
@@ -1043,16 +1043,16 @@
     self.by-version."azure-common"."0.9.16";
   by-spec."azure-common"."^0.9.13" =
     self.by-version."azure-common"."0.9.16";
-  by-spec."azure-extra"."0.1.12" =
-    self.by-version."azure-extra"."0.1.12";
-  by-version."azure-extra"."0.1.12" = self.buildNodePackage {
-    name = "azure-extra-0.1.12";
-    version = "0.1.12";
+  by-spec."azure-extra"."0.2.12" =
+    self.by-version."azure-extra"."0.2.12";
+  by-version."azure-extra"."0.2.12" = self.buildNodePackage {
+    name = "azure-extra-0.2.12";
+    version = "0.2.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-extra/-/azure-extra-0.1.12.tgz";
-      name = "azure-extra-0.1.12.tgz";
-      sha1 = "78a0c3b65e981df59e23428b56172f6337a8920a";
+      url = "http://registry.npmjs.org/azure-extra/-/azure-extra-0.2.12.tgz";
+      name = "azure-extra-0.2.12.tgz";
+      sha1 = "9fa99fb577f678eadcc4d292a9c1aed8aed9d088";
     };
     deps = {
       "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
@@ -1129,22 +1129,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."azure-storage"."0.6.0" =
-    self.by-version."azure-storage"."0.6.0";
-  by-version."azure-storage"."0.6.0" = self.buildNodePackage {
-    name = "azure-storage-0.6.0";
-    version = "0.6.0";
+  by-spec."azure-storage"."0.7.0" =
+    self.by-version."azure-storage"."0.7.0";
+  by-version."azure-storage"."0.7.0" = self.buildNodePackage {
+    name = "azure-storage-0.7.0";
+    version = "0.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-storage/-/azure-storage-0.6.0.tgz";
-      name = "azure-storage-0.6.0.tgz";
-      sha1 = "e856c2069d1a9a6926936d70d6854d69230e7b4a";
+      url = "http://registry.npmjs.org/azure-storage/-/azure-storage-0.7.0.tgz";
+      name = "azure-storage-0.7.0.tgz";
+      sha1 = "246fc65adf96b3332043ecbc2b0176506b8a7359";
     };
     deps = {
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "browserify-mime-1.2.9" = self.by-version."browserify-mime"."1.2.9";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-2.0.5" = self.by-version."readable-stream"."2.0.5";
       "request-2.57.0" = self.by-version."request"."2.57.0";
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
       "validator-3.22.2" = self.by-version."validator"."3.22.2";
@@ -1217,15 +1217,15 @@
     cpu = [ ];
   };
   by-spec."bl"."~0.9.0" =
-    self.by-version."bl"."0.9.4";
-  by-version."bl"."0.9.4" = self.buildNodePackage {
-    name = "bl-0.9.4";
-    version = "0.9.4";
+    self.by-version."bl"."0.9.5";
+  by-version."bl"."0.9.5" = self.buildNodePackage {
+    name = "bl-0.9.5";
+    version = "0.9.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz";
-      name = "bl-0.9.4.tgz";
-      sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7";
+      url = "http://registry.npmjs.org/bl/-/bl-0.9.5.tgz";
+      name = "bl-0.9.5.tgz";
+      sha1 = "c06b797af085ea00bc527afc8efcf11de2232054";
     };
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
@@ -1237,15 +1237,15 @@
     cpu = [ ];
   };
   by-spec."bl"."~1.0.0" =
-    self.by-version."bl"."1.0.0";
-  by-version."bl"."1.0.0" = self.buildNodePackage {
-    name = "bl-1.0.0";
-    version = "1.0.0";
+    self.by-version."bl"."1.0.2";
+  by-version."bl"."1.0.2" = self.buildNodePackage {
+    name = "bl-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bl/-/bl-1.0.0.tgz";
-      name = "bl-1.0.0.tgz";
-      sha1 = "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5";
+      url = "http://registry.npmjs.org/bl/-/bl-1.0.2.tgz";
+      name = "bl-1.0.2.tgz";
+      sha1 = "8c66490d825ba84d560de1f62196a29555b3a0c4";
     };
     deps = {
       "readable-stream-2.0.5" = self.by-version."readable-stream"."2.0.5";
@@ -1275,25 +1275,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bn.js"."^2.0.0" =
-    self.by-version."bn.js"."2.2.0";
-  by-version."bn.js"."2.2.0" = self.buildNodePackage {
-    name = "bn.js-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz";
-      name = "bn.js-2.2.0.tgz";
-      sha1 = "12162bc2ae71fc40a5626c33438f3a875cd37625";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."boom"."0.4.x" =
     self.by-version."boom"."0.4.2";
   by-version."boom"."0.4.2" = self.buildNodePackage {
@@ -1334,6 +1315,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."browserify-mime"."~1.2.9" =
+    self.by-version."browserify-mime"."1.2.9";
+  by-version."browserify-mime"."1.2.9" = self.buildNodePackage {
+    name = "browserify-mime-1.2.9";
+    version = "1.2.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz";
+      name = "browserify-mime-1.2.9.tgz";
+      sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."buffer-equal-constant-time"."^1.0.1" =
     self.by-version."buffer-equal-constant-time"."1.0.1";
   by-version."buffer-equal-constant-time"."1.0.1" = self.buildNodePackage {
@@ -1781,18 +1781,18 @@
     cpu = [ ];
   };
   by-spec."dashdash".">=1.10.1 <2.0.0" =
-    self.by-version."dashdash"."1.12.1";
-  by-version."dashdash"."1.12.1" = self.buildNodePackage {
-    name = "dashdash-1.12.1";
-    version = "1.12.1";
+    self.by-version."dashdash"."1.12.2";
+  by-version."dashdash"."1.12.2" = self.buildNodePackage {
+    name = "dashdash-1.12.2";
+    version = "1.12.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dashdash/-/dashdash-1.12.1.tgz";
-      name = "dashdash-1.12.1.tgz";
-      sha1 = "ed5fd0f9d2dc189e1fbf11e40f6a412167203b6a";
+      url = "http://registry.npmjs.org/dashdash/-/dashdash-1.12.2.tgz";
+      name = "dashdash-1.12.2.tgz";
+      sha1 = "1c6f70588498d047b8cd5777b32ba85a5e25be36";
     };
     deps = {
-      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
     };
     optionalDependencies = {
     };
@@ -1801,15 +1801,15 @@
     cpu = [ ];
   };
   by-spec."date-utils"."*" =
-    self.by-version."date-utils"."1.2.17";
-  by-version."date-utils"."1.2.17" = self.buildNodePackage {
-    name = "date-utils-1.2.17";
-    version = "1.2.17";
+    self.by-version."date-utils"."1.2.18";
+  by-version."date-utils"."1.2.18" = self.buildNodePackage {
+    name = "date-utils-1.2.18";
+    version = "1.2.18";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/date-utils/-/date-utils-1.2.17.tgz";
-      name = "date-utils-1.2.17.tgz";
-      sha1 = "b469652478afc2647917ec1c7c00d9c371f2ad53";
+      url = "http://registry.npmjs.org/date-utils/-/date-utils-1.2.18.tgz";
+      name = "date-utils-1.2.18.tgz";
+      sha1 = "6a55e61b20250e9c24d836b1eaac9b32ee255d51";
     };
     deps = {
     };
@@ -1954,18 +1954,17 @@
     cpu = [ ];
   };
   by-spec."ecdsa-sig-formatter"."^1.0.0" =
-    self.by-version."ecdsa-sig-formatter"."1.0.2";
-  by-version."ecdsa-sig-formatter"."1.0.2" = self.buildNodePackage {
-    name = "ecdsa-sig-formatter-1.0.2";
-    version = "1.0.2";
+    self.by-version."ecdsa-sig-formatter"."1.0.5";
+  by-version."ecdsa-sig-formatter"."1.0.5" = self.buildNodePackage {
+    name = "ecdsa-sig-formatter-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.2.tgz";
-      name = "ecdsa-sig-formatter-1.0.2.tgz";
-      sha1 = "2074b4bd06be5e7479c9f71e73358bc3deea4a9b";
+      url = "http://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.5.tgz";
+      name = "ecdsa-sig-formatter-1.0.5.tgz";
+      sha1 = "0d0f32b638611f6b8f36ffd305a3e512ea5444e6";
     };
     deps = {
-      "asn1.js-2.2.1" = self.by-version."asn1.js"."2.2.1";
       "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1";
     };
     optionalDependencies = {
@@ -2409,7 +2408,7 @@
       "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2";
       "chalk-1.1.1" = self.by-version."chalk"."1.1.1";
       "commander-2.9.0" = self.by-version."commander"."2.9.0";
-      "is-my-json-valid-2.12.3" = self.by-version."is-my-json-valid"."2.12.3";
+      "is-my-json-valid-2.12.4" = self.by-version."is-my-json-valid"."2.12.4";
     };
     optionalDependencies = {
     };
@@ -2417,21 +2416,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."har-validator"."~2.0.2" =
-    self.by-version."har-validator"."2.0.3";
-  by-version."har-validator"."2.0.3" = self.buildNodePackage {
-    name = "har-validator-2.0.3";
-    version = "2.0.3";
+  by-spec."har-validator"."~2.0.6" =
+    self.by-version."har-validator"."2.0.6";
+  by-version."har-validator"."2.0.6" = self.buildNodePackage {
+    name = "har-validator-2.0.6";
+    version = "2.0.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz";
-      name = "har-validator-2.0.3.tgz";
-      sha1 = "5a9e12564a571cf0b81ef93c2157bd1617168883";
+      url = "http://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
+      name = "har-validator-2.0.6.tgz";
+      sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
     };
     deps = {
       "chalk-1.1.1" = self.by-version."chalk"."1.1.1";
       "commander-2.9.0" = self.by-version."commander"."2.9.0";
-      "is-my-json-valid-2.12.3" = self.by-version."is-my-json-valid"."2.12.3";
+      "is-my-json-valid-2.12.4" = self.by-version."is-my-json-valid"."2.12.4";
       "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
     };
     optionalDependencies = {
@@ -2507,15 +2506,15 @@
     cpu = [ ];
   };
   by-spec."hawk"."~3.1.0" =
-    self.by-version."hawk"."3.1.2";
-  by-version."hawk"."3.1.2" = self.buildNodePackage {
-    name = "hawk-3.1.2";
-    version = "3.1.2";
+    self.by-version."hawk"."3.1.3";
+  by-version."hawk"."3.1.3" = self.buildNodePackage {
+    name = "hawk-3.1.3";
+    version = "3.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz";
-      name = "hawk-3.1.2.tgz";
-      sha1 = "90c90118886e21975d1ad4ae9b3e284ed19a2de8";
+      url = "http://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+      name = "hawk-3.1.3.tgz";
+      sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
     };
     deps = {
       "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
@@ -2612,20 +2611,20 @@
     cpu = [ ];
   };
   by-spec."http-signature"."~1.1.0" =
-    self.by-version."http-signature"."1.1.0";
-  by-version."http-signature"."1.1.0" = self.buildNodePackage {
-    name = "http-signature-1.1.0";
-    version = "1.1.0";
+    self.by-version."http-signature"."1.1.1";
+  by-version."http-signature"."1.1.1" = self.buildNodePackage {
+    name = "http-signature-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz";
-      name = "http-signature-1.1.0.tgz";
-      sha1 = "5d2d7e9b6ef49980ad5b128d8e4ef09a31c90d95";
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
+      name = "http-signature-1.1.1.tgz";
+      sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
     };
     deps = {
-      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
       "jsprim-1.2.2" = self.by-version."jsprim"."1.2.2";
-      "sshpk-1.7.2" = self.by-version."sshpk"."1.7.2";
+      "sshpk-1.7.3" = self.by-version."sshpk"."1.7.3";
     };
     optionalDependencies = {
     };
@@ -2674,7 +2673,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."inherits"."^2.0.1" =
+  by-spec."inherits"."~2.0.1" =
     self.by-version."inherits"."2.0.1";
   by-version."inherits"."2.0.1" = self.buildNodePackage {
     name = "inherits-2.0.1";
@@ -2693,8 +2692,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."inherits"."~2.0.1" =
-    self.by-version."inherits"."2.0.1";
   by-spec."is-finite"."^1.0.0" =
     self.by-version."is-finite"."1.0.1";
   by-version."is-finite"."1.0.1" = self.buildNodePackage {
@@ -2716,15 +2713,15 @@
     cpu = [ ];
   };
   by-spec."is-my-json-valid"."^2.12.0" =
-    self.by-version."is-my-json-valid"."2.12.3";
-  by-version."is-my-json-valid"."2.12.3" = self.buildNodePackage {
-    name = "is-my-json-valid-2.12.3";
-    version = "2.12.3";
+    self.by-version."is-my-json-valid"."2.12.4";
+  by-version."is-my-json-valid"."2.12.4" = self.buildNodePackage {
+    name = "is-my-json-valid-2.12.4";
+    version = "2.12.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz";
-      name = "is-my-json-valid-2.12.3.tgz";
-      sha1 = "5a39d1d76b2dbb83140bbd157b1d5ee4bdc85ad6";
+      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz";
+      name = "is-my-json-valid-2.12.4.tgz";
+      sha1 = "d4ed2bc1d7f88daf8d0f763b3e3e39a69bd37880";
     };
     deps = {
       "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
@@ -2738,8 +2735,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-my-json-valid"."^2.12.3" =
-    self.by-version."is-my-json-valid"."2.12.3";
+  by-spec."is-my-json-valid"."^2.12.4" =
+    self.by-version."is-my-json-valid"."2.12.4";
   by-spec."is-property"."^1.0.0" =
     self.by-version."is-property"."1.0.2";
   by-version."is-property"."1.0.2" = self.buildNodePackage {
@@ -3012,7 +3009,7 @@
     deps = {
       "base64url-0.0.6" = self.by-version."base64url"."0.0.6";
       "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1";
-      "ecdsa-sig-formatter-1.0.2" = self.by-version."ecdsa-sig-formatter"."1.0.2";
+      "ecdsa-sig-formatter-1.0.5" = self.by-version."ecdsa-sig-formatter"."1.0.5";
     };
     optionalDependencies = {
     };
@@ -3021,15 +3018,15 @@
     cpu = [ ];
   };
   by-spec."jws"."3.x.x" =
-    self.by-version."jws"."3.1.0";
-  by-version."jws"."3.1.0" = self.buildNodePackage {
-    name = "jws-3.1.0";
-    version = "3.1.0";
+    self.by-version."jws"."3.1.1";
+  by-version."jws"."3.1.1" = self.buildNodePackage {
+    name = "jws-3.1.1";
+    version = "3.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jws/-/jws-3.1.0.tgz";
-      name = "jws-3.1.0.tgz";
-      sha1 = "885a89127d24119a2a93f234ddd492337a7c85a0";
+      url = "http://registry.npmjs.org/jws/-/jws-3.1.1.tgz";
+      name = "jws-3.1.1.tgz";
+      sha1 = "34f5a424e628af4551121e860ba279f55cfa6629";
     };
     deps = {
       "base64url-1.0.5" = self.by-version."base64url"."1.0.5";
@@ -3081,6 +3078,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lru-cache"."^2.6.5" =
+    self.by-version."lru-cache"."2.7.3";
+  by-version."lru-cache"."2.7.3" = self.buildNodePackage {
+    name = "lru-cache-2.7.3";
+    version = "2.7.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
+      name = "lru-cache-2.7.3.tgz";
+      sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."map-obj"."^1.0.0" =
     self.by-version."map-obj"."1.0.1";
   by-version."map-obj"."1.0.1" = self.buildNodePackage {
@@ -3264,25 +3280,6 @@
     self.by-version."mime-types"."2.0.14";
   by-spec."mime-types"."~2.1.7" =
     self.by-version."mime-types"."2.1.9";
-  by-spec."minimalistic-assert"."^1.0.0" =
-    self.by-version."minimalistic-assert"."1.0.0";
-  by-version."minimalistic-assert"."1.0.0" = self.buildNodePackage {
-    name = "minimalistic-assert-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
-      name = "minimalistic-assert-1.0.0.tgz";
-      sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."minimist"."^1.1.0" =
     self.by-version."minimist"."1.2.0";
   by-version."minimist"."1.2.0" = self.buildNodePackage {
@@ -3322,15 +3319,15 @@
     cpu = [ ];
   };
   by-spec."moment"."^2.6.0" =
-    self.by-version."moment"."2.11.1";
-  by-version."moment"."2.11.1" = self.buildNodePackage {
-    name = "moment-2.11.1";
-    version = "2.11.1";
+    self.by-version."moment"."2.11.2";
+  by-version."moment"."2.11.2" = self.buildNodePackage {
+    name = "moment-2.11.2";
+    version = "2.11.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/moment/-/moment-2.11.1.tgz";
-      name = "moment-2.11.1.tgz";
-      sha1 = "bf4026413640d1b802467cf353607f8464d6af47";
+      url = "http://registry.npmjs.org/moment/-/moment-2.11.2.tgz";
+      name = "moment-2.11.2.tgz";
+      sha1 = "87968e5f95ac038c2e42ac959c75819cd3f52901";
     };
     deps = {
     };
@@ -3340,25 +3337,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ms-rest"."1.2.0" =
-    self.by-version."ms-rest"."1.2.0";
-  by-version."ms-rest"."1.2.0" = self.buildNodePackage {
-    name = "ms-rest-1.2.0";
-    version = "1.2.0";
+  by-spec."ms-rest"."^1.8.0" =
+    self.by-version."ms-rest"."1.9.0";
+  by-version."ms-rest"."1.9.0" = self.buildNodePackage {
+    name = "ms-rest-1.9.0";
+    version = "1.9.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ms-rest/-/ms-rest-1.2.0.tgz";
-      name = "ms-rest-1.2.0.tgz";
-      sha1 = "269ad1efe28c3ab92bd3db46c6eefd8740946380";
+      url = "http://registry.npmjs.org/ms-rest/-/ms-rest-1.9.0.tgz";
+      name = "ms-rest-1.9.0.tgz";
+      sha1 = "12b20c5477874c1ec09133b5fa77ea4bb67824ce";
     };
     deps = {
-      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
-      "tunnel-0.0.3" = self.by-version."tunnel"."0.0.3";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+      "tunnel-0.0.4" = self.by-version."tunnel"."0.0.4";
       "request-2.52.0" = self.by-version."request"."2.52.0";
       "validator-3.1.0" = self.by-version."validator"."3.1.0";
       "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
       "through-2.3.8" = self.by-version."through"."2.3.8";
       "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
+      "moment-2.11.2" = self.by-version."moment"."2.11.2";
     };
     optionalDependencies = {
     };
@@ -3366,22 +3364,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ms-rest-azure"."1.2.0" =
-    self.by-version."ms-rest-azure"."1.2.0";
-  by-version."ms-rest-azure"."1.2.0" = self.buildNodePackage {
-    name = "ms-rest-azure-1.2.0";
-    version = "1.2.0";
+  by-spec."ms-rest"."^1.9.0" =
+    self.by-version."ms-rest"."1.9.0";
+  by-spec."ms-rest-azure"."^1.8.0" =
+    self.by-version."ms-rest-azure"."1.9.0";
+  by-version."ms-rest-azure"."1.9.0" = self.buildNodePackage {
+    name = "ms-rest-azure-1.9.0";
+    version = "1.9.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.2.0.tgz";
-      name = "ms-rest-azure-1.2.0.tgz";
-      sha1 = "5a9e137963d5c7d28f188aa93e5df2e8bc44ca9b";
+      url = "http://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.9.0.tgz";
+      name = "ms-rest-azure-1.9.0.tgz";
+      sha1 = "b172ac72f890ac31511e9c68899f4aa4d50c5bd1";
     };
     deps = {
       "async-0.2.7" = self.by-version."async"."0.2.7";
       "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
       "adal-node-0.1.16" = self.by-version."adal-node"."0.1.16";
-      "ms-rest-1.2.0" = self.by-version."ms-rest"."1.2.0";
+      "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+      "moment-2.11.2" = self.by-version."moment"."2.11.2";
     };
     optionalDependencies = {
     };
@@ -3531,15 +3533,15 @@
     cpu = [ ];
   };
   by-spec."oauth-sign"."~0.8.0" =
-    self.by-version."oauth-sign"."0.8.0";
-  by-version."oauth-sign"."0.8.0" = self.buildNodePackage {
-    name = "oauth-sign-0.8.0";
-    version = "0.8.0";
+    self.by-version."oauth-sign"."0.8.1";
+  by-version."oauth-sign"."0.8.1" = self.buildNodePackage {
+    name = "oauth-sign-0.8.1";
+    version = "0.8.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz";
-      name = "oauth-sign-0.8.0.tgz";
-      sha1 = "938fdc875765ba527137d8aec9d178e24debc553";
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz";
+      name = "oauth-sign-0.8.1.tgz";
+      sha1 = "182439bdb91378bf7460e75c64ea43e6448def06";
     };
     deps = {
     };
@@ -3648,15 +3650,15 @@
     cpu = [ ];
   };
   by-spec."pinkie"."^2.0.0" =
-    self.by-version."pinkie"."2.0.1";
-  by-version."pinkie"."2.0.1" = self.buildNodePackage {
-    name = "pinkie-2.0.1";
-    version = "2.0.1";
+    self.by-version."pinkie"."2.0.4";
+  by-version."pinkie"."2.0.4" = self.buildNodePackage {
+    name = "pinkie-2.0.4";
+    version = "2.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz";
-      name = "pinkie-2.0.1.tgz";
-      sha1 = "4236c86fc29f261c2045bbe81f78cbb2a5e8306c";
+      url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+      name = "pinkie-2.0.4.tgz";
+      sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
     };
     deps = {
     };
@@ -3678,7 +3680,7 @@
       sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259";
     };
     deps = {
-      "pinkie-2.0.1" = self.by-version."pinkie"."2.0.1";
+      "pinkie-2.0.4" = self.by-version."pinkie"."2.0.4";
     };
     optionalDependencies = {
     };
@@ -3800,16 +3802,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs"."~5.2.0" =
-    self.by-version."qs"."5.2.0";
-  by-version."qs"."5.2.0" = self.buildNodePackage {
-    name = "qs-5.2.0";
-    version = "5.2.0";
+  by-spec."qs"."~6.0.2" =
+    self.by-version."qs"."6.0.2";
+  by-version."qs"."6.0.2" = self.buildNodePackage {
+    name = "qs-6.0.2";
+    version = "6.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-5.2.0.tgz";
-      name = "qs-5.2.0.tgz";
-      sha1 = "a9f31142af468cb72b25b30136ba2456834916be";
+      url = "http://registry.npmjs.org/qs/-/qs-6.0.2.tgz";
+      name = "qs-6.0.2.tgz";
+      sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
     };
     deps = {
     };
@@ -3892,6 +3894,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."readable-stream"."~2.0.5" =
+    self.by-version."readable-stream"."2.0.5";
   by-spec."repeating"."^1.1.0" =
     self.by-version."repeating"."1.1.3";
   by-version."repeating"."1.1.3" = self.buildNodePackage {
@@ -3924,7 +3928,7 @@
       sha1 = "29d713a0a07f17fb2e7b61815d2010681718e93c";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "bl-0.9.5" = self.by-version."bl"."0.9.5";
       "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "qs-1.2.2" = self.by-version."qs"."1.2.2";
@@ -3958,7 +3962,7 @@
       sha1 = "02d82a8adc04dc94a3a79f09fc850ade9aa21e74";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "bl-0.9.5" = self.by-version."bl"."0.9.5";
       "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
@@ -4002,37 +4006,38 @@
     cpu = [ ];
   };
   by-spec."request".">= 2.52.0" =
-    self.by-version."request"."2.67.0";
-  by-version."request"."2.67.0" = self.buildNodePackage {
-    name = "request-2.67.0";
-    version = "2.67.0";
+    self.by-version."request"."2.69.0";
+  by-version."request"."2.69.0" = self.buildNodePackage {
+    name = "request-2.69.0";
+    version = "2.69.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.67.0.tgz";
-      name = "request-2.67.0.tgz";
-      sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742";
+      url = "http://registry.npmjs.org/request/-/request-2.69.0.tgz";
+      name = "request-2.69.0.tgz";
+      sha1 = "cf91d2e000752b1217155c005241911991a2346a";
     };
     deps = {
-      "bl-1.0.0" = self.by-version."bl"."1.0.0";
+      "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
+      "aws4-1.2.1" = self.by-version."aws4"."1.2.1";
+      "bl-1.0.2" = self.by-version."bl"."1.0.2";
       "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
       "extend-3.0.0" = self.by-version."extend"."3.0.0";
       "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
       "form-data-1.0.0-rc3" = self.by-version."form-data"."1.0.0-rc3";
+      "har-validator-2.0.6" = self.by-version."har-validator"."2.0.6";
+      "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
+      "http-signature-1.1.1" = self.by-version."http-signature"."1.1.1";
+      "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
       "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
       "mime-types-2.1.9" = self.by-version."mime-types"."2.1.9";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
-      "qs-5.2.0" = self.by-version."qs"."5.2.0";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
-      "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
-      "http-signature-1.1.0" = self.by-version."http-signature"."1.1.0";
-      "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0";
-      "hawk-3.1.2" = self.by-version."hawk"."3.1.2";
-      "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
+      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "qs-6.0.2" = self.by-version."qs"."6.0.2";
       "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
-      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
-      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-      "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0";
-      "har-validator-2.0.3" = self.by-version."har-validator"."2.0.3";
+      "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
     };
     optionalDependencies = {
     };
@@ -4041,7 +4046,7 @@
     cpu = [ ];
   };
   by-spec."request".">= 2.9.203" =
-    self.by-version."request"."2.67.0";
+    self.by-version."request"."2.69.0";
   by-spec."request"."~2.57.0" =
     self.by-version."request"."2.57.0";
   by-version."request"."2.57.0" = self.buildNodePackage {
@@ -4054,7 +4059,7 @@
       sha1 = "d445105a42d009b9d724289633b449a6d723d989";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "bl-0.9.5" = self.by-version."bl"."0.9.5";
       "caseless-0.10.0" = self.by-version."caseless"."0.10.0";
       "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
@@ -4065,7 +4070,7 @@
       "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
       "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
       "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
-      "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0";
+      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
       "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
       "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
@@ -4099,15 +4104,15 @@
     cpu = [ ];
   };
   by-spec."sax".">=0.1.1" =
-    self.by-version."sax"."1.1.4";
-  by-version."sax"."1.1.4" = self.buildNodePackage {
-    name = "sax-1.1.4";
-    version = "1.1.4";
+    self.by-version."sax"."1.1.5";
+  by-version."sax"."1.1.5" = self.buildNodePackage {
+    name = "sax-1.1.5";
+    version = "1.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sax/-/sax-1.1.4.tgz";
-      name = "sax-1.1.4.tgz";
-      sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9";
+      url = "http://registry.npmjs.org/sax/-/sax-1.1.5.tgz";
+      name = "sax-1.1.5.tgz";
+      sha1 = "1da50a8d00cdecd59405659f5ff85349fe773743";
     };
     deps = {
     };
@@ -4219,20 +4224,20 @@
     cpu = [ ];
   };
   by-spec."sshpk"."^1.7.0" =
-    self.by-version."sshpk"."1.7.2";
-  by-version."sshpk"."1.7.2" = self.buildNodePackage {
-    name = "sshpk-1.7.2";
-    version = "1.7.2";
+    self.by-version."sshpk"."1.7.3";
+  by-version."sshpk"."1.7.3" = self.buildNodePackage {
+    name = "sshpk-1.7.3";
+    version = "1.7.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.2.tgz";
-      name = "sshpk-1.7.2.tgz";
-      sha1 = "e5eb43d0662bd201037327edb8b8f64656aca842";
+      url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.3.tgz";
+      name = "sshpk-1.7.3.tgz";
+      sha1 = "caa8ef95e30765d856698b7025f9f211ab65962f";
     };
     deps = {
       "asn1-0.2.3" = self.by-version."asn1"."0.2.3";
       "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
-      "dashdash-1.12.1" = self.by-version."dashdash"."1.12.1";
+      "dashdash-1.12.2" = self.by-version."dashdash"."1.12.2";
     };
     optionalDependencies = {
       "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
@@ -4547,15 +4552,15 @@
     cpu = [ ];
   };
   by-spec."tunnel"."~0.0.2" =
-    self.by-version."tunnel"."0.0.3";
-  by-version."tunnel"."0.0.3" = self.buildNodePackage {
-    name = "tunnel-0.0.3";
-    version = "0.0.3";
+    self.by-version."tunnel"."0.0.4";
+  by-version."tunnel"."0.0.4" = self.buildNodePackage {
+    name = "tunnel-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tunnel/-/tunnel-0.0.3.tgz";
-      name = "tunnel-0.0.3.tgz";
-      sha1 = "e8f988115ca7be9d076c7a1fae4788be708f0cf1";
+      url = "http://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz";
+      name = "tunnel-0.0.4.tgz";
+      sha1 = "2d3785a158c174c9a16dc2c046ec5fc5f1742213";
     };
     deps = {
     };
@@ -4681,6 +4686,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."underscore"."^1.4.0" =
+    self.by-version."underscore"."1.8.3";
   by-spec."underscore"."~1.4.4" =
     self.by-version."underscore"."1.4.4";
   by-spec."util-deprecate"."~1.0.1" =
@@ -4856,7 +4863,7 @@
       sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c";
     };
     deps = {
-      "sax-1.1.4" = self.by-version."sax"."1.1.4";
+      "sax-1.1.5" = self.by-version."sax"."1.1.5";
     };
     optionalDependencies = {
     };
@@ -4906,15 +4913,15 @@
   by-spec."xmlbuilder"."0.4.x" =
     self.by-version."xmlbuilder"."0.4.3";
   by-spec."xmldom".">= 0.1.x" =
-    self.by-version."xmldom"."0.1.20";
-  by-version."xmldom"."0.1.20" = self.buildNodePackage {
-    name = "xmldom-0.1.20";
-    version = "0.1.20";
+    self.by-version."xmldom"."0.1.22";
+  by-version."xmldom"."0.1.22" = self.buildNodePackage {
+    name = "xmldom-0.1.22";
+    version = "0.1.22";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.20.tgz";
-      name = "xmldom-0.1.20.tgz";
-      sha1 = "a70b6d9035a8b16f89727d4f0dddeba0f4077892";
+      url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
+      name = "xmldom-0.1.22.tgz";
+      sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
     };
     deps = {
     };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 393eb4b37c883..f093dc1063380 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -571,6 +571,8 @@ let
 
   artyFX = callPackage ../applications/audio/artyFX {};
 
+  as31 = callPackage ../development/compilers/as31 {};
+
   ascii = callPackage ../tools/text/ascii { };
 
   asciinema = goPackages.asciinema.bin // { outputs = [ "bin" ]; };
@@ -671,6 +673,8 @@ let
 
   azureus = callPackage ../tools/networking/p2p/azureus { };
 
+  backblaze-b2 = callPackage ../development/tools/backblaze-b2 { };
+
   backup = callPackage ../tools/backup/backup { };
 
   basex = callPackage ../tools/text/xml/basex { };
@@ -697,6 +701,8 @@ let
 
   bibtool = callPackage ../tools/misc/bibtool { };
 
+  bibutils = callPackage ../tools/misc/bibutils { };
+
   bindfs = callPackage ../tools/filesystems/bindfs { };
 
   binwalk = callPackage ../tools/misc/binwalk {
@@ -792,6 +798,8 @@ let
 
   cli53 = callPackage ../tools/admin/cli53 { };
 
+  cli-visualizer = callPackage ../applications/misc/cli-visualizer { };
+
   cloud-init = callPackage ../tools/virtualization/cloud-init { };
 
   clib = callPackage ../tools/package-management/clib { };
@@ -889,6 +897,8 @@ let
 
   heatseeker = callPackage ../tools/misc/heatseeker { };
 
+  interlock = goPackages.interlock.bin // { outputs = [ "bin" ]; };
+
   mathics = pythonPackages.mathics;
 
   mcrl = callPackage ../tools/misc/mcrl { };
@@ -986,6 +996,8 @@ let
 
   bareos = callPackage ../tools/backup/bareos { };
 
+  bats = callPackage ../development/interpreters/bats { };
+
   beanstalkd = callPackage ../servers/beanstalkd { };
 
   beets = callPackage ../tools/audio/beets { };
@@ -1083,6 +1095,12 @@ let
 
   chunksync = callPackage ../tools/backup/chunksync { };
 
+  cipherscan = callPackage ../tools/security/cipherscan {
+    openssl = if stdenv.system == "x86_64-linux"
+      then openssl-chacha
+      else openssl;
+  };
+
   cjdns = callPackage ../tools/networking/cjdns { };
 
   cksfv = callPackage ../tools/networking/cksfv { };
@@ -1140,6 +1158,10 @@ let
 
   anthy = callPackage ../tools/inputmethods/anthy { };
 
+  m17n_db = callPackage ../tools/inputmethods/m17n-db { };
+
+  m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };
+
   mozc = callPackage ../tools/inputmethods/mozc {
     inherit (pythonPackages) gyp;
   };
@@ -1423,6 +1445,7 @@ let
   evemu = callPackage ../tools/system/evemu { };
 
   elasticsearch = callPackage ../servers/search/elasticsearch { };
+  elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { };
 
   elasticsearchPlugins = recurseIntoAttrs (
     callPackage ../servers/search/elasticsearch/plugins.nix { }
@@ -1666,7 +1689,7 @@ let
 
   gnaural = callPackage ../applications/audio/gnaural { };
 
-  gnokii = builderDefsPackage (callPackage ../tools/misc/gnokii) { };
+  gnokii = callPackage ../tools/misc/gnokii { };
 
   gnuapl = callPackage ../development/interpreters/gnu-apl { };
 
@@ -2141,7 +2164,7 @@ let
 
   nodePackages_5_x = callPackage ./node-packages.nix { self = nodePackages_5_x; nodejs = nodejs-5_x; };
 
-  nodePackages_4_x = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_x; nodejs = nodejs-4_x; });
+  nodePackages_4_x = callPackage ./node-packages.nix { self = nodePackages_4_x; nodejs = nodejs-4_x; };
 
   nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; };
 
@@ -2176,6 +2199,8 @@ let
 
   liboauth = callPackage ../development/libraries/liboauth { };
 
+  libsrs2 = callPackage ../development/libraries/libsrs2 { };
+
   libtermkey = callPackage ../development/libraries/libtermkey { };
 
   libtirpc = callPackage ../development/libraries/ti-rpc { };
@@ -2220,6 +2245,8 @@ let
 
   lout = callPackage ../tools/typesetting/lout { };
 
+  lr = callPackage ../tools/system/lr { };
+
   lrzip = callPackage ../tools/compression/lrzip { };
 
   # lsh installs `bin/nettle-lfib-stream' and so does Nettle.  Give the
@@ -2257,6 +2284,8 @@ let
     guile = guile_1_8;
   };
 
+  email = callPackage ../tools/networking/email { };
+
   maim = callPackage ../tools/graphics/maim {};
 
   mairix = callPackage ../tools/text/mairix { };
@@ -2317,6 +2346,8 @@ let
 
   miniupnpd = callPackage ../tools/networking/miniupnpd { };
 
+  miniball = callPackage ../development/libraries/miniball { };
+
   minixml = callPackage ../development/libraries/minixml { };
 
   mjpegtools = callPackage ../tools/video/mjpegtools { };
@@ -2497,6 +2528,8 @@ let
     pythonPackages = python3Packages;
   };
 
+  nq = callPackage ../tools/system/nq { };
+
   nsjail = callPackage ../tools/security/nsjail {};
 
   nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {};
@@ -2820,6 +2853,8 @@ let
 
   ponysay = callPackage ../tools/misc/ponysay { };
 
+  popfile = callPackage ../tools/text/popfile { };
+
   povray = callPackage ../tools/graphics/povray {
     automake = automake113x; # fails with 14
   };
@@ -2874,7 +2909,7 @@ let
 
   pythonIRClib = pythonPackages.pythonIRClib;
 
-  pythonSexy = builderDefsPackage (callPackage ../development/python-modules/libsexy) { };
+  pythonSexy = callPackage ../development/python-modules/libsexy { };
 
   pytrainer = callPackage ../applications/misc/pytrainer { };
 
@@ -2918,6 +2953,8 @@ let
 
   ranger = callPackage ../applications/misc/ranger { };
 
+  rarcrack = callPackage ../tools/security/rarcrack { };
+
   rawdog = callPackage ../applications/networking/feedreaders/rawdog { };
 
   read-edid = callPackage ../os-specific/linux/read-edid { };
@@ -3137,6 +3174,10 @@ let
 
   solvespace = callPackage ../applications/graphics/solvespace { };
 
+  sonata = callPackage ../applications/audio/sonata {
+    inherit (python3Packages) buildPythonPackage python isPy3k dbus pygobject3 mpd2;
+  };
+
   sparsehash = callPackage ../development/libraries/sparsehash { };
 
   spiped = callPackage ../tools/networking/spiped { };
@@ -3179,6 +3220,8 @@ let
 
   sundtek = callPackage ../misc/drivers/sundtek { };
 
+  sunxi-tools = callPackage ../development/tools/sunxi-tools { };
+
   super = callPackage ../tools/security/super { };
 
   supertux-editor = callPackage ../applications/editors/supertux-editor { };
@@ -3290,6 +3333,8 @@ let
 
   tiled = qt5.callPackage ../applications/editors/tiled { };
 
+  timemachine = callPackage ../applications/audio/timemachine { };
+
   tinc = callPackage ../tools/networking/tinc { };
 
   tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };
@@ -3486,6 +3531,8 @@ let
 
   xl2tpd = callPackage ../tools/networking/xl2tpd { };
 
+  xe = callPackage ../tools/system/xe { };
+
   testdisk = callPackage ../tools/misc/testdisk { };
 
   html2text = callPackage ../tools/text/html2text { };
@@ -3609,6 +3656,8 @@ let
 
   volumeicon = callPackage ../tools/audio/volumeicon { };
 
+  waf = callPackage ../development/tools/build-managers/waf { };
+
   wakelan = callPackage ../tools/networking/wakelan { };
 
   wavemon = callPackage ../tools/networking/wavemon { };
@@ -3619,8 +3668,6 @@ let
 
   webalizer = callPackage ../tools/networking/webalizer { };
 
-  webdruid = builderDefsPackage (callPackage ../tools/admin/webdruid) {};
-
   weighttp = callPackage ../tools/networking/weighttp { };
 
   wget = callPackage ../tools/networking/wget {
@@ -4162,7 +4209,7 @@ let
 
   ghdl_mcode = callPackage ../development/compilers/ghdl { };
 
-  gcl = builderDefsPackage (callPackage ../development/compilers/gcl) {
+  gcl = callPackage ../development/compilers/gcl {
     gmp = gmp4;
   };
 
@@ -5087,7 +5134,7 @@ let
 
   ### DEVELOPMENT / INTERPRETERS
 
-  acl2 = builderDefsPackage (callPackage ../development/interpreters/acl2) {
+  acl2 = callPackage ../development/interpreters/acl2 {
     sbcl = sbcl_1_2_0;
   };
 
@@ -5279,7 +5326,6 @@ let
   });
 
   inherit (callPackages ../development/interpreters/php { })
-    php54
     php55
     php56
     php70;
@@ -5382,14 +5428,16 @@ let
     ruby_1_9_3
     ruby_2_0_0
     ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6 ruby_2_1_7
-    ruby_2_2_0 ruby_2_2_2 ruby_2_2_3;
+    ruby_2_2_0 ruby_2_2_2 ruby_2_2_3
+    ruby_2_3_0;
 
   # Ruby aliases
-  ruby = ruby_2_2;
+  ruby = ruby_2_3;
   ruby_1_9 = ruby_1_9_3;
   ruby_2_0 = ruby_2_0_0;
   ruby_2_1 = ruby_2_1_7;
   ruby_2_2 = ruby_2_2_3;
+  ruby_2_3 = ruby_2_3_0;
 
   rubygems = hiPrio (callPackage ../development/interpreters/ruby/rubygems.nix {});
 
@@ -5922,6 +5970,8 @@ let
     };
   };
 
+  nant = callPackage ../development/tools/build-managers/nant { };
+
   ninja = callPackage ../development/tools/build-managers/ninja { };
 
   nixbang = callPackage ../development/tools/misc/nixbang {
@@ -6336,6 +6386,8 @@ let
 
   cminpack = callPackage ../development/libraries/cminpack { };
 
+  cmocka = callPackage ../development/libraries/cmocka { };
+
   cogl = callPackage ../development/libraries/cogl { };
 
   cogl_1_20 = callPackage ../development/libraries/cogl/1.20.nix { };
@@ -7046,6 +7098,7 @@ let
 
   libao = callPackage ../development/libraries/libao {
     usePulseAudio = config.pulseaudio or true;
+    inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit;
   };
 
   libabw = callPackage ../development/libraries/libabw { };
@@ -7151,6 +7204,8 @@ let
 
   libcue = callPackage ../development/libraries/libcue { };
 
+  libcutl = callPackage ../development/libraries/libcutl { };
+
   libdaemon = callPackage ../development/libraries/libdaemon { };
 
   libdbi = callPackage ../development/libraries/libdbi { };
@@ -8021,6 +8076,8 @@ let
     nix = pkgs.nixUnstable;
   };
 
+  nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
+
   non = callPackage ../applications/audio/non { };
 
   nspr = callPackage ../development/libraries/nspr { };
@@ -8044,9 +8101,7 @@ let
 
   oniguruma = callPackage ../development/libraries/oniguruma { };
 
-  # openalSoft is 100% ABI compatible to openalLegacy and should be a default
   openal = openalSoft;
-  openalLegacy = callPackage ../development/libraries/openal { };
   openalSoft = callPackage ../development/libraries/openal-soft { };
 
   openbabel = callPackage ../development/libraries/openbabel { };
@@ -8130,6 +8185,13 @@ let
     };
   };
 
+  openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix {
+    cryptodevHeaders = linuxPackages.cryptodev.override {
+      fetchurl = fetchurlBoot;
+      onlyHeaders = true;
+    };
+  };
+
   opensubdiv = callPackage ../development/libraries/opensubdiv { };
 
   openwsman = callPackage ../development/libraries/openwsman {};
@@ -9007,23 +9069,23 @@ let
 
   ### DEVELOPMENT / GO MODULES
 
-  go14Packages = recurseIntoAttrs (callPackage ./go-packages.nix {
+  go14Packages = callPackage ./go-packages.nix {
     go = go_1_4;
     buildGoPackage = callPackage ../development/go-modules/generic {
       go = go_1_4;
       govers = go14Packages.govers.bin;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
-  });
+  };
 
-  go15Packages = recurseIntoAttrs (callPackage ./go-packages.nix {
+  go15Packages = callPackage ./go-packages.nix {
     go = go_1_5;
     buildGoPackage = callPackage ../development/go-modules/generic {
       go = go_1_5;
       govers = go15Packages.govers.bin;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
-  });
+  };
 
   goPackages = go15Packages;
 
@@ -9097,20 +9159,20 @@ let
     self = python33Packages;
   };
 
-  python34Packages = recurseIntoAttrs (callPackage ./python-packages.nix {
+  python34Packages = callPackage ./python-packages.nix {
     python = python34;
     self = python34Packages;
-  });
+  };
 
   python35Packages = recurseIntoAttrs (callPackage ./python-packages.nix {
     python = python35;
     self = python35Packages;
   });
 
-  pypyPackages = recurseIntoAttrs (callPackage ./python-packages.nix {
+  pypyPackages = callPackage ./python-packages.nix {
     python = pypy;
     self = pypyPackages;
-  });
+  };
 
   bsddb3 = pythonPackages.bsddb3;
 
@@ -9348,6 +9410,8 @@ let
 
   groovebasin = callPackage ../applications/audio/groovebasin { };
 
+  haka = callPackage ../tools/security/haka { };
+
   heapster = (callPackage ../servers/monitoring/heapster { }).bin // { outputs = ["bin"]; };
 
   hbase = callPackage ../servers/hbase {};
@@ -9430,6 +9494,8 @@ let
 
   nsq = goPackages.nsq.bin // { outputs = [ "bin" ]; };
 
+  oauth2_proxy = goPackages.oauth2_proxy.bin // { outputs = [ "bin" ]; };
+
   openpts = callPackage ../servers/openpts { };
 
   openresty = callPackage ../servers/http/openresty { };
@@ -9460,6 +9526,8 @@ let
 
   rspamd = callPackage ../servers/mail/rspamd { };
 
+  pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { };
+
   pshs = callPackage ../servers/http/pshs { };
 
   libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; };
@@ -9559,10 +9627,9 @@ let
     libmemcached = null; # Detection is broken upstream
   };
 
-  postgresql = postgresql94;
+  postgresql = postgresql95;
 
   inherit (callPackages ../servers/sql/postgresql { })
-    postgresql90
     postgresql91
     postgresql92
     postgresql93
@@ -9588,14 +9655,16 @@ let
 
   pumpio = callPackage ../servers/web-apps/pump.io { };
 
-  pyIRCt = builderDefsPackage (callPackage ../servers/xmpp/pyIRCt) {};
+  pyIRCt = callPackage ../servers/xmpp/pyIRCt {};
 
-  pyMAILt = builderDefsPackage (callPackage ../servers/xmpp/pyMAILt) {};
+  pyMAILt = callPackage ../servers/xmpp/pyMAILt {};
 
   qpid-cpp = callPackage ../servers/amqp/qpid-cpp {
     boost = boost155;
   };
 
+  quagga = callPackage ../servers/quagga { };
+
   rabbitmq_server = callPackage ../servers/amqp/rabbitmq-server {
     inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
   };
@@ -9961,6 +10030,8 @@ let
 
   eject = utillinux;
 
+  facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { };
+
   fanctl = callPackage ../os-specific/linux/fanctl {
     iproute = iproute.override { enableFan = true; };
   };
@@ -10284,6 +10355,8 @@ let
 
     openafsClient = callPackage ../servers/openafs-client { };
 
+    facetimehd = callPackage ../os-specific/linux/facetimehd { };
+
     kernelHeaders = callPackage ../os-specific/linux/kernel-headers { };
 
     klibc = callPackage ../os-specific/linux/klibc { };
@@ -10845,7 +10918,7 @@ let
 
   anonymousPro = callPackage ../data/fonts/anonymous-pro { };
 
-  arkpandora_ttf = builderDefsPackage (callPackage ../data/fonts/arkpandora) { };
+  arkpandora_ttf = callPackage ../data/fonts/arkpandora { };
 
   aurulent-sans = callPackage ../data/fonts/aurulent-sans { };
 
@@ -10975,7 +11048,7 @@ let
   liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { };
   liberation_ttf = liberation_ttf_binary;
 
-  libertine = builderDefsPackage (callPackage ../data/fonts/libertine) { };
+  libertine = callPackage ../data/fonts/libertine { };
 
   lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {};
 
@@ -11366,11 +11439,6 @@ let
 
   carddav-util = callPackage ../tools/networking/carddav-util { };
 
-  carrier = builderDefsPackage (callPackage ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
-    inherit (gnome) startupnotification GConf ;
-  };
-  funpidgin = carrier;
-
   cava = callPackage ../applications/audio/cava { };
 
   cbatticon = callPackage ../applications/misc/cbatticon { };
@@ -11480,7 +11548,7 @@ let
     liblapack = liblapackWithoutAtlas;
   };
 
-  cuneiform = builderDefsPackage (callPackage ../tools/graphics/cuneiform) {};
+  cuneiform = callPackage ../tools/graphics/cuneiform {};
 
   cutecom = callPackage ../tools/misc/cutecom { };
 
@@ -11516,6 +11584,7 @@ let
 
   darktable = callPackage ../applications/graphics/darktable {
     inherit (gnome) GConf libglade;
+    pugixml = pugixml.override { shared = true; };
   };
 
   das_watchdog = callPackage ../tools/system/das_watchdog { };
@@ -11557,6 +11626,8 @@ let
 
   dmenu = callPackage ../applications/misc/dmenu { };
 
+  dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { };
+
   dmenu2 = callPackage ../applications/misc/dmenu2 { };
 
   dmtx = dmtx-utils;
@@ -11603,6 +11674,8 @@ let
 
   electrum = callPackage ../applications/misc/electrum { };
 
+  electrum-dash = callPackage ../applications/misc/electrum-dash { };
+
   elinks = callPackage ../applications/networking/browsers/elinks { };
 
   elvis = callPackage ../applications/editors/elvis { };
@@ -11807,7 +11880,7 @@ let
     cask = callPackage ../applications/editors/emacs-modes/cask { };
   };
 
-  emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages);
+  emacs24Packages = emacsPackagesGen emacs24 pkgs.emacs24Packages;
 
   emacsPackagesNgGen = emacs: import ./emacs-packages.nix {
     overrides = (config.emacsPackageOverrides or (p: {})) pkgs;
@@ -11815,6 +11888,7 @@ let
     inherit lib newScope stdenv;
     inherit fetchFromGitHub fetchgit fetchhg fetchurl;
     inherit emacs texinfo makeWrapper;
+    inherit (xorg) lndir;
 
     trivialBuild = callPackage ../build-support/emacs/trivial.nix {
       inherit emacs;
@@ -11825,7 +11899,7 @@ let
     };
 
     external = {
-      inherit (haskellPackages) ghc-mod structured-haskell-mode Agda;
+      inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent;
       inherit (pythonPackages) elpy;
       inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig;
     };
@@ -12192,6 +12266,8 @@ let
     inherit (gnome) GConf;
   };
 
+  gollum = callPackage ../applications/misc/gollum { };
+
   google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome.GConf; };
 
   googleearth = callPackage_i686 ../applications/misc/googleearth { };
@@ -12272,6 +12348,14 @@ let
 
   spectrwm = callPackage ../applications/window-managers/spectrwm { };
 
+  wlc = callPackage ../development/libraries/wlc { };
+  orbment = callPackage ../applications/window-managers/orbment { };
+  sway = callPackage ../applications/window-managers/sway { };
+
+  swc = callPackage ../development/libraries/swc { };
+  wld = callPackage ../development/libraries/wld { };
+  velox = callPackage ../applications/window-managers/velox { };
+
   i3 = callPackage ../applications/window-managers/i3 {
     xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
   };
@@ -12517,8 +12601,6 @@ let
     inherit (gnome) libglade;
   };
 
-  links = callPackage ../applications/networking/browsers/links { };
-
   ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { };
   ledger3 = callPackage ../applications/office/ledger {
     boost = boost155;
@@ -12601,7 +12683,7 @@ let
     guiSupport = false; # use mercurialFull to get hgk GUI
   };
 
-  mercurialFull = appendToName "full" (pkgs.mercurial.override { inherit (pythonPackages) hg-crecord; guiSupport = true; });
+  mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
 
   merkaartor = callPackage ../applications/misc/merkaartor { };
 
@@ -12661,9 +12743,9 @@ let
     lua = lua5;
   };
 
-  monotoneViz = builderDefsPackage (callPackage ../applications/version-management/monotone-viz/mtn-head.nix) {
-    inherit (ocamlPackages_4_01_0) lablgtk ocaml;
-    inherit (gnome) libgnomecanvas;
+  monotoneViz = callPackage ../applications/version-management/monotone-viz {
+    inherit (ocamlPackages_4_01_0) lablgtk ocaml camlp4;
+    inherit (gnome) libgnomecanvas glib;
   };
 
   mopidy = callPackage ../applications/audio/mopidy { };
@@ -12955,6 +13037,8 @@ let
     inherit (gst_all_1) gstreamer gst-plugins-base;
   };
 
+  pflask = callPackage ../os-specific/linux/pflask {};
+
   photoqt = qt5.callPackage ../applications/graphics/photoqt { };
 
   phototonic = qt5.callPackage ../applications/graphics/phototonic { };
@@ -13095,6 +13179,8 @@ let
 
   qtractor = callPackage ../applications/audio/qtractor { };
 
+  qtscrobbler = callPackage ../applications/audio/qtscrobbler { };
+
   quirc = callPackage ../tools/graphics/quirc {};
 
   quodlibet = callPackage ../applications/audio/quodlibet {
@@ -13206,7 +13292,7 @@ let
     boost = boost155;
   };
 
-  sc-im = callPackage ../applications/misc/scim { };
+  sc-im = callPackage ../applications/misc/sc-im { };
 
   scite = callPackage ../applications/editors/scite { };
 
@@ -13268,6 +13354,10 @@ let
     conf = config.st.conf or null;
   };
 
+  st-wayland = callPackage ../applications/misc/st/wayland.nix {
+    conf = config.st.conf or null;
+  };
+
   stag = callPackage ../applications/misc/stag {
     curses = ncurses;
   };
@@ -13434,7 +13524,7 @@ let
       numpy pyasn1 mock zope_interface;
   };
 
-  tailor = builderDefsPackage (callPackage ../applications/version-management/tailor) {};
+  tailor = callPackage ../applications/version-management/tailor {};
 
   tangogps = callPackage ../applications/misc/tangogps {
     gconf = gnome.GConf;
@@ -13597,11 +13687,6 @@ let
 
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
 
-  viewMtn = builderDefsPackage (callPackage ../applications/version-management/viewmtn/0.10.nix)
-  {
-    flup = pythonPackages.flup;
-  };
-
   vim = callPackage ../applications/editors/vim {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };
@@ -14032,6 +14117,8 @@ let
 
   inherit (gnome3) yelp;
 
+  inherit (pythonPackages) youtube-dl;
+
   qgis = callPackage ../applications/gis/qgis {};
 
   qtbitcointrader = callPackage ../applications/misc/qtbitcointrader {
@@ -14053,7 +14140,7 @@ let
   zathuraCollection = recurseIntoAttrs
     (callPackage ../applications/misc/zathura {
         callPackage = newScope pkgs.zathuraCollection;
-        useMupdf = config.zathura.useMupdf or false;
+        useMupdf = config.zathura.useMupdf or true;
       });
 
   zathura = zathuraCollection.zathuraWrapper;
@@ -14104,6 +14191,8 @@ let
 
   armagetronad = callPackage ../games/armagetronad { };
 
+  arx-libertatis = callPackage ../games/arx-libertatis { };
+
   asc = callPackage ../games/asc {
     lua = lua5_1;
     libsigcxx = libsigcxx12;
@@ -14274,15 +14363,13 @@ let
     lua = lua5;
   };
 
-  jamp = builderDefsPackage (callPackage ../games/jamp) {};
-
   klavaro = callPackage ../games/klavaro {};
 
   kobodeluxe = callPackage ../games/kobodeluxe { };
 
   lgogdownloader = callPackage ../games/lgogdownloader { };
 
-  lincity = builderDefsPackage (callPackage ../games/lincity) {};
+  lincity = callPackage ../games/lincity {};
 
   lincity_ng = callPackage ../games/lincity/ng.nix {};
 
@@ -14526,6 +14613,8 @@ let
 
   ut2004demo = callPackage ../games/ut2004demo { };
 
+  vassal = callPackage ../games/vassal { };
+
   vdrift = callPackage ../games/vdrift { };
 
   vectoroids = callPackage ../games/vectoroids { };
@@ -14593,9 +14682,9 @@ let
     serverOnly = true;
   };
 
-  zandronum-bin = callPackage ../games/zandronum/bin.nix { };
+  zandronum-bin = hiPrio (callPackage ../games/zandronum/bin.nix { });
 
-  zangband = builderDefsPackage (callPackage ../games/zangband) {};
+  zangband = callPackage ../games/zangband { };
 
   zdoom = callPackage ../games/zdoom { };
 
@@ -14625,8 +14714,6 @@ let
     inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
   };
 
-  gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { });
-
   gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { });
 
   gnome3 = gnome3_18;
@@ -14970,8 +15057,6 @@ let
 
   mrbayes = callPackage ../applications/science/biology/mrbayes { };
 
-  ncbiCTools = builderDefsPackage (callPackage ../development/libraries/ncbi) {};
-
   ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };
 
   paml = callPackage ../applications/science/biology/paml { };
@@ -14999,8 +15084,6 @@ let
 
   blas = callPackage ../development/libraries/science/math/blas { };
 
-  content = builderDefsPackage (callPackage ../applications/science/math/content) {};
-
   jags = callPackage ../applications/science/math/jags { };
 
 
@@ -15018,10 +15101,12 @@ let
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 
   openblas = callPackage ../development/libraries/science/math/openblas { };
+  openblas_2_14 = callPackage ../development/libraries/science/math/openblas/0.2.14.nix { };
 
   # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with
   # standard BLAS and LAPACK.
   openblasCompat = openblas.override { blas64 = false; };
+  openblasCompat_2_14 = openblas_2_14.override { blas64 = false; };
 
   openlibm = callPackage ../development/libraries/science/math/openlibm {};
 
@@ -15154,8 +15239,8 @@ let
 
   };
 
-  coqPackages = recurseIntoAttrs (mkCoqPackages_8_4 coqPackages);
-  coqPackages_8_5 = recurseIntoAttrs (mkCoqPackages_8_5 coqPackages_8_5);
+  coqPackages = mkCoqPackages_8_4 coqPackages;
+  coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5;
 
   cvc3 = callPackage ../applications/science/logic/cvc3 {
     gmp = lib.overrideDerivation gmp (a: { dontDisableStatic = true; });
@@ -15436,6 +15521,8 @@ let
 
   darcnes = callPackage ../misc/emulators/darcnes { };
 
+  darling-dmg = callPackage ../tools/filesystems/darling-dmg { };
+
   desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome) gtkglext libglade; };
 
   dbacl = callPackage ../tools/misc/dbacl { };
@@ -15464,7 +15551,7 @@ let
 
   faust1 = callPackage ../applications/audio/faust/faust1.nix { };
 
-  faust2 = callPackage ../applications/audio/faust { };
+  faust2 = callPackage ../applications/audio/faust/faust2.nix { };
 
   faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { };
 
@@ -15554,8 +15641,6 @@ let
 
   mupen64plus = callPackage ../misc/emulators/mupen64plus { };
 
-  mupen64plus1_5 = callPackage ../misc/emulators/mupen64plus/1.5.nix { };
-
   inherit (callPackages ../tools/package-management/nix {
       storeDir = config.nix.storeDir or "/nix/store";
       stateDir = config.nix.stateDir or "/nix/var";
@@ -15756,8 +15841,6 @@ let
   texLiveAggregationFun = params:
     builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/aggregate.nix) params;
 
-  texDisser = callPackage ../tools/typesetting/tex/disser {};
-
   texLiveContext = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/context.nix) {};
 
   texLiveExtra = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/extra.nix) {};
@@ -15973,11 +16056,14 @@ aliases = with self; rec {
   jquery_ui = jquery-ui;  # added 2014-09-07
   libdbusmenu_qt5 = qt5.libdbusmenu;  # added 2015-12-19
   libtidy = html-tidy;  # added 2014-12-21
+  links = links2; # added 2016-01-31
   lttngTools = lttng-tools;  # added 2014-07-31
   lttngUst = lttng-ust;  # added 2014-07-31
   midoriWrapper = midori; # added 2015-01
   mlt-qt5 = qt5.mlt;  # added 2015-12-19
   multipath_tools = multipath-tools;  # added 2016-01-21
+  mupen64plus1_5 = mupen64plus; # added 2016-02-12
+  ncat = nmap;  # added 2016-01-26
   nfsUtils = nfs-utils;  # added 2014-12-06
   phonon_qt5 = qt5.phonon;  # added 2015-12-19
   phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer;  # added 2015-12-19
@@ -16002,7 +16088,6 @@ aliases = with self; rec {
   x11 = xlibsWrapper; # added 2015-09
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
   xlibs = xorg; # added 2015-09
-  youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
   youtubeDL = youtube-dl;  # added 2014-10-26
   vimbWrapper = vimb; # added 2015-01
   vimprobable2Wrapper = vimprobable2; # added 2015-01
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index a1c54074622e3..a775630410b80 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -532,10 +532,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
       pkgconfig
     ];
 
-    preConfigure = ''
-      substituteInPlace configure --replace gmcs mcs
-    '';
-
     postInstall = ''
       # Otherwise pkg-config won't find it and the DLL will get duplicated
       ln -sv $out/lib/pkgconfig/ndesk-options.pc $out/lib/pkgconfig/NDesk.Options.pc
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 0bd7b0efad396..ea4a2d4a4291e 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -36,7 +36,7 @@
 
 , lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg
 
-, emacs, texinfo, makeWrapper
+, emacs, texinfo, lndir, makeWrapper
 , trivialBuild
 , melpaBuild
 
@@ -60,7 +60,7 @@ let
   };
 
   emacsWithPackages = import ../build-support/emacs/wrapper.nix {
-    inherit lib makeWrapper stdenv;
+    inherit lib lndir makeWrapper stdenv;
   };
 
   packagesFun = self: with self; {
@@ -711,54 +711,6 @@ let
     };
   };
 
-  flycheck = melpaBuild rec {
-    pname   = "flycheck";
-    version = "0.25.1";
-    src = fetchFromGitHub {
-      owner  = pname;
-      repo   = pname;
-      rev    = version;
-      sha256 = "19mnx2zm71qrf7qf3mk5kriv5vgq0nl67lj029n63wqd8jcjb5fi";
-    };
-    packageRequires = [ dash let-alist pkg-info seq ];
-    meta = {
-      description = "On-the-fly syntax checking, intended as replacement for the older Flymake which is part of Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  flycheck-haskell = melpaBuild rec {
-    pname   = "flycheck-haskell";
-    version = "0.7.2";
-    src = fetchFromGitHub {
-      owner  = "flycheck";
-      repo   = pname;
-      rev    = version;
-      sha256 = "0143lcn6g46g7skm4r6lqq09s8mr3268rikbzlh65qg80rpg9frj";
-    };
-    packageRequires = [ dash flycheck haskell-mode let-alist pkg-info ];
-    meta = {
-      description = "Improved Haskell support for Flycheck";
-      license = gpl3Plus;
-    };
-  };
-
-  flycheck-pos-tip = melpaBuild rec {
-    pname   = "flycheck-pos-tip";
-    version = "20140813";
-    src = fetchFromGitHub {
-      owner  = "flycheck";
-      repo   = pname;
-      rev    = "5b3a203bbdb03e4f48d1654efecd71f44376e199";
-      sha256 = "0b4x24aq0jh4j4bjv0fqyaz6hzh3gqf57k9763jj9rl32cc3dpnp";
-    };
-    packageRequires = [ flycheck popup ];
-    meta = {
-      description = "Flycheck errors display in tooltip";
-      license = gpl3Plus;
-    };
-  };
-
   ghc-mod = melpaBuild rec {
     pname = "ghc";
     version = external.ghc-mod.version;
@@ -772,6 +724,19 @@ let
     };
   };
 
+  hindent = melpaBuild rec {
+    pname = "hindent";
+    version = external.hindent.version;
+    src = external.hindent.src;
+    packageRequires = [ haskell-mode ];
+    propagatedUserEnvPkgs = [ external.hindent ];
+    fileSpecs = [ "elisp/*.el" ];
+    meta = {
+      description = "Indent haskell code using the \"hindent\" program";
+      license = bsd3;
+    };
+  };
+
   rtags = melpaBuild rec {
     pname = "rtags";
     version = "2.0"; # really, it's some arbitrary git hash
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index e8bc49a85b935..97fafe7c752e9 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1838,6 +1838,38 @@ let
     };
   };
 
+  hmacauth = buildGoPackage {
+    name = "hmacauth";
+    goPackagePath = "github.com/18F/hmacauth";
+    src = fetchFromGitHub {
+      rev = "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd";
+      owner = "18F";
+      repo = "hmacauth";
+      sha256 = "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1";
+    };
+  };
+
+  hound = buildGoPackage rec {
+    rev  = "0a364935ba9db53e6f3f5563b02fcce242e0930f";
+    name = "hound-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/etsy/hound";
+
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "etsy";
+      repo   = "hound";
+      sha256 = "0jhnjskpm15nfa1cvx0h214lx72zjvnkjwrbgwgqqyn9afrihc7q";
+    };
+    buildInputs = [ go-bindata.bin pkgs.nodejs pkgs.nodePackages.react-tools pkgs.python pkgs.rsync ];
+    postInstall = ''
+      pushd go
+      python src/github.com/etsy/hound/tools/setup
+      sed -i 's|bin/go-bindata||' Makefile
+      sed -i 's|$<|#go-bindata|' Makefile
+      make
+    '';
+  };
+
   hologram = buildGoPackage rec {
     rev  = "63014b81675e1228818bf36ef6ef0028bacad24b";
     name = "hologram-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2362,6 +2394,21 @@ let
     sha256 = "03fvgbjf2aprjj1s6wdc35wwa7k1w5phkixzvp5n1j21sf6w4h24";
   };
 
+  oauth2_proxy = buildGoPackage {
+    name = "oauth2_proxy";
+    goPackagePath = "github.com/bitly/oauth2_proxy";
+    src = fetchFromGitHub {
+      rev = "10f47e325b782a60b8689653fa45360dee7fbf34";
+      owner = "bitly";
+      repo = "oauth2_proxy";
+      sha256 = "13f6kaq15f6ial9gqzrsx7i94jhd5j70js2k93qwxcw1vkh1b6si";
+    };
+    buildInputs = [
+      go-assert go-options go-simplejson toml fsnotify.v1 oauth2
+      google-api-go-client hmacauth
+    ];
+  };
+
   objx = buildFromGitHub {
     rev    = "cbeaeb16a013161a98496fad62933b1d21786672";
     owner  = "stretchr";
@@ -3652,4 +3699,38 @@ let
         xargs -d '\n' sed -i -e s,github.com/ericchiang/pup/Godeps/_workspace/src/,,g
     '';
   };
+
+  textsecure = buildFromGitHub rec {
+    rev = "505e129c42fc4c5cb2d105520cef7c04fa3a6b64";
+    owner = "janimo";
+    repo = "textsecure";
+    sha256 = "0sdcqd89dlic0bllb6mjliz4x54rxnm1r3xqd5qdp936n7xs3mc6";
+    propagatedBuildInputs = [ crypto protobuf ed25519 yaml-v2 logrus ];
+    disabled = isGo14;
+  };
+
+  interlock = buildFromGitHub rec {
+    version = "2016.01.14";
+    rev = "v${version}";
+    owner = "inversepath";
+    repo = "interlock";
+    sha256 = "0wabx6vqdxh2aprsm2rd9mh71q7c2xm6xk9a6r1bn53r9dh5wrsb";
+    buildInputs = [ crypto textsecure ];
+    nativeBuildInputs = [ pkgs.sudo ];
+    buildFlags = [ "-tags textsecure" ];
+    subPackages = [ "./cmd/interlock" ];
+    postPatch = ''
+      grep -lr '/s\?bin/' | xargs sed -i \
+        -e 's|/bin/mount|${pkgs.utillinux}/bin/mount|' \
+        -e 's|/bin/umount|${pkgs.utillinux}/bin/umount|' \
+        -e 's|/bin/cp|${pkgs.coreutils}/bin/cp|' \
+        -e 's|/bin/mv|${pkgs.coreutils}/bin/mv|' \
+        -e 's|/bin/chown|${pkgs.coreutils}/bin/chown|' \
+        -e 's|/bin/date|${pkgs.coreutils}/bin/date|' \
+        -e 's|/sbin/poweroff|${pkgs.systemd}/sbin/poweroff|' \
+        -e 's|/usr/bin/sudo|/var/setuid-wrappers/sudo|' \
+        -e 's|/sbin/cryptsetup|${pkgs.cryptsetup}/bin/cryptsetup|'
+    '';
+    disabled = isGo14;
+  };
 }; in self
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a802623df8e93..2d0151dc54204 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -50,8 +50,8 @@ rec {
       inherit (packages.ghc784) ghc alex happy;
     };
 
-    ghcjs = packages.ghc7102.callPackage ../development/compilers/ghcjs {
-      ghc = compiler.ghc7102;
+    ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
+      ghc = compiler.ghc7103;
     };
 
     jhc = callPackage ../development/compilers/jhc {
@@ -60,7 +60,10 @@ rec {
 
     uhc = callPackage ../development/compilers/uhc/default.nix ({
       stdenv = pkgs.clangStdenv;
-      inherit (pkgs.haskellPackages) ghcWithPackages;
+      # UHC 1.1.9.2 is incompatible with hashable 1.2.4.0,
+      # latest LTS with a compatible hashable is LTS 4.1
+      # See also https://github.com/UU-ComputerScience/uhc/issues/69
+      inherit (pkgs.haskell.packages.lts-4_1) ghcWithPackages;
     });
 
   };
@@ -337,6 +340,12 @@ rec {
     lts-5_0 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.0.nix { };
     };
+    lts-5_1 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.1.nix { };
+    };
+    lts-5_2 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.2.nix { };
+    };
 
   };
 }
diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 6a3cdd9f7de26..12d0aff2616e0 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -1,4 +1,4 @@
-{ self, fetchurl, fetchgit ? null, lib }:
+{ self, fetchurl, fetchgit ? null, fetchFromGitHub, lib }:
 
 {
   by-spec."Base64"."~0.2.0" =
@@ -29314,10 +29314,11 @@
     name = "oauth-0.9.12";
     version = "0.9.12";
     bin = false;
-    src = fetchurl {
-      url = "https://github.com/ciaranj/node-oauth/tarball/master";
-      name = "oauth-0.9.12.tgz";
-      sha256 = "e06c3c3537e9c802c8ad00640b9f91bf2857cf8cc91209e355b5646f4da8b3e7";
+    src = fetchFromGitHub {
+      owner = "ciaranj";
+      repo = "node-oauth";
+      rev = "0.9.12";
+      sha256 = "1c67nq1q5isfcvyp520q02w5c527s1wsfiyknzfvvp22sf2yn7k6";
     };
     deps = {
     };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index fb8bba33f3745..4d8ffa8d744b1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1415,17 +1415,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  CGI = buildPerlPackage {
-    name = "CGI-4.21";
+  "CGI" = buildPerlPackage rec {
+    name = "CGI-4.25";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.21.tar.gz;
-      sha256 = "340d20a2b67211752d7c270c589e463d71aea8b8d75d9417250618219d3cf884";
+      url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
+      sha256 = "efb3e5235ada6a91f97ca2905399a686bedea60f6b525e52f4a147baff4f131a";
     };
-    propagatedBuildInputs = [ HTMLParser if_ ];
-    doCheck = false;
+    buildInputs = [ TestDeep TestWarn ];
+    propagatedBuildInputs = [ HTMLParser self."if" ];
     meta = {
       homepage = https://metacpan.org/module/CGI;
       description = "Handle Common Gateway Interface requests and responses";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -3511,19 +3513,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  DevelDeclare = buildPerlPackage {
-    name = "Devel-Declare-0.006011";
+  "DevelDeclare" = buildPerlPackage rec {
+    name = "Devel-Declare-0.006018";
     src = fetchurl {
-      url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Devel-Declare-0.006011.tar.gz;
-      sha256 = "0wqa9n4mdlsld4cmhy2mg8ncqr5gsra1913x0kypisgdqvviin2k";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "bb3607bc7546bcf8d9ac57acd8de4e4ca5567ace836ab823d5f5b450216f466a";
     };
-    buildInputs = [ BHooksOPCheck ExtUtilsDepends ];
+    buildInputs = [ BHooksOPCheck ExtUtilsDepends TestRequires ];
     propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ];
     meta = {
       description = "Adding keywords to perl, in perl";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
-      platforms   = stdenv.lib.platforms.unix;
+      maintainers = with maintainers; [ ocharles rycee ];
     };
   };
 
@@ -5899,14 +5900,22 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  if_ = buildPerlPackage {
-    name = "if-0.0601";
+  "if" = buildPerlPackage rec {
+    name = "if-0.0606";
     src = fetchurl {
-      url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/if-0.0601.tar.gz;
-      sha256 = "fb2b7329aa111a673cd22dc2889167e52058aead0de2fe0855b32dd658d5c1b7";
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "63d69282d6c4c9e76370b78d770ca720cea88cfe5ee5b612709240fc6078d50e";
+    };
+    meta = {
+      description = "C<use> a Perl module if a condition holds (also can C<no> a module)";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 
+  # For backwards compatibility.
+  if_ = self."if";
+
   ImageSize = buildPerlPackage rec {
     name = "Image-Size-3.232";
     src = fetchurl {
@@ -8224,32 +8233,35 @@ let self = _self // overrides; _self = with self; {
       [ ClassMOP Moose namespaceautoclean ListMoreUtils ];
   };
 
-  MooseXTypes = buildPerlPackage {
-    name = "MooseX-Types-0.45";
+  "MooseXTypes" = buildPerlPackage rec {
+    name = "MooseX-Types-0.46";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.45.tar.gz;
-      sha256 = "d01ff4a3db78e1150101b4b63569e4bce3ced3b5b0024c52c87575e0820609c7";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "e9e8c36284cf1adc6563c980c0a4f0a7df720dbaaece0dd6be66b975dde5db7a";
     };
-    buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires if_ ];
-    propagatedBuildInputs = [ CarpClan ModuleRuntime Moose SubExporter SubName namespaceautoclean ];
+    buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires self."if" ];
+    propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods SubName namespaceautoclean ];
     meta = {
       homepage = https://github.com/moose/MooseX-Types;
       description = "Organise your Moose types in libraries";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 
-  MooseXTypesCommon = buildPerlPackage rec {
-    name = "MooseX-Types-Common-0.001008";
+  "MooseXTypesCommon" = buildPerlPackage rec {
+    name = "MooseX-Types-Common-0.001013";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz";
-      sha256 = "0s0z6v32vyykni8an6jzyvl0icr5d5b8kbi4qqp4vwc5438jrpdz";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "ff0c963f5e8304acb5f64bdf9ba1f19284311148e1a8f0d1f81f123f9950f5f2";
     };
-    buildInputs = [ TestFatal ];
-    propagatedBuildInputs = [ Moose MooseXTypes ];
+    buildInputs = [ ModuleBuildTiny TestDeep TestWarnings perl ];
+    propagatedBuildInputs = [ MooseXTypes self."if" ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
-      platforms   = stdenv.lib.platforms.unix;
+      homepage = https://github.com/moose/MooseX-Types-Common;
+      description = "A library of commonly used type constraints";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = with maintainers; [ ocharles rycee ];
     };
   };
 
@@ -10252,10 +10264,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SoftwareLicense = buildPerlPackage rec {
-    name = "Software-License-0.103010";
+    name = "Software-License-0.103011";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "929fbace96f69a0977a0380000820c93fc1af4e973a422c73e6cd254405fa47c";
+      sha256 = "03dyc5sx0asq1m3276l224q5776ng24fw5llf3gr9mbgklkgj05s";
     };
     propagatedBuildInputs = [ DataSection TextTemplate TryTiny ];
     meta = {
@@ -10704,16 +10716,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  SubExporterForMethods = buildPerlPackage {
-    name = "Sub-Exporter-ForMethods-0.100051";
+  "SubExporterForMethods" = buildPerlPackage rec {
+    name = "Sub-Exporter-ForMethods-0.100052";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100051.tar.gz;
-      sha256 = "127wniw53p7pp7r2vazicply3v1gmnhw4w7jl6p74i0grnsixipm";
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "421fbba4f6ffcf13c4335f2c20630d709e6fa659c07545d094dbc5a558ad3006";
     };
+    buildInputs = [ namespaceautoclean ];
     propagatedBuildInputs = [ SubExporter SubName ];
     meta = {
+      homepage = https://github.com/rjbs/Sub-Exporter-ForMethods;
       description = "Helper routines for using Sub::Exporter to build methods";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -11960,17 +11975,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  TestWarnings = buildPerlPackage rec {
-    name = "Test-Warnings-0.021";
+  "TestWarnings" = buildPerlPackage rec {
+    name = "Test-Warnings-0.026";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "0i1crkhqfl5gs55i5nrvsw3xy946ajgnvp4gqrzvsn1x6cp1i2nr";
+      sha256 = "ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08";
     };
-    buildInputs = [ TestTester if_ CPANMetaCheck ModuleMetadata ];
+    buildInputs = [ TestTester CPANMetaCheck ModuleMetadata self."if" ];
     meta = {
       homepage = https://github.com/karenetheridge/Test-Warnings;
       description = "Test for warnings and the lack of them";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 
@@ -12170,10 +12186,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextCSVEncoded = buildPerlPackage rec {
-    name = "Text-CSV-Encoded-0.24";
+    name = "Text-CSV-Encoded-0.25";
     src = fetchurl {
       url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/${name}.tar.gz";
-      sha256 = "ce8f307dabdcb623cfc385c175152b0f465096d449b9c828efbe6611efcab0d5";
+      sha256 = "1l5rwlmnpnhjszb200a94lwvkwslsvyxm24ycf37gm8dla1mk2i4";
     };
     propagatedBuildInputs = [ TextCSV ];
     meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aef981698a3eb..e9f1841700170 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -341,13 +341,13 @@ in modules // {
   };
 
   afew = buildPythonPackage rec {
-    rev = "9744c18c4d6b0a3e7f57b01e5fe145a60fc82a47";
-    name = "afew-1.0_${rev}";
+    rev = "3f1e5e93119788984c2193292c988ac81ecb0a45";
+    name = "afew-git-2016-01-04";
 
     src = pkgs.fetchurl {
       url = "https://github.com/teythoon/afew/tarball/${rev}";
       name = "${name}.tar.bz";
-      sha256 = "1qyban022aji2hl91dh0j3xa6ikkxl5argc6w71yp2x8b02kp3mf";
+      sha256 = "1fi19g2j1qilh7ikp7pzn6sagkn76g740zdxgnsqmmvl2zk2yhrw";
     };
 
     buildInputs = with self; [ pkgs.dbacl ];
@@ -554,28 +554,35 @@ in modules // {
 
 
   alot = buildPythonPackage rec {
-    rev = "0.3.6";
-    name = "alot-0.3.6";
+    rev = "0.3.7";
+    name = "alot-${rev}";
 
-    src = pkgs.fetchurl {
-      url = "https://github.com/pazz/alot/tarball/${rev}";
-      name = "${name}.tar.bz";
-      sha256 = "1rzy70w4isvypa94310xw403vq5him21q8rlx4laa0z530phkrmq";
+    src = pkgs.fetchFromGitHub {
+      owner = "pazz";
+      repo = "alot";
+      inherit rev;
+      sha256 = "0sscmmf42gsrjbisi6wm01alzlnq6wqhpwkm8pc557075jfg19il";
     };
 
-    # error: invalid command 'test'
-    doCheck = false;
+    postPatch = ''
+      substituteInPlace alot/defaults/alot.rc.spec \
+        --replace "themes_dir = string(default=None)" \
+                  "themes_dir = string(default='$out/share/themes')"
+    '';
 
     propagatedBuildInputs =
       [ self.notmuch
         self.urwid
+        self.urwidtrees
         self.twisted
-        self.magic
+        self.python_magic
         self.configobj
         self.pygpgme
       ];
 
     postInstall = ''
+      mkdir -p $out/share
+      cp -r extra/themes $out/share
       wrapProgram $out/bin/alot \
         --prefix LD_LIBRARY_PATH : '${pkgs.lib.makeLibraryPath [ pkgs.notmuch pkgs.file pkgs.gpgme ]}'
     '';
@@ -583,7 +590,7 @@ in modules // {
     meta = {
       homepage = https://github.com/pazz/alot;
       description = "Terminal MUA using notmuch mail";
-      maintainers = with maintainers; [ garbas ];
+      maintainers = with maintainers; [ garbas profpatsch ];
     };
   };
 
@@ -607,12 +614,12 @@ in modules // {
 
   amqp = buildPythonPackage rec {
     name = "amqp-${version}";
-    version = "1.4.7";
+    version = "1.4.9";
     disabled = pythonOlder "2.6";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/amqp/${name}.tar.gz";
-      sha256 = "1nids25n6a17nrpxnklpi1h059zi87cs2g6irvp0j4p0ad5qi08p";
+      sha256 = "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid";
     };
 
     buildInputs = with self; [ mock coverage nose-cover3 unittest2 ];
@@ -1608,6 +1615,8 @@ in modules // {
       sha256 = "1i6is7lv4v9by4panrd9w63m4xsmhwlp3rq4jjj3azwg5jm10940";
     };
 
+    disabled = isPy3k;
+
     meta = {
       description = "A Python library and tool for CalDAV";
 
@@ -1806,7 +1815,7 @@ in modules // {
       description = "Composable style cycles";
       homepage = http://github.com/matplotlib/cycler;
       license = licenses.bsd3;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -2037,11 +2046,11 @@ in modules // {
 
   blaze = buildPythonPackage rec {
     name = "blaze-${version}";
-    version = "0.9.0";
+    version = "0.9.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/blaze/${name}.tar.gz";
-      sha256 = "07h284n6fr0lvy58a6lvwwfb45sy7lggllx2y2vzzs4xrvf5k1i7";
+      sha256 = "fde4fd5733d8574345521581078a4fd89bb51ad3814eda88f1f467faa3a9784a";
     };
 
     buildInputs = with self; [ pytest ];
@@ -2049,6 +2058,7 @@ in modules // {
       cytoolz
       datashape
       flask
+      flask-cors
       h5py
       multipledispatch
       numba
@@ -2282,10 +2292,15 @@ in modules // {
     };
 
     propagatedBuildInputs = [ self.botocore
-                              self.futures_2_2
                               self.jmespath
-                            ];
-    buildInputs = [ self.docutils ];
+                            ] ++ (if isPy3k then [] else [self.futures_2_2]);
+    buildInputs = [ self.docutils self.nose self.mock ];
+
+    # Tests are failing with `botocore.exceptions.NoCredentialsError:
+    # Unable to locate credentials`. There also seems to be some mock
+    # issues (`assert_called_once` doesn't exist in mock but boto
+    # seems to think it is?).
+    doCheck = false;
 
     meta = {
       homepage = https://github.com/boto3/boto;
@@ -2604,6 +2619,13 @@ in modules // {
     };
 
     LC_ALL = "en_US.UTF-8";
+
+    # checkPhase require at least one 'normal' font and one 'monospace',
+    # otherwise glyph tests fails
+    FONTCONFIG_FILE = pkgs.makeFontsConf {
+      fontDirectories = [ pkgs.freefont_ttf ];
+    };
+
     buildInputs = with self; [ pytest pkgs.glibcLocales ];
     propagatedBuildInputs = with self; [ pkgs.cairo cffi ];
 
@@ -2611,17 +2633,28 @@ in modules // {
       py.test $out/${python.sitePackages}
     '';
 
-    # Marked broken since according to test
+    # FIXME: make gdk_pixbuf dependency optional (as wel as xcfffi)
     # Happens with 0.7.1 and 0.7.2
     # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0
 
-    patchPhase = ''
+    patches = [
+      # This patch from PR substituted upstream
+      (pkgs.fetchpatch {
+          url = "https://github.com/avnik/cairocffi/commit/2266882e263c5efc87350cf016d117b2ec6a1d59.patch";
+          sha256 = "0gb570z3ivf1b0ixsk526n3h29m8c5rhjsiyam7rr3x80dp65cdl";
+      })
+
+      ../development/python-modules/cairocffi/dlopen-paths.patch
+    ];
+
+    postPatch = ''
       # Hardcode cairo library path
-      sed -e 's,ffi\.dlopen(,&"${pkgs.cairo.out}/lib/" + ,' -i cairocffi/__init__.py
+      substituteInPlace cairocffi/__init__.py --subst-var-by cairo ${pkgs.cairo.out}
+      substituteInPlace cairocffi/__init__.py --subst-var-by glib ${pkgs.glib.out}
+      substituteInPlace cairocffi/__init__.py --subst-var-by gdk_pixbuf ${pkgs.gdk_pixbuf.out}
     '';
 
     meta = {
-      broken = true;
       homepage = https://github.com/SimonSapin/cairocffi;
       license = "bsd";
       description = "cffi-based cairo bindings for Python";
@@ -4178,11 +4211,11 @@ in modules // {
 
   datashape = buildPythonPackage rec {
     name = "datashape-${version}";
-    version = "0.5.0";
+    version = "0.5.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/D/DataShape/${name}.tar.gz";
-      sha256 = "13w0rfaqpqkh30bxmx7i7kjfrfkm5maa35gj3c464wah7i2zm9wp";
+      sha256 = "21c424f11604873da9a36d4c55ef1d15cc3960cd208d7828b82315c494bff96a";
     };
 
     buildInputs = with self; [ pytest mock ];
@@ -5241,6 +5274,25 @@ in modules // {
     };
   };
 
+  ftputil = buildPythonPackage rec {
+    version = "3.3";
+    name = "ftputil-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/f/ftputil/${name}.tar.gz";
+      sha256 = "1714w0v6icw2xjx5m54yv2qgkq49qwxwllq4gdb7wkz25iiapr8b";
+    };
+
+    disabled = isPy3k;
+
+    meta = {
+      description = "High-level FTP client library (virtual file system and more)";
+      homepage    = https://pypi.python.org/pypi/ftputil;
+      platforms   = platforms.linux;
+      license     = licenses.bsd2; # "Modified BSD licence, says pypi"
+    };
+  };
+
   fudge = buildPythonPackage rec {
     name = "fudge-1.1.0";
     src = pkgs.fetchurl {
@@ -6575,13 +6627,13 @@ in modules // {
     };
   };
 
-  plotly = buildPythonPackage rec {
-    name = "plotly-1.9.1";
+  plotly = self.buildPythonPackage rec {
+    name = "plotly-1.9.5";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/plotly/${name}.tar.gz";
-      md5 = "84fe80b294b639357f12fa210ce09f95";
+      md5 = "56fb77dff80325413c8cf40cf229ce90";
     };
 
     propagatedBuildInputs = with self; [ self.pytz self.six self.requests ];
@@ -7030,15 +7082,15 @@ in modules // {
     name = "scikits.samplerate-${version}";
     version = "0.3.3";
     src = pkgs.fetchgit {
-      url = https://github.com/ThomasLecocq/samplerate;
-      rev = "7edb22b23f5aa8e7342aea0b538bdd0434988510";
-      sha256 = "ec2a09819c38028283505090ee9839963d3557e73f6e8eb3348ff8884d0d67ed";
-      };
+      url = https://github.com/cournape/samplerate;
+      rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210";
+      sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg";
+    };
+
     buildInputs = with self;  [ pkgs.libsamplerate ];
 
     propagatedBuildInputs = with self; [ numpy ];
 
-
     preConfigure = ''
        cat > site.cfg << END
        [samplerate]
@@ -7142,12 +7194,15 @@ in modules // {
   };
 
   py3status = buildPythonPackage rec {
-    name = "py3status-2.7";
+    name = "py3status-2.8";
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/py3status/${name}.tar.gz";
-      sha256 = "09r70zbq5xxhzbgd54dcx8p9z0631a454j2ird1lawkms22fc7wv";
+      sha256 = "1aq4l1lj6j54a8mh9y3yscbxv41bbhz89fiwnydj2gx0md5sq5v5";
     };
     propagatedBuildInputs = with self; [ requests2 ];
+    prePatch = ''
+      sed -i -e "s|\[\"acpi\"|\[\"${pkgs.acpi}/bin/acpi\"|" py3status/modules/battery_level.py
+    '';
     meta = {
       maintainers = with maintainers; [ garbas ];
     };
@@ -7651,12 +7706,12 @@ in modules // {
 
   django_1_9 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.9";
+    version = "1.9.2";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz";
-      sha256 = "0rkwdxh63y7pwx9larl2g7m1z206675dzx7ipd44p3bpm0clpzh5";
+      sha256 = "0bwapyjdl1w62cdv3kx27kj1s5zj93fyby8mhgysapdkxqi368vs";
     };
 
     # patch only $out/bin to avoid problems with starter templates (see #3134)
@@ -7675,12 +7730,12 @@ in modules // {
 
   django_1_8 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.8.4";
+    version = "1.8.9";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
-      sha256 = "1n3hb80v7wl5j2mry5pfald6i9z42a9c3m9405877iqw3v49csc2";
+      sha256 = "1qyjpdpsj1n5lx10vak9bwl554br01wbn0kjhy7646i00y2js0gw";
     };
 
     # too complicated to setup
@@ -7700,12 +7755,12 @@ in modules // {
 
   django_1_7 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.7.10";
+    version = "1.7.11";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz";
-      sha256 = "0xbwg6nyvwcbp2hvk0x3s5y823k5kizn0za1bl2rf6g6xcn7sddr";
+      sha256 = "18arf0zr98q2gxhimm2fgh0avwcdax1mcnps0cyn06wgrr7i8f90";
     };
 
     # too complicated to setup
@@ -8163,34 +8218,6 @@ in modules // {
   };
 
 
-  hg-crecord = buildPythonPackage rec {
-    rev = "5cfaabfe9cb9f0a0d6837956d73127f290a213be";
-    name = "hg-crecord-${rev}";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "https://bitbucket.org/edgimar/crecord/get/${builtins.substring 0 12 rev}.tar.gz";
-      sha256 = "02003fa5620ec40a5ad0d7cede2e65c2cb398a7fe4e1ee26bd3396a87d63ad35";
-    };
-
-    # crecord comes as just a bare directory
-    configurePhase = " ";
-    buildPhase = "${python.executable} -m compileall crecord";
-    installPhase = ''
-      mkdir -p $out/${python.sitePackages}
-      cp -Lr crecord $out/${python.sitePackages}/
-    '';
-
-    # there ain't none
-    doCheck = false;
-
-    meta = {
-      description = "Mercurial extension for selecting graphically which files/hunk/lines to commit";
-      homepage = https://bitbucket.org/edgimar/crecord;
-    };
-  };
-
-
   docutils = buildPythonPackage rec {
     name = "docutils-0.12";
 
@@ -8245,11 +8272,11 @@ in modules // {
 
   ecdsa = buildPythonPackage rec {
     name = "ecdsa-${version}";
-    version = "0.11";
+    version = "0.13";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/e/ecdsa/${name}.tar.gz";
-      md5 = "8ef586fe4dbb156697d756900cb41d7c";
+      sha256 = "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4";
     };
 
     # Only needed for tests
@@ -8347,6 +8374,11 @@ in modules // {
       sha256="0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1";
     };
 
+    buildInputs = with self; [ lxml pytest ];
+    checkPhase = ''
+      py.test $out
+    '';
+
     meta = {
       description = "An implementation of lxml.xmlfile for the standard library";
       longDescription = ''
@@ -8580,6 +8612,25 @@ in modules // {
     };
   };
 
+  flask-cors = buildPythonPackage rec {
+    name = "Flask-Cors-${version}";
+    version = "2.1.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/F/Flask-Cors/${name}.tar.gz";
+      sha256 = "0fd618a4f88ykqx4x55viz47cm9rl214q1b45a0b4mz5vhxffqpj";
+    };
+
+    buildInputs = with self; [ nose ];
+    propagatedBuildInputs = with self; [ flask six ];
+
+    meta = {
+      description = "A Flask extension adding a decorator for CORS support";
+      homepage = https://github.com/corydolphin/flask-cors;
+      license = with licenses; [ mit ];
+    };
+  };
+
   flask-pymongo = buildPythonPackage rec {
     name = "Flask-PyMongo-${version}";
     version = "0.3.1";
@@ -9934,17 +9985,18 @@ in modules // {
   };
 
   ipyparallel = buildPythonPackage rec {
-    version = "4.1.0";
+    version = "5.0.0";
     name = "ipyparallel-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/i/ipyparallel/${name}.tar.gz";
-      sha256 = "c943f6b3bbabb9332336d15474969e2a7a73d5b583f9786f7b357c75e4b1709a";
+      sha256 = "ffa7e2e29fdc4844b3c1721f46b42eee5a1abe5cbb851ccf79d0f4f89b9fe21a";
     };
 
     buildInputs = with self; [ nose ];
 
-    propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel];
+    propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado
+    ] ++ optionals (!isPy3k) [ futures ];
 
     # Requires access to cluster
     doCheck = false;
@@ -10420,13 +10472,13 @@ in modules // {
 
   kombu = buildPythonPackage rec {
     name = "kombu-${version}";
-    version = "3.0.30";
+    version = "3.0.33";
 
     disabled = pythonOlder "2.6";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/k/kombu/${name}.tar.gz";
-      sha256 = "0npq81ajiqmp8gjm7mq05n18y98xqpv7n4bbqb3p74d4irvgw0mr";
+      sha256 = "16brjx2lgwbj2a37d0pjbfb84nvld6irghmqrs3qfncajp51hgc5";
     };
 
     buildInputs = with self; optionals (!isPy3k) [ anyjson mock unittest2 nose ];
@@ -10611,7 +10663,7 @@ in modules // {
       description = "Line-by-line profiler";
       homepage = https://github.com/rkern/line_profiler;
       license = licenses.bsd3;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -11458,6 +11510,31 @@ in modules // {
     };
   };
 
+  mpd2 = buildPythonPackage rec {
+    name = "mpd2-${version}";
+    version = "0.5.5";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python-mpd2/python-mpd2-${version}.tar.bz2";
+      sha256 = "1gfrxf71xll1w6zb69znqg5c9j0g7036fsalkvqprh2id640cl3a";
+    };
+
+    propagatedBuildInputs = [ pkgs.mpd_clientlib ];
+
+    buildInputs = with self; [ mock ];
+    patchPhase = ''
+      sed -i -e '/tests_require/d' \
+          -e 's/cmdclass.*/test_suite="mpd_test",/' setup.py
+    '';
+
+    meta = {
+      description = "A Python client module for the Music Player Daemon";
+      homepage = "https://github.com/Mic92/python-mpd2";
+      license = licenses.lgpl3Plus;
+      maintainers = with maintainers; [ rvl ];
+    };
+  };
+
   mpv = buildPythonPackage rec {
     name = "mpv-0.1";
 
@@ -12487,48 +12564,20 @@ in modules // {
     };
   };
 
-  numpy = let
-    support = import ../development/python-modules/numpy-scipy-support.nix {
-      inherit python;
-      openblas = pkgs.openblasCompat;
-      pkgName = "numpy";
-    };
-  in buildPythonPackage ( rec {
-    name = "numpy-${version}";
-    version = "1.10.4";
+  buildNumpyPackage = callPackage ../development/python-modules/numpy.nix {
+    gfortran = pkgs.gfortran;
+    blas = pkgs.openblasCompat_2_14;
+  };
+
+  numpy = self.numpy_1_10;
 
+  numpy_1_10 = self.buildNumpyPackage rec {
+    version = "1.10.4";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/numpy/${name}.tar.gz";
+      url = "https://pypi.python.org/packages/source/n/numpy/numpy-${version}.tar.gz";
       sha256 = "7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b";
     };
-
-    disabled = isPyPy;  # WIP
-
-    preConfigure = ''
-      sed -i 's/-faltivec//' numpy/distutils/system_info.py
-    '';
-
-    inherit (support) preBuild checkPhase;
-
-    buildInputs = [ pkgs.gfortran self.nose ];
-    propagatedBuildInputs = [ support.openblas ];
-
-    # Disable failing test_f2py test.
-    # f2py couldn't be found by test,
-    # even though it was used successfully to build numpy
-    
-    # The large file support test is disabled because it takes forever
-    # and can cause the machine to run out of disk space when run.
-    prePatch = ''
-      sed -i 's/test_f2py/donttest/' numpy/tests/test_scripts.py
-      sed -i 's/test_large_file_support/donttest/' numpy/lib/tests/test_format.py
-    '';
-
-    meta = {
-      description = "Scientific tools for Python";
-      homepage = "http://numpy.scipy.org/";
-    };
-  });
+  };
 
   numpydoc = buildPythonPackage rec {
     name = "numpydoc-${version}";
@@ -12564,7 +12613,7 @@ in modules // {
     meta = {
       description = "Numerical traits for Python objects";
       license = licenses.bsd2;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
       homepage = https://github.com/astrofrog/numtraits;
     };
   };
@@ -12754,11 +12803,11 @@ in modules // {
 
   odo = buildPythonPackage rec {
     name = "odo-${version}";
-    version= "0.4.0";
+    version= "0.4.2";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/o/odo/${name}.tar.gz";
-      sha256 = "0xqm4zb7a7a2cbik9kn6yk0kr26n90iqj102h5wb42x6z5v4mn79";
+      sha256 = "f793df8b212994ea23ce34e90e2048d0237d3b95ecd066ef2cfbb1c2384b79e9";
     };
 
     buildInputs = with self; [ pytest ];
@@ -14231,7 +14280,8 @@ in modules // {
     checkPhase = let
       testsToSkip = ["test_data" "test_excel" "test_html" "test_json"
                      "test_frequencies" "test_frame"
-                     "test_read_clipboard_infer_excel"] ++
+                     "test_read_clipboard_infer_excel"
+                     "test_interp_alt_scipy" "test_nanops" "test_stats"] ++
                     optional isPy35 "test_sql";
     in ''
       runHook preCheck
@@ -14755,12 +14805,12 @@ in modules // {
   };
 
   pip = buildPythonPackage rec {
-    version = "7.1.2";
+    version = "8.0.2";
     name = "pip-${version}";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz";
-      sha256 = "0xx4aypfgchxdknxq7gyqghd8wb221zrzyqlbabzm32jy237j16a";
+      sha256 = "46f4bd0d8dfd51125a554568d646fe4200a3c2c6c36b9f2d06d2212148439521";
     };
 
     buildInputs = with self; [ mock scripttest virtualenv pytest ];
@@ -14781,13 +14831,13 @@ in modules // {
 
   platformio =  buildPythonPackage rec {
     name = "platformio-${version}";
-    version="2.7.1";
+    version="2.8.3";
 
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/platformio/platformio-${version}.tar.gz";
-      sha256 = "1xrjzgwdw7526vfimqjyr9115qzcs17dbyf7023x13anc8b2s9pq";
+      sha256 = "1lz5f7xc53bk8ri4806xfpisvhyqdxdniwk0ywifinnhzx47jgp7";
      };
 
      propagatedBuildInputs = with self; [ click_5 requests2 bottle pyserial lockfile colorama];
@@ -14879,7 +14929,7 @@ in modules // {
       description = "An audio library based on libsndfile, CFFI and NumPy";
       license = licenses.bsd3;
       homepage = https://github.com/bastibe/PySoundFile;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
 
     prePatch = ''
@@ -15970,7 +16020,7 @@ in modules // {
       description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
       homepage = http://hgomersall.github.com/pyFFTW/;
       license = with licenses; [ bsd2 bsd3 ];
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -16322,7 +16372,7 @@ in modules // {
   };
 
   pyjwt = buildPythonPackage rec {
-    version = "0.3.2";
+    version = "1.4.0";
     name = "pyjwt-${version}";
 
     src = pkgs.fetchurl {
@@ -17538,16 +17588,18 @@ in modules // {
   };
 
   requests_toolbelt = buildPythonPackage rec {
-    version = "0.4.0";
+    version = "0.6.0";
     name = "requests-toolbelt-${version}";
 
     src = pkgs.fetchurl {
       url = "https://github.com/sigmavirus24/requests-toolbelt/archive/${version}.tar.gz";
-      sha256 = "0zvfz4c9lqiwh2qh51rba6ckpjl3pbp9fcm0ri58qhcjd8mh8k34";
+      sha256 = "192pz6i1fp8vc1qasg6ccxpdsmpbqi3fqf5bgx3vpadp5x0rrz4f";
     };
 
     propagatedBuildInputs = with self; [ requests2 ];
 
+    buildInputs = with self; [ betamax ];
+
     meta = {
       description = "A toolbelt of useful classes and functions to be used with python-requests";
       homepage = http://toolbelt.rtfd.org;
@@ -17703,7 +17755,7 @@ in modules // {
       description = "A docutils-compatibility bridge to CommonMark";
       homepage = https://github.com/rtfd/recommonmark;
       license = licenses.mit;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
 
   };
@@ -18472,47 +18524,28 @@ in modules // {
     };
   };
 
+  buildScipyPackage = callPackage ../development/python-modules/scipy.nix {
+    gfortran = pkgs.gfortran;
+  };
 
-  scipy = let
-    support = import ../development/python-modules/numpy-scipy-support.nix {
-      inherit python;
-      openblas = pkgs.openblasCompat;
-      pkgName = "scipy";
-    };
-  in buildPythonPackage rec {
-    name = "scipy-${version}";
-    version = "0.16.1";
+  scipy = self.scipy_0_17;
 
+  scipy_0_16 = self.buildScipyPackage rec {
+    version = "0.16.1";
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/scipy/${name}.tar.gz";
+      url = "https://pypi.python.org/packages/source/s/scipy/scipy-${version}.tar.gz";
       sha256 = "ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260";
     };
+    numpy = self.numpy_1_10;
+  };
 
-    buildInputs = [ pkgs.gfortran self.nose ];
-    propagatedBuildInputs = [ self.numpy ];
-
-    preConfigure = ''
-      sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
-    '';
-
-    # First test: RuntimeWarning: Mean of empty slice.
-    # Second: SyntaxError: invalid syntax. Due to wrapper?
-    # Third: test checks permissions
-    prePatch = ''
-      substituteInPlace scipy/stats/tests/test_stats.py --replace "test_chisquare_masked_arrays" "remove_this_one"
-      rm scipy/linalg/tests/test_lapack.py
-      substituteInPlace scipy/weave/tests/test_catalog.py --replace "test_user" "remove_this_one"
-    '';
-
-    inherit (support) preBuild checkPhase;
-
-    patches = [../development/python-modules/scipy-0.16.1-decorator-fix.patch];
-    setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
-
-    meta = {
-      description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. ";
-      homepage = http://www.scipy.org/;
+  scipy_0_17 = self.buildScipyPackage rec {
+    version = "0.17.0";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/scipy/scipy-${version}.tar.gz";
+      sha256 = "f600b755fb69437d0f70361f9e560ab4d304b1b66987ed5a28bdd9dd7793e089";
     };
+    numpy = self.numpy_1_10;
   };
 
   scikitimage = buildPythonPackage rec {
@@ -18547,10 +18580,17 @@ in modules // {
     };
 
     buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];
-    propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ];
+    propagatedBuildInputs = with self; [ numpy scipy numpy.blas ];
 
     LC_ALL="en_US.UTF-8";
 
+    # Exclude "test_image.py" because the Lena function/image was removed from SciPy since 0.17
+    # Should be fixed in next release.
+    # Using the -I switch broke nosetests...?
+    patchPhase = ''
+      rm sklearn/feature_extraction/tests/test_image.py
+    '';
+
     checkPhase = ''
       HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/
     '';
@@ -18950,11 +18990,11 @@ in modules // {
   };
 
   sopel = buildPythonPackage rec {
-    name = "sopel-6.2.1";
+    name = "sopel-6.3.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/sopel/${name}.tar.gz";
-      sha256 = "06m5clmg9x0bsnhvl5d75mskwqnxvkdd00p0dqnpwip9vmq6n8cz";
+      sha256 = "10g3p603qiz4whacknnslmkza5y1f7a8blq1q07dfrny4442c6nb";
     };
 
     buildInputs = with self; [ pytest ];
@@ -19782,7 +19822,7 @@ in modules // {
       description = "Statistical computations and models for use with SciPy";
       homepage = "https://www.github.com/statsmodels/statsmodels";
       license = licenses.bsd3;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
 
     # Many tests fail when using latest numpy and pandas.
@@ -19949,6 +19989,25 @@ in modules // {
     };
   };
 
+  svgwrite = buildPythonPackage rec {
+    name = "svgwrite-${version}";
+    version = "1.1.6";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/svgwrite/${name}.tar.gz";
+      sha256 = "1f018813072aa4d7e95e58f133acb3f68fa7de0a0d89ec9402cc38406a0ec5b8";
+    };
+
+    buildInputs = with self; [ setuptools ];
+    propagatedBuildInputs = with self; [ pyparsing ];
+
+    meta = {
+      description = "A Python library to create SVG drawings.";
+      homepage = http://bitbucket.org/mozman/svgwrite;
+      license = licenses.mit;
+    };
+  };
+
   freezegun = buildPythonPackage rec {
     name = "freezegun-${version}";
     version = "0.3.5";
@@ -20041,7 +20100,7 @@ in modules // {
       description = "Pretty-print tabular data";
       homepage = https://bitbucket.org/astanin/python-tabulate;
       license = licenses.mit;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
 
   };
@@ -21036,6 +21095,26 @@ in modules // {
     };
   });
 
+  urwidtrees = buildPythonPackage rec {
+    name = "urwidtrees-${rev}";
+    rev = "1.0";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "pazz";
+      repo = "urwidtrees";
+      inherit rev;
+      sha256 = "03gpcdi45z2idy1fd9zv8v9naivmpfx65hshm8r984k9wklv1dsa";
+    };
+
+    propagatedBuildInputs = with self; [ urwid ];
+
+    meta = {
+      description = "Tree widgets for urwid";
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ profpatsch ];
+    };
+  };
+
   pyuv = buildPythonPackage rec {
     name = "pyuv-0.11.5";
     disabled = isPyPy;  # see https://github.com/saghul/pyuv/issues/49
@@ -21411,11 +21490,11 @@ in modules // {
 
   wheel = buildPythonPackage rec {
     name = "wheel-${version}";
-    version = "0.26.0";
+    version = "0.29.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/w/wheel/${name}.tar.gz";
-      sha256 = "eaad353805c180a47545a256e6508835b65a8e830ba1093ed8162f19a50a530c";
+      sha256 = "1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648";
     };
 
     buildInputs = with self; [ pytest pytestcov coverage ];
@@ -21984,15 +22063,18 @@ in modules // {
 
   zope_exceptions = buildPythonPackage rec {
      name = "zope.exceptions-${version}";
-     version = "4.0.5";
+     version = "4.0.8";
 
      src = pkgs.fetchurl {
        url = "http://pypi.python.org/packages/source/z/zope.exceptions/${name}.tar.gz";
-       md5 = "c95569fcb444ae541777de7ae5297492";
+       sha256 = "0zwxaaa66sqxg5k7zcrvs0fbg9ym1njnxnr28dfmchzhwjvwnfzl";
      };
 
      propagatedBuildInputs = with self; [ zope_interface ];
 
+     # circular deps
+     doCheck = false;
+
      meta = {
        description = "Exception interfaces and implementations";
        homepage = http://pypi.python.org/pypi/zope.exceptions;
@@ -22088,15 +22170,18 @@ in modules // {
 
 
   zope_proxy = buildPythonPackage rec {
-    name = "zope.proxy-4.1.4";
+    name = "zope.proxy-4.1.6";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.proxy/${name}.tar.gz";
-      md5 = "3bcaf8b8512a99649ecf2f158c11d05b";
+      sha256 = "0pqwwmvm1prhwv1ziv9lp8iirz7xkwb6n2kyj36p2h0ppyyhjnm4";
     };
 
     propagatedBuildInputs = with self; [ zope_interface ];
 
+    # circular deps
+    doCheck = false;
+
     meta = {
         maintainers = with maintainers; [ goibhniu ];
     };
@@ -22225,17 +22310,12 @@ in modules // {
 
     propagatedBuildInputs = with self; [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit;
 
-    doCheck = !isPy27;
-
     meta = {
       description = "A flexible test runner with layer support";
       homepage = http://pypi.python.org/pypi/zope.testrunner;
       license = licenses.zpt20;
       maintainers = with maintainers; [ goibhniu ];
     };
-
-    # Python 3.5 is not yet supported.
-    disabled = isPy35;
   };
 
 
@@ -22259,11 +22339,11 @@ in modules // {
 
 
   zope_interface = buildPythonPackage rec {
-    name = "zope.interface-4.1.1";
+    name = "zope.interface-4.1.3";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.tar.gz";
-      md5 = "edcd5f719c5eb2e18894c4d06e29b6c6";
+      sha256 = "0ks8h73b2g4bkad821qbv0wzjppdrwys33i7ka45ik3wxjg1l8if";
     };
 
     propagatedBuildInputs = with self; [ zope_event ];
@@ -22510,8 +22590,11 @@ in modules // {
     };
     buildInputs = with self; [ pkgs.zeromq3 pytest tornado ];
     propagatedBuildInputs = [ self.py ];
+
+    # Disable broken test
+    # https://github.com/zeromq/pyzmq/issues/799
     checkPhase = ''
-      py.test $out/${python.sitePackages}/zmq/
+      py.test $out/${python.sitePackages}/zmq/ -k "not test_large_send"
     '';
   };
 
@@ -24476,6 +24559,10 @@ in modules // {
     buildInputs = with self; [ pytest ];
     propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr ];
 
+    checkPhase = ''
+      PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}/poezio" make test
+    '';
+
     patches =
       let patch_base = ../development/python-modules/poezio;
       in [ "${patch_base}/make_default_config_writable.patch" ];
@@ -24936,4 +25023,169 @@ in modules // {
     };
   };
 
+  hidapi = buildPythonPackage rec{
+    version = "0.7.99.post12";
+    name = "hidapi-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/h/hidapi/${name}.tar.gz";
+      sha256 = "1jaj0y5vn5yk033q01wacsz379mf3sy66d6gz072ycfr5rahcp59";
+    };
+
+    propagatedBuildInputs = with self; [ pkgs.libusb1 pkgs.udev cython ];
+
+    # Fix the USB backend library lookup
+    postPatch = ''
+      libusb=${pkgs.libusb1}/include/libusb-1.0
+      test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
+      sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
+    '';
+
+    meta = {
+      description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
+      homepage = https://github.com/trezor/cython-hidapi;
+      # license can actually be either bsd3 or gpl3
+      # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ np ];
+    };
+  };
+
+  mnemonic = buildPythonPackage rec{
+    version = "0.12";
+    name = "mnemonic-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/m/mnemonic/${name}.tar.gz";
+      sha256 = "0j5jm4v54135qqw455fw4ix2mhxhzjqvxji9gqkpxagk31cvbnj4";
+    };
+
+    propagatedBuildInputs = with self; [ pbkdf2 ];
+
+    meta = {
+      description = "Implementation of Bitcoin BIP-0039";
+      homepage = https://github.com/trezor/python-mnemonic;
+      license = licenses.mit;
+      maintainers = with maintainers; [ np ];
+    };
+  };
+
+  trezor = buildPythonPackage rec{
+    version = "0.6.11";
+    name = "trezor-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/trezor/${name}.tar.gz";
+      sha256 = "0nqbjj0mvkp314hpq36px12hxbyidmhsdflq3121l4g9y3scfbnx";
+    };
+
+    propagatedBuildInputs = with self; [ protobuf2_6 hidapi ];
+
+    buildInputs = with self; [ ecdsa mnemonic ];
+
+    # There are no actual tests: "ImportError: No module named tests"
+    doCheck = false;
+
+    meta = {
+      description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet";
+      homepage = https://github.com/trezor/python-trezor;
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ np ];
+    };
+  };
+
+  keepkey = buildPythonPackage rec{
+    version = "0.7.0";
+    name = "keepkey-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/k/keepkey/${name}.tar.gz";
+      sha256 = "1ikyp4jpydskznsrlwmxh9sn7b64aldwj2lf0phmb19r5kk06qmp";
+    };
+
+    propagatedBuildInputs = with self; [ protobuf2_6 hidapi ];
+
+    buildInputs = with self; [ ecdsa mnemonic ];
+
+    # There are no actual tests: "ImportError: No module named tests"
+    doCheck = false;
+
+    meta = {
+      description = "KeepKey Python client";
+      homepage = https://github.com/keepkey/python-keepkey;
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ np ];
+    };
+  };
+
+  semver = buildPythonPackage rec {
+    name = "semver-${version}";
+    version = "2.2.1";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/s/semver/${name}.tar.gz";
+      sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
+    };
+
+    meta = {
+      description = "Python package to work with Semantic Versioning (http://semver.org/)";
+      homepage = "https://github.com/k-bx/python-semver";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ np ];
+    };
+  };
+
+  ed25519 = buildPythonPackage rec {
+    name = "ed25519-${version}";
+    version = "1.4";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/e/ed25519/${name}.tar.gz";
+      sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
+    };
+
+    meta = {
+      description = "Ed25519 public-key signatures";
+      homepage = "https://github.com/warner/python-ed25519";
+      license = licenses.mit;
+      maintainers = with maintainers; [ np ];
+    };
+  };
+
+  trezor_agent = buildPythonPackage rec{
+    version = "0.6.1";
+    name = "trezor_agent-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/trezor_agent/${name}.tar.gz";
+      sha256 = "0wpppxzld7kqqxdvy80qc8629n047vm3m3nk171i7hijfw285p0b";
+    };
+
+    propagatedBuildInputs = with self; [ trezor ecdsa ed25519 mnemonic keepkey semver ];
+
+    meta = {
+      description = "Using Trezor as hardware SSH agent";
+      homepage = https://github.com/romanz/trezor-agent;
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ np ];
+    };
+  };
+
+  x11_hash = buildPythonPackage rec{
+    version = "1.4";
+    name = "x11_hash-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/x/x11_hash/${name}.tar.gz";
+      sha256 = "172skm9xbbrivy1p4xabxihx9lsnzi53hvzryfw64m799k2fmp22";
+    };
+
+    meta = {
+      description = "Binding for X11 proof of work hashing";
+      homepage = https://github.com/mazaclub/x11_hash;
+      license = licenses.mit;
+      maintainers = with maintainers; [ np ];
+    };
+  };
+
 }
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index a555dcbf4fa3f..6c510ea029f18 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -233,7 +233,7 @@ let
       zsh = linux;
       zsnes = ["i686-linux"];
 
-      emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg;
+      #emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg;
 
       gnome = {
         gnome_panel = linux;
@@ -244,7 +244,7 @@ let
       haskell.compiler = packagePlatforms pkgs.haskell.compiler;
       haskellPackages = packagePlatforms pkgs.haskellPackages;
 
-      rPackages = packagePlatforms pkgs.rPackages;
+      #rPackages = packagePlatforms pkgs.rPackages;
 
       strategoPackages = {
         sdf = linux;
@@ -254,9 +254,15 @@ let
         dryad = linux;
       };
 
-      pythonPackages = {
-        zfec = linux;
-      };
+      ocamlPackages = { };
+
+      perlPackages = { };
+
+      pythonPackages = { };
+      python2Packages = { };
+      python27Packages = { };
+      python3Packages = { };
+      python35Packages = { };
 
       xorg = {
         fontadobe100dpi = linux ++ darwin;
diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 1cc2692b9d50c..cc16f45022737 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2016-01-17";
-  rev = "4d434405cd956c3c5476171bdc7e6dbe5c8ff209";
+  version = "2016-02-02";
+  rev = "9312acc30def6bb16739ab6c4560fb9880b25c5a";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "12y6kbgx1kh04lhwxvxqs2jkhnfa9hkgdjxhzlqs3gjcybsdkdhj";
+      sha256 = "0mrfcipc7sv0kzryjs649x3j4djr8jgbl58jd21hrcihc61qa38n";
   };
 
 in